[PATCH] rust: kbuild: rebuild if `.clippy.toml` changes

Miguel Ojeda posted 1 patch 7 months ago
There is a newer version of this series
rust/Makefile | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
[PATCH] rust: kbuild: rebuild if `.clippy.toml` changes
Posted by Miguel Ojeda 7 months ago
We rarely modify `.clippy.toml`, but currently we do not rebuild if that
happens, thus it is easy to miss possible changes in lints.

Thus rebuild in case of changes.

Cc: stable@vger.kernel.org
Reported-by: Tamir Duberstein <tamird@gmail.com>
Closes: https://github.com/Rust-for-Linux/linux/issues/1151
Fixes: 7d56786edcbd ("rust: introduce `.clippy.toml`")
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
---
 rust/Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/rust/Makefile b/rust/Makefile
index 3aca903a7d08..0dcc9ba0d225 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -405,11 +405,12 @@ quiet_cmd_rustc_procmacro = $(RUSTC_OR_CLIPPY_QUIET) P $@
 		--crate-name $(patsubst lib%.$(libmacros_extension),%,$(notdir $@)) $<
 
 # Procedural macros can only be used with the `rustc` that compiled it.
-$(obj)/$(libmacros_name): $(src)/macros/lib.rs FORCE
+$(obj)/$(libmacros_name): $(src)/macros/lib.rs $(srctree)/.clippy.toml FORCE
 	+$(call if_changed_dep,rustc_procmacro)
 
 $(obj)/$(libpin_init_internal_name): private rustc_target_flags = --cfg kernel
-$(obj)/$(libpin_init_internal_name): $(src)/pin-init/internal/src/lib.rs FORCE
+$(obj)/$(libpin_init_internal_name): $(src)/pin-init/internal/src/lib.rs \
+    $(srctree)/.clippy.toml FORCE
 	+$(call if_changed_dep,rustc_procmacro)
 
 quiet_cmd_rustc_library = $(if $(skip_clippy),RUSTC,$(RUSTC_OR_CLIPPY_QUIET)) L $@
@@ -495,7 +496,8 @@ endif
 
 $(obj)/compiler_builtins.o: private skip_gendwarfksyms = 1
 $(obj)/compiler_builtins.o: private rustc_objcopy = -w -W '__*'
-$(obj)/compiler_builtins.o: $(src)/compiler_builtins.rs $(obj)/core.o FORCE
+$(obj)/compiler_builtins.o: $(src)/compiler_builtins.rs $(obj)/core.o \
+    $(srctree)/.clippy.toml FORCE
 	+$(call if_changed_rule,rustc_library)
 
 $(obj)/pin_init.o: private skip_gendwarfksyms = 1

base-commit: 22c3335c5dcd33063fe1894676a3a6ff1008d506
-- 
2.49.0
Re: [PATCH] rust: kbuild: rebuild if `.clippy.toml` changes
Posted by Tamir Duberstein 7 months ago
On Tue, May 20, 2025 at 3:20 PM Miguel Ojeda <ojeda@kernel.org> wrote:
>
> We rarely modify `.clippy.toml`, but currently we do not rebuild if that
> happens, thus it is easy to miss possible changes in lints.
>
> Thus rebuild in case of changes.
>
> Cc: stable@vger.kernel.org
> Reported-by: Tamir Duberstein <tamird@gmail.com>
> Closes: https://github.com/Rust-for-Linux/linux/issues/1151
> Fixes: 7d56786edcbd ("rust: introduce `.clippy.toml`")
> Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
> ---
>  rust/Makefile | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)

It is possible to do this only if CLIPPY=1?
Re: [PATCH] rust: kbuild: rebuild if `.clippy.toml` changes
Posted by Miguel Ojeda 7 months ago
On Tue, May 20, 2025 at 9:24 PM Tamir Duberstein <tamird@gmail.com> wrote:
>
> It is possible to do this only if CLIPPY=1?

I kept it simple on purpose, since we will not save much (changing
`.clippy.toml` is quite rare to begin with), but I can add a
conditional (likely in a variable). Not sure if it is worth it.

Cheers,
Miguel