From 6643586a1dfbc3df44ddb1edf1f750647c7e5f99 Mon Sep 17 00:00:00 2001 From: onur-ozkan Date: Sun, 10 Nov 2024 23:06:42 +0300 Subject: [PATCH 1/2] handle separate prefixes in clippy args Signed-off-by: onur-ozkan --- src/bootstrap/src/core/build_steps/clippy.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/src/core/build_steps/clippy.rs b/src/bootstrap/src/core/build_steps/clippy.rs index cd198c425c008..3d4b89a363e36 100644 --- a/src/bootstrap/src/core/build_steps/clippy.rs +++ b/src/bootstrap/src/core/build_steps/clippy.rs @@ -82,7 +82,7 @@ pub(crate) fn get_clippy_rules_in_order( { item.iter().for_each(|v| { let rule = format!("{prefix}{v}"); - let position = all_args.iter().position(|t| t == &rule).unwrap(); + let position = all_args.iter().position(|t| t == &rule || t == v).unwrap(); result.push((position, rule)); }); } From 469c8baab8670935284b0a38116e993898d7d416 Mon Sep 17 00:00:00 2001 From: onur-ozkan Date: Sun, 10 Nov 2024 23:07:00 +0300 Subject: [PATCH 2/2] add test coverage for separate clippy prefixes Signed-off-by: onur-ozkan --- src/bootstrap/src/core/config/tests.rs | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/bootstrap/src/core/config/tests.rs b/src/bootstrap/src/core/config/tests.rs index 1f02757682c22..e4ce64e2bc176 100644 --- a/src/bootstrap/src/core/config/tests.rs +++ b/src/bootstrap/src/core/config/tests.rs @@ -323,6 +323,23 @@ fn order_of_clippy_rules() { assert_eq!(expected, actual); } +#[test] +fn clippy_rule_separate_prefix() { + let args = + vec!["clippy".to_string(), "-A clippy:all".to_string(), "-W clippy::style".to_string()]; + let config = Config::parse(Flags::parse(&args)); + + let actual = match &config.cmd { + crate::Subcommand::Clippy { allow, deny, warn, forbid, .. } => { + get_clippy_rules_in_order(&args, &allow, &deny, &warn, &forbid) + } + _ => panic!("invalid subcommand"), + }; + + let expected = vec!["-A clippy:all".to_string(), "-W clippy::style".to_string()]; + assert_eq!(expected, actual); +} + #[test] fn verbose_tests_default_value() { let config = Config::parse(Flags::parse(&["build".into(), "compiler".into()]));