about summary refs log tree commit diff
diff options
context:
space:
mode:
authoronur-ozkan <work@onurozkan.dev>2024-02-24 16:08:28 +0300
committeronur-ozkan <work@onurozkan.dev>2024-03-18 00:13:52 +0300
commita61bf3093eb57d6b63522d3ec1f4acceede0363b (patch)
treececea178ed8a5daea903f026018f687e6266203c
parent1945e8f1f6e54dc53ace8cf2314ed76301ff51ee (diff)
downloadrust-a61bf3093eb57d6b63522d3ec1f4acceede0363b.tar.gz
rust-a61bf3093eb57d6b63522d3ec1f4acceede0363b.zip
use `--cap-lints` only when deny and forbid rules are not specified
Signed-off-by: onur-ozkan <work@onurozkan.dev>
-rw-r--r--src/bootstrap/src/core/build_steps/check.rs9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/bootstrap/src/core/build_steps/check.rs b/src/bootstrap/src/core/build_steps/check.rs
index 4d13cf94d91..55180a82885 100644
--- a/src/bootstrap/src/core/build_steps/check.rs
+++ b/src/bootstrap/src/core/build_steps/check.rs
@@ -61,10 +61,15 @@ fn args(builder: &Builder<'_>) -> Vec<String> {
             }
         }
 
-        let all_args = std::env::args().collect::<Vec<_>>();
+        args.extend(strings(&["--"]));
+
+        if deny.is_empty() && forbid.is_empty() {
+            args.extend(strings(&["--cap-lints", "warn"]));
+        }
 
-        args.extend(strings(&["--", "--cap-lints", "warn"]));
+        let all_args = std::env::args().collect::<Vec<_>>();
         args.extend(get_clippy_rules_in_order(&all_args, allow, deny, warn, forbid));
+
         args.extend(ignored_lints.iter().map(|lint| format!("-Aclippy::{}", lint)));
         args.extend(builder.config.free_args.clone());
         args