From eccda3d3ed93c90fd48cb54ae3ea07ed2ac393e4 Mon Sep 17 00:00:00 2001 From: Zanie Date: Wed, 13 Sep 2023 15:33:16 -0500 Subject: [PATCH] Use feature instead of test cfg --- crates/ruff/Cargo.toml | 2 ++ crates/ruff/src/codes.rs | 6 +++--- crates/ruff/src/linter.rs | 2 +- crates/ruff/src/rules/ruff/rules/mod.rs | 4 ++-- crates/ruff_cli/Cargo.toml | 1 + 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/crates/ruff/Cargo.toml b/crates/ruff/Cargo.toml index ab41dd7b27..1e0be7a676 100644 --- a/crates/ruff/Cargo.toml +++ b/crates/ruff/Cargo.toml @@ -89,3 +89,5 @@ default = [] schemars = ["dep:schemars"] # Enables the UnreachableCode rule unreachable-code = [] +# Enables rules for internal integration tests +test-rules = [] diff --git a/crates/ruff/src/codes.rs b/crates/ruff/src/codes.rs index 9e09fd0d23..1da249d677 100644 --- a/crates/ruff/src/codes.rs +++ b/crates/ruff/src/codes.rs @@ -865,11 +865,11 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> { (Ruff, "017") => (RuleGroup::Nursery, rules::ruff::rules::QuadraticListSummation), (Ruff, "100") => (RuleGroup::Unspecified, rules::ruff::rules::UnusedNOQA), (Ruff, "200") => (RuleGroup::Unspecified, rules::ruff::rules::InvalidPyprojectToml), - #[cfg(test)] + #[cfg(feature = "test-rules")] (Ruff, "900") => (RuleGroup::Unspecified, rules::ruff::rules::StableTestRule), - #[cfg(test)] + #[cfg(feature = "test-rules")] (Ruff, "901") => (RuleGroup::Nursery, rules::ruff::rules::NurseryTestRule), - #[cfg(test)] + #[cfg(feature = "test-rules")] (Ruff, "902") => (RuleGroup::Preview, rules::ruff::rules::PreviewTestRule), // flake8-django diff --git a/crates/ruff/src/linter.rs b/crates/ruff/src/linter.rs index b99f116038..017abc5cee 100644 --- a/crates/ruff/src/linter.rs +++ b/crates/ruff/src/linter.rs @@ -214,7 +214,7 @@ pub fn check_path( } // Raise violations for internal test rules - #[cfg(test)] + #[cfg(feature = "test-rules")] { if settings.rules.enabled(Rule::StableTestRule) { diagnostics.push(Diagnostic::new( diff --git a/crates/ruff/src/rules/ruff/rules/mod.rs b/crates/ruff/src/rules/ruff/rules/mod.rs index 229d238682..c4132e66be 100644 --- a/crates/ruff/src/rules/ruff/rules/mod.rs +++ b/crates/ruff/src/rules/ruff/rules/mod.rs @@ -10,7 +10,7 @@ pub(crate) use mutable_class_default::*; pub(crate) use mutable_dataclass_default::*; pub(crate) use pairwise_over_zipped::*; pub(crate) use static_key_dict_comprehension::*; -#[cfg(test)] +#[cfg(feature = "test-rules")] pub(crate) use test_rules::*; pub(crate) use unnecessary_iterable_allocation_for_first_element::*; #[cfg(feature = "unreachable-code")] @@ -31,7 +31,7 @@ mod mutable_class_default; mod mutable_dataclass_default; mod pairwise_over_zipped; mod static_key_dict_comprehension; -#[cfg(test)] +#[cfg(feature = "test-rules")] mod test_rules; mod unnecessary_iterable_allocation_for_first_element; #[cfg(feature = "unreachable-code")] diff --git a/crates/ruff_cli/Cargo.toml b/crates/ruff_cli/Cargo.toml index 9c6674c3e9..1e49591b87 100644 --- a/crates/ruff_cli/Cargo.toml +++ b/crates/ruff_cli/Cargo.toml @@ -69,6 +69,7 @@ walkdir = { version = "2.3.2" } wild = { version = "2" } [dev-dependencies] +ruff = { path = "../ruff", features = ["clap", "test-rules"] } assert_cmd = { version = "2.0.8" } # Avoid writing colored snapshots when running tests from the terminal colored = { workspace = true, features = ["no-color"]}