From 53f2798549b1ffc2f2809f61c6c3b6b7af3f9c73 Mon Sep 17 00:00:00 2001 From: John Turner Date: Mon, 8 Dec 2025 21:23:38 +0000 Subject: [PATCH] add rustfmt target --- check_commands.txt | 2 +- meson.build | 14 ++++++++++++++ src/atom/meson.build | 1 + src/meson.build | 5 +++++ src/repo/ebuild/meson.build | 1 + src/repo/meson.build | 3 +++ src/useflag/meson.build | 1 + 7 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 src/atom/meson.build create mode 100644 src/meson.build create mode 100644 src/repo/ebuild/meson.build create mode 100644 src/repo/meson.build create mode 100644 src/useflag/meson.build diff --git a/check_commands.txt b/check_commands.txt index 0104962..95127a2 100644 --- a/check_commands.txt +++ b/check_commands.txt @@ -1,5 +1,5 @@ /usr/bin/meson format --recursive --check-only -rustfmt --edition 2024 --check $(find src -type f -name '*.rs') +ninja rustfmt -C build ninja rustdoc -C build ninja clippy -C build meson test -v unittests doctests '*repo*' '*porthole*' -C build diff --git a/meson.build b/meson.build index 8e712dd..389720b 100644 --- a/meson.build +++ b/meson.build @@ -5,9 +5,15 @@ project( default_options: {'rust_std': '2024', 'rust_nightly': 'enabled'}, ) +rustfmt = find_program('rustfmt') + rust = import('rust') fs = import('fs') +sources = [] + +subdir('src') + mon = dependency('mon-0.1-rs') get = dependency('get-0.1-rs') itertools = dependency('itertools-0.14-rs') @@ -20,6 +26,14 @@ gentoo_utils = static_library( link_with: [thiserror], ) +custom_target( + 'rustfmt', + input: sources, + output: 'rustfmt', + command: [rustfmt, '--edition=2024', '--check', '@INPUT@'], + build_always_stale: true, +) + if get_option('tests').enabled() rust.test('unittests', gentoo_utils) subdir('tests') diff --git a/src/atom/meson.build b/src/atom/meson.build new file mode 100644 index 0000000..a7331a8 --- /dev/null +++ b/src/atom/meson.build @@ -0,0 +1 @@ +sources += files('mod.rs', 'parsers.rs') diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 0000000..33a09de --- /dev/null +++ b/src/meson.build @@ -0,0 +1,5 @@ +sources += files('lib.rs') + +subdir('atom') +subdir('repo') +subdir('useflag') diff --git a/src/repo/ebuild/meson.build b/src/repo/ebuild/meson.build new file mode 100644 index 0000000..a7331a8 --- /dev/null +++ b/src/repo/ebuild/meson.build @@ -0,0 +1 @@ +sources += files('mod.rs', 'parsers.rs') diff --git a/src/repo/meson.build b/src/repo/meson.build new file mode 100644 index 0000000..c1be7a7 --- /dev/null +++ b/src/repo/meson.build @@ -0,0 +1,3 @@ +sources += files('mod.rs') + +subdir('ebuild') diff --git a/src/useflag/meson.build b/src/useflag/meson.build new file mode 100644 index 0000000..a7331a8 --- /dev/null +++ b/src/useflag/meson.build @@ -0,0 +1 @@ +sources += files('mod.rs', 'parsers.rs')