From 59947595608e1d29e4361121dc9de9b705ef5f2e Mon Sep 17 00:00:00 2001 From: Justin Tracey Date: Sun, 29 Sep 2024 14:04:42 -0400 Subject: [PATCH] move lints from rustflags to Cargo.toml This prevents unnecessary rebuilds when mixing runs of `cargo clippy` and other cargo commands (e.g., `cargo c && cargo clippy && cargo c` no longer rebuilds). --- .cargo/config.toml | 11 ----------- Cargo.toml | 21 ++++++++++++++------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index d7db3025d..58e1381b1 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,13 +1,2 @@ [target.x86_64-unknown-redox] linker = "x86_64-unknown-redox-gcc" - -[target.'cfg(clippy)'] -rustflags = [ - "-Wclippy::use_self", - "-Wclippy::needless_pass_by_value", - "-Wclippy::semicolon_if_nothing_returned", - "-Wclippy::single_char_pattern", - "-Wclippy::explicit_iter_loop", - "-Wclippy::if_not_else", -] - diff --git a/Cargo.toml b/Cargo.toml index eae872535..30852080f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -559,10 +559,17 @@ panic = "abort" strip = true [lints.clippy] -multiple_crate_versions = { level = "allow", priority = 1 } -cargo_common_metadata = { level = "allow", priority = 1 } -uninlined_format_args = { level = "allow", priority = 1 } -missing_panics_doc = { level = "allow", priority = 1 } -all = "deny" -cargo = "warn" -pedantic = "deny" +multiple_crate_versions = "allow" +cargo_common_metadata = "allow" +uninlined_format_args = "allow" +missing_panics_doc = "allow" + +needless_pass_by_value = "warn" +semicolon_if_nothing_returned = "warn" +single_char_pattern = "warn" +explicit_iter_loop = "warn" +if_not_else = "warn" + +all = { level = "deny", priority = -1 } +cargo = { level = "warn", priority = -1 } +pedantic = { level = "deny", priority = -1 }