| Message ID | 20240701183625.665574-5-ojeda@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | None | expand |
On Monday, July 1st, 2024 at 20:36, Miguel Ojeda <ojeda@kernel.org> wrote: > Since we are starting to support several Rust toolchains, lints (including > Clippy ones) now may behave differently and lint groups may include > new lints. > > Therefore, to maximize the chances a given version works, relax some > deny-level lints to warnings. It may also make our lives a bit easier > while developing new code or refactoring. > > To be clear, the requirements for in-tree code are still the same, since > Rust code still needs to be warning-free (patches should be clean under > `WERROR=y`) and the set of lints is not changed. > > `unsafe_op_in_unsafe_fn` is left unmodified, i.e. as an error, since > 1) it is simple enough that it should not have false positives (unlike > e.g. `rust_2018_idioms`'s `explicit_outlives_requirements`) and 2) it is > becoming the default in the language (warn-by-default in Rust 2024 [1] and > ideally an error later on) and thus it should also be very well tested. > > Link: https://github.com/rust-lang/rust/pull/112038 [1] > Signed-off-by: Miguel Ojeda <ojeda@kernel.org> > --- > Makefile | 22 +++++++++++----------- > rust/Makefile | 4 ++-- > 2 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/Makefile b/Makefile > index 4d36f943b3b1..056176a55d63 100644 > --- a/Makefile > +++ b/Makefile > @@ -461,17 +461,17 @@ KBUILD_USERLDFLAGS := $(USERLDFLAGS) > # host programs. > export rust_common_flags := --edition=2021 \ > -Zbinary_dep_depinfo=y \ > - -Dunsafe_op_in_unsafe_fn -Drust_2018_idioms \ > - -Dunreachable_pub -Dnon_ascii_idents \ > + -Dunsafe_op_in_unsafe_fn -Wrust_2018_idioms \ > + -Wunreachable_pub -Wnon_ascii_idents \ Maybe also keep non_ascii_idents as error? It shouldn't have any false positives. > -Wmissing_docs \ > - -Drustdoc::missing_crate_level_docs \ > - -Dclippy::correctness -Dclippy::style \ > - -Dclippy::suspicious -Dclippy::complexity \ > - -Dclippy::perf \ > - -Dclippy::let_unit_value -Dclippy::mut_mut \ > - -Dclippy::needless_bitwise_bool \ > - -Dclippy::needless_continue \ > - -Dclippy::no_mangle_with_rust_abi \ > + -Wrustdoc::missing_crate_level_docs \ > + -Wclippy::correctness -Wclippy::style \ > + -Wclippy::suspicious -Wclippy::complexity \ > + -Wclippy::perf \ > + -Wclippy::let_unit_value -Wclippy::mut_mut \ > + -Wclippy::needless_bitwise_bool \ > + -Wclippy::needless_continue \ > + -Wclippy::no_mangle_with_rust_abi \ > -Wclippy::dbg_macro > > KBUILD_HOSTCFLAGS := $(KBUILD_USERHOSTCFLAGS) $(HOST_LFS_CFLAGS) $(HOSTCFLAGS) > @@ -573,7 +573,7 @@ KBUILD_RUSTFLAGS := $(rust_common_flags) \ > -Csymbol-mangling-version=v0 \ > -Crelocation-model=static \ > -Zfunction-sections=n \ > - -Dclippy::float_arithmetic > + -Wclippy::float_arithmetic > > KBUILD_AFLAGS_KERNEL := > KBUILD_CFLAGS_KERNEL := > diff --git a/rust/Makefile b/rust/Makefile > index f70d5e244fee..4c03e53d3084 100644 > --- a/rust/Makefile > +++ b/rust/Makefile > @@ -421,7 +421,7 @@ ifneq ($(or $(CONFIG_ARM64),$(and $(CONFIG_RISCV),$(CONFIG_64BIT))),) > endif > > $(obj)/core.o: private skip_clippy = 1 > -$(obj)/core.o: private skip_flags = -Dunreachable_pub > +$(obj)/core.o: private skip_flags = -Wunreachable_pub > $(obj)/core.o: private rustc_objcopy = $(foreach sym,$(redirect-intrinsics),--redefine-sym $(sym)=__rust$(sym)) > $(obj)/core.o: private rustc_target_flags = $(core-cfgs) > $(obj)/core.o: $(RUST_LIB_SRC)/core/src/lib.rs FORCE > @@ -435,7 +435,7 @@ $(obj)/compiler_builtins.o: $(src)/compiler_builtins.rs $(obj)/core.o FORCE > +$(call if_changed_dep,rustc_library) > > $(obj)/alloc.o: private skip_clippy = 1 > -$(obj)/alloc.o: private skip_flags = -Dunreachable_pub > +$(obj)/alloc.o: private skip_flags = -Wunreachable_pub > $(obj)/alloc.o: private rustc_target_flags = $(alloc-cfgs) > $(obj)/alloc.o: $(RUST_LIB_SRC)/alloc/src/lib.rs $(obj)/compiler_builtins.o FORCE > +$(call if_changed_dep,rustc_library) > -- > 2.45.2 Cheers, Bjorn
On Mon, Jul 1, 2024 at 9:49 PM Björn Roy Baron <bjorn3_gh@protonmail.com> wrote: > > Maybe also keep non_ascii_idents as error? It shouldn't have any false positives. I was on the fence for that one too. It is also unlikely that having it as `-W` helps "productivity", i.e. I don't expect anybody to be helped by being able to type non-ASCII identifiers during development. :) Happy either way. Thanks for the quick review, too! Cheers, Miguel
diff --git a/Makefile b/Makefile index 4d36f943b3b1..056176a55d63 100644 --- a/Makefile +++ b/Makefile @@ -461,17 +461,17 @@ KBUILD_USERLDFLAGS := $(USERLDFLAGS) # host programs. export rust_common_flags := --edition=2021 \ -Zbinary_dep_depinfo=y \ - -Dunsafe_op_in_unsafe_fn -Drust_2018_idioms \ - -Dunreachable_pub -Dnon_ascii_idents \ + -Dunsafe_op_in_unsafe_fn -Wrust_2018_idioms \ + -Wunreachable_pub -Wnon_ascii_idents \ -Wmissing_docs \ - -Drustdoc::missing_crate_level_docs \ - -Dclippy::correctness -Dclippy::style \ - -Dclippy::suspicious -Dclippy::complexity \ - -Dclippy::perf \ - -Dclippy::let_unit_value -Dclippy::mut_mut \ - -Dclippy::needless_bitwise_bool \ - -Dclippy::needless_continue \ - -Dclippy::no_mangle_with_rust_abi \ + -Wrustdoc::missing_crate_level_docs \ + -Wclippy::correctness -Wclippy::style \ + -Wclippy::suspicious -Wclippy::complexity \ + -Wclippy::perf \ + -Wclippy::let_unit_value -Wclippy::mut_mut \ + -Wclippy::needless_bitwise_bool \ + -Wclippy::needless_continue \ + -Wclippy::no_mangle_with_rust_abi \ -Wclippy::dbg_macro KBUILD_HOSTCFLAGS := $(KBUILD_USERHOSTCFLAGS) $(HOST_LFS_CFLAGS) $(HOSTCFLAGS) @@ -573,7 +573,7 @@ KBUILD_RUSTFLAGS := $(rust_common_flags) \ -Csymbol-mangling-version=v0 \ -Crelocation-model=static \ -Zfunction-sections=n \ - -Dclippy::float_arithmetic + -Wclippy::float_arithmetic KBUILD_AFLAGS_KERNEL := KBUILD_CFLAGS_KERNEL := diff --git a/rust/Makefile b/rust/Makefile index f70d5e244fee..4c03e53d3084 100644 --- a/rust/Makefile +++ b/rust/Makefile @@ -421,7 +421,7 @@ ifneq ($(or $(CONFIG_ARM64),$(and $(CONFIG_RISCV),$(CONFIG_64BIT))),) endif $(obj)/core.o: private skip_clippy = 1 -$(obj)/core.o: private skip_flags = -Dunreachable_pub +$(obj)/core.o: private skip_flags = -Wunreachable_pub $(obj)/core.o: private rustc_objcopy = $(foreach sym,$(redirect-intrinsics),--redefine-sym $(sym)=__rust$(sym)) $(obj)/core.o: private rustc_target_flags = $(core-cfgs) $(obj)/core.o: $(RUST_LIB_SRC)/core/src/lib.rs FORCE @@ -435,7 +435,7 @@ $(obj)/compiler_builtins.o: $(src)/compiler_builtins.rs $(obj)/core.o FORCE +$(call if_changed_dep,rustc_library) $(obj)/alloc.o: private skip_clippy = 1 -$(obj)/alloc.o: private skip_flags = -Dunreachable_pub +$(obj)/alloc.o: private skip_flags = -Wunreachable_pub $(obj)/alloc.o: private rustc_target_flags = $(alloc-cfgs) $(obj)/alloc.o: $(RUST_LIB_SRC)/alloc/src/lib.rs $(obj)/compiler_builtins.o FORCE +$(call if_changed_dep,rustc_library)
Since we are starting to support several Rust toolchains, lints (including Clippy ones) now may behave differently and lint groups may include new lints. Therefore, to maximize the chances a given version works, relax some deny-level lints to warnings. It may also make our lives a bit easier while developing new code or refactoring. To be clear, the requirements for in-tree code are still the same, since Rust code still needs to be warning-free (patches should be clean under `WERROR=y`) and the set of lints is not changed. `unsafe_op_in_unsafe_fn` is left unmodified, i.e. as an error, since 1) it is simple enough that it should not have false positives (unlike e.g. `rust_2018_idioms`'s `explicit_outlives_requirements`) and 2) it is becoming the default in the language (warn-by-default in Rust 2024 [1] and ideally an error later on) and thus it should also be very well tested. Link: https://github.com/rust-lang/rust/pull/112038 [1] Signed-off-by: Miguel Ojeda <ojeda@kernel.org> --- Makefile | 22 +++++++++++----------- rust/Makefile | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-)