mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-11-25 22:29:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Avoid including nursery rules in linter-level selectors (#5268)

Browse source 
## Summary

Ensures that `--select PL` and `--select PLC` don't include `PLC1901`.
Previously, `--select PL` _did_, because it's a "linter-level selector"
(`--select PLC` is viewed as selecting the `C` prefix from `PL`), and we
were missing this filtering path.
This commit is contained in:
Charlie Marsh 2023-06-21 16:11:40 -04:00 • committed by GitHub
parent f194572be8
commit e71f044f0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/ruff_macros/src/map_codes.rs
View file

@ -192,7 +192,8 @@ fn rules_by_prefix(
for (code, rule) in rules { for (code, rule) in rules {
// Nursery rules have to be explicitly selected, so we ignore them when looking at // Nursery rules have to be explicitly selected, so we ignore them when looking at
// prefixes. // prefix-level selectors (e.g., `--select SIM10`), but add the rule itself under
// its fully-qualified code (e.g., `--select SIM101`).
if is_nursery(&rule.group) { if is_nursery(&rule.group) {
rules_by_prefix.insert(code.clone(), vec![(rule.path.clone(), rule.attrs.clone())]); rules_by_prefix.insert(code.clone(), vec![(rule.path.clone(), rule.attrs.clone())]);
continue; continue;
@ -329,7 +330,14 @@ fn generate_iter_impl(
) -> TokenStream { ) -> TokenStream {
let mut linter_into_iter_match_arms = quote!(); let mut linter_into_iter_match_arms = quote!();
for (linter, map) in linter_to_rules { for (linter, map) in linter_to_rules {
let rule_paths = map.values().map(|Rule { attrs, path, .. }| { let rule_paths = map
.values()
.filter(|rule| {
// Nursery rules have to be explicitly selected, so we ignore them when looking at
// linter-level selectors (e.g., `--select SIM`).
!is_nursery(&rule.group)
})
.map(|Rule { attrs, path, .. }| {
let rule_name = path.segments.last().unwrap(); let rule_name = path.segments.last().unwrap();
quote!(#(#attrs)* Rule::#rule_name) quote!(#(#attrs)* Rule::#rule_name)
}); });