Redirect RUF011 to B035

crates/ruff_linter/src/checkers/ast/analyze/expression.rs

@@ -1424,7 +1424,7 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
  }
  }
  if checker.enabled(Rule::StaticKeyDictComprehension) {
- ruff::rules::static_key_dict_comprehension(checker, dict_comp);
+ flake8_bugbear::rules::static_key_dict_comprehension(checker, dict_comp);
  }
  }
  Expr::GeneratorExp(

crates/ruff_linter/src/codes.rs

@@ -347,6 +347,7 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
  (Flake8Bugbear, "032") => (RuleGroup::Stable, rules::flake8_bugbear::rules::UnintentionalTypeAnnotation),
  (Flake8Bugbear, "033") => (RuleGroup::Stable, rules::flake8_bugbear::rules::DuplicateValue),
  (Flake8Bugbear, "034") => (RuleGroup::Stable, rules::flake8_bugbear::rules::ReSubPositionalArgs),
+ (Flake8Bugbear, "035") => (RuleGroup::Stable, rules::flake8_bugbear::rules::StaticKeyDictComprehension),
  (Flake8Bugbear, "904") => (RuleGroup::Stable, rules::flake8_bugbear::rules::RaiseWithoutFromInsideExcept),
  (Flake8Bugbear, "905") => (RuleGroup::Stable, rules::flake8_bugbear::rules::ZipWithoutExplicitStrict),
 
@@ -910,7 +911,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
  (Ruff, "008") => (RuleGroup::Stable, rules::ruff::rules::MutableDataclassDefault),
  (Ruff, "009") => (RuleGroup::Stable, rules::ruff::rules::FunctionCallInDataclassDefaultArgument),
  (Ruff, "010") => (RuleGroup::Stable, rules::ruff::rules::ExplicitFStringTypeConversion),
- (Ruff, "011") => (RuleGroup::Stable, rules::ruff::rules::StaticKeyDictComprehension),
  (Ruff, "012") => (RuleGroup::Stable, rules::ruff::rules::MutableClassDefault),
  (Ruff, "013") => (RuleGroup::Stable, rules::ruff::rules::ImplicitOptional),
  #[cfg(feature = "unreachable-code")] // When removing this feature gate, also update rules_selector.rs

crates/ruff_linter/src/rule_redirects.rs

@@ -98,5 +98,6 @@ static REDIRECTS: Lazy<HashMap<&'static str, &'static str>> = Lazy::new(|| {
  ("T002", "FIX002"),
  ("T003", "FIX003"),
  ("T004", "FIX004"),
+ ("RUF011", "B035"),
  ])
 });

crates/ruff_linter/src/rules/flake8_bugbear/mod.rs

@@ -33,14 +33,14 @@ mod tests {
  #[test_case(Rule::GetAttrWithConstant, Path::new("B009_B010.py"))]
  #[test_case(Rule::JumpStatementInFinally, Path::new("B012.py"))]
  #[test_case(Rule::LoopVariableOverridesIterator, Path::new("B020.py"))]
- #[test_case(Rule::MutableArgumentDefault, Path::new("B006_B008.py"))]
  #[test_case(Rule::MutableArgumentDefault, Path::new("B006_1.py"))]
  #[test_case(Rule::MutableArgumentDefault, Path::new("B006_2.py"))]
  #[test_case(Rule::MutableArgumentDefault, Path::new("B006_3.py"))]
  #[test_case(Rule::MutableArgumentDefault, Path::new("B006_4.py"))]
  #[test_case(Rule::MutableArgumentDefault, Path::new("B006_5.py"))]
  #[test_case(Rule::MutableArgumentDefault, Path::new("B006_6.py"))]
  #[test_case(Rule::MutableArgumentDefault, Path::new("B006_7.py"))]
+ #[test_case(Rule::MutableArgumentDefault, Path::new("B006_B008.py"))]
  #[test_case(Rule::NoExplicitStacklevel, Path::new("B028.py"))]
  #[test_case(Rule::RaiseLiteral, Path::new("B016.py"))]
  #[test_case(Rule::RaiseWithoutFromInsideExcept, Path::new("B904.py"))]
@@ -49,16 +49,17 @@ mod tests {
  #[test_case(Rule::ReuseOfGroupbyGenerator, Path::new("B031.py"))]
  #[test_case(Rule::SetAttrWithConstant, Path::new("B009_B010.py"))]
  #[test_case(Rule::StarArgUnpackingAfterKeywordArg, Path::new("B026.py"))]
+ #[test_case(Rule::StaticKeyDictComprehension, Path::new("B035.py"))]
  #[test_case(Rule::StripWithMultiCharacters, Path::new("B005.py"))]
  #[test_case(Rule::UnaryPrefixIncrementDecrement, Path::new("B002.py"))]
  #[test_case(Rule::UnintentionalTypeAnnotation, Path::new("B032.py"))]
  #[test_case(Rule::UnreliableCallableCheck, Path::new("B004.py"))]
  #[test_case(Rule::UnusedLoopControlVariable, Path::new("B007.py"))]
- #[test_case(Rule::UselessComparison, Path::new("B015.py"))]
  #[test_case(Rule::UselessComparison, Path::new("B015.ipynb"))]
+ #[test_case(Rule::UselessComparison, Path::new("B015.py"))]
  #[test_case(Rule::UselessContextlibSuppress, Path::new("B022.py"))]
- #[test_case(Rule::UselessExpression, Path::new("B018.py"))]
  #[test_case(Rule::UselessExpression, Path::new("B018.ipynb"))]
+ #[test_case(Rule::UselessExpression, Path::new("B018.py"))]
  fn rules(rule_code: Rule, path: &Path) -> Result<()> {
  let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
  let diagnostics = test_path(

crates/ruff_linter/src/rules/flake8_bugbear/rules/mod.rs

@@ -22,6 +22,7 @@ pub(crate) use redundant_tuple_in_exception_handler::*;
 pub(crate) use reuse_of_groupby_generator::*;
 pub(crate) use setattr_with_constant::*;
 pub(crate) use star_arg_unpacking_after_keyword_arg::*;
+pub(crate) use static_key_dict_comprehension::*;
 pub(crate) use strip_with_multi_characters::*;
 pub(crate) use unary_prefix_increment_decrement::*;
 pub(crate) use unintentional_type_annotation::*;
@@ -56,6 +57,7 @@ mod redundant_tuple_in_exception_handler;
 mod reuse_of_groupby_generator;
 mod setattr_with_constant;
 mod star_arg_unpacking_after_keyword_arg;
+mod static_key_dict_comprehension;
 mod strip_with_multi_characters;
 mod unary_prefix_increment_decrement;
 mod unintentional_type_annotation;

crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF011_RUF011.py.snap → crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B035_B035.py.snap

@@ -1,80 +1,80 @@
 ---
-source: crates/ruff_linter/src/rules/ruff/mod.rs
+source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
 ---
-RUF011.py:15:2: RUF011 Dictionary comprehension uses static key: `"key"`
+B035.py:15:2: B035 Dictionary comprehension uses static key: `"key"`
  |
 14 | # Errors
 15 | {"key": value.upper() for value in data}
- | ^^^^^ RUF011
+ | ^^^^^ B035
 16 | {True: value.upper() for value in data}
 17 | {0: value.upper() for value in data}
  |
 
-RUF011.py:16:2: RUF011 Dictionary comprehension uses static key: `True`
+B035.py:16:2: B035 Dictionary comprehension uses static key: `True`
  |
 14 | # Errors
 15 | {"key": value.upper() for value in data}
 16 | {True: value.upper() for value in data}
- | ^^^^ RUF011
+ | ^^^^ B035
 17 | {0: value.upper() for value in data}
 18 | {(1, "a"): value.upper() for value in data} # Constant tuple
  |
 
-RUF011.py:17:2: RUF011 Dictionary comprehension uses static key: `0`
+B035.py:17:2: B035 Dictionary comprehension uses static key: `0`
  |
 15 | {"key": value.upper() for value in data}
 16 | {True: value.upper() for value in data}
 17 | {0: value.upper() for value in data}
- | ^ RUF011
+ | ^ B035
 18 | {(1, "a"): value.upper() for value in data} # Constant tuple
 19 | {constant: value.upper() for value in data}
  |
 
-RUF011.py:18:2: RUF011 Dictionary comprehension uses static key: `(1, "a")`
+B035.py:18:2: B035 Dictionary comprehension uses static key: `(1, "a")`
  |
 16 | {True: value.upper() for value in data}
 17 | {0: value.upper() for value in data}
 18 | {(1, "a"): value.upper() for value in data} # Constant tuple
- | ^^^^^^^^ RUF011
+ | ^^^^^^^^ B035
 19 | {constant: value.upper() for value in data}
 20 | {constant + constant: value.upper() for value in data}
  |
 
-RUF011.py:19:2: RUF011 Dictionary comprehension uses static key: `constant`
+B035.py:19:2: B035 Dictionary comprehension uses static key: `constant`
  |
 17 | {0: value.upper() for value in data}
 18 | {(1, "a"): value.upper() for value in data} # Constant tuple
 19 | {constant: value.upper() for value in data}
- | ^^^^^^^^ RUF011
+ | ^^^^^^^^ B035
 20 | {constant + constant: value.upper() for value in data}
 21 | {constant.attribute: value.upper() for value in data}
  |
 
-RUF011.py:20:2: RUF011 Dictionary comprehension uses static key: `constant + constant`
+B035.py:20:2: B035 Dictionary comprehension uses static key: `constant + constant`
  |
 18 | {(1, "a"): value.upper() for value in data} # Constant tuple
 19 | {constant: value.upper() for value in data}
 20 | {constant + constant: value.upper() for value in data}
- | ^^^^^^^^^^^^^^^^^^^ RUF011
+ | ^^^^^^^^^^^^^^^^^^^ B035
 21 | {constant.attribute: value.upper() for value in data}
 22 | {constant[0]: value.upper() for value in data}
  |
 
-RUF011.py:21:2: RUF011 Dictionary comprehension uses static key: `constant.attribute`
+B035.py:21:2: B035 Dictionary comprehension uses static key: `constant.attribute`
  |
 19 | {constant: value.upper() for value in data}
 20 | {constant + constant: value.upper() for value in data}
 21 | {constant.attribute: value.upper() for value in data}
- | ^^^^^^^^^^^^^^^^^^ RUF011
+ | ^^^^^^^^^^^^^^^^^^ B035
 22 | {constant[0]: value.upper() for value in data}
  |
 
-RUF011.py:22:2: RUF011 Dictionary comprehension uses static key: `constant[0]`
+B035.py:22:2: B035 Dictionary comprehension uses static key: `constant[0]`
  |
 20 | {constant + constant: value.upper() for value in data}
 21 | {constant.attribute: value.upper() for value in data}
 22 | {constant[0]: value.upper() for value in data}
- | ^^^^^^^^^^^ RUF011
+ | ^^^^^^^^^^^ B035
  |
 
 

crates/ruff_linter/src/rules/ruff/mod.rs

@@ -31,7 +31,6 @@ mod tests {
  #[test_case(Rule::MutableClassDefault, Path::new("RUF012.py"))]
  #[test_case(Rule::MutableDataclassDefault, Path::new("RUF008.py"))]
  #[test_case(Rule::PairwiseOverZipped, Path::new("RUF007.py"))]
- #[test_case(Rule::StaticKeyDictComprehension, Path::new("RUF011.py"))]
  #[test_case(
  Rule::UnnecessaryIterableAllocationForFirstElement,
  Path::new("RUF015.py")

crates/ruff_linter/src/rules/ruff/rules/mod.rs

@@ -13,7 +13,6 @@ pub(crate) use never_union::*;
 pub(crate) use pairwise_over_zipped::*;
 pub(crate) use parenthesize_logical_operators::*;
 pub(crate) use quadratic_list_summation::*;
-pub(crate) use static_key_dict_comprehension::*;
 pub(crate) use unnecessary_iterable_allocation_for_first_element::*;
 pub(crate) use unnecessary_key_check::*;
 #[cfg(feature = "unreachable-code")]
@@ -36,7 +35,6 @@ mod mutable_dataclass_default;
 mod never_union;
 mod pairwise_over_zipped;
 mod parenthesize_logical_operators;
-mod static_key_dict_comprehension;
 mod unnecessary_iterable_allocation_for_first_element;
 mod unnecessary_key_check;
 #[cfg(feature = "unreachable-code")]