revert RuleNamespace and NoqaCode::rule changes

from 08a227e in #18391

Author: ntBre

crates/ruff_linter/src/registry.rs

@@ -215,6 +215,12 @@ pub enum Linter {
 }
 
 pub trait RuleNamespace: Sized {
+    /// Returns the prefix that every single code that ruff uses to identify
+    /// rules from this linter starts with.  In the case that multiple
+    /// `#[prefix]`es are configured for the variant in the `Linter` enum
+    /// definition this is the empty string.
+    fn common_prefix(&self) -> &'static str;
+
     /// Attempts to parse the given rule code. If the prefix is recognized
     /// returns the respective variant along with the code with the common
     /// prefix stripped.

crates/ruff_linter/src/rule_selector.rs

@@ -265,6 +265,7 @@ mod schema {
     use strum::IntoEnumIterator;
 
     use crate::RuleSelector;
+    use crate::registry::RuleNamespace;
     use crate::rule_selector::{Linter, RuleCodePrefix};
 
     impl JsonSchema for RuleSelector {

crates/ruff_macros/src/map_codes.rs

@@ -254,11 +254,9 @@ fn generate_rule_to_code(linter_to_rules: &BTreeMap<Ident, BTreeMap<String, Rule
     }
 
     let mut rule_noqa_code_match_arms = quote!();
-    let mut noqa_code_rule_match_arms = quote!();
     let mut rule_group_match_arms = quote!();
-    let mut noqa_code_consts = quote!();
 
-    for (i, (rule, codes)) in rule_to_codes.into_iter().enumerate() {
+    for (rule, codes) in rule_to_codes {
         let rule_name = rule.segments.last().unwrap();
         assert_eq!(
             codes.len(),
@@ -294,14 +292,6 @@ See also https://github.com/astral-sh/ruff/issues/2186.
             #(#attrs)* Rule::#rule_name => NoqaCode(crate::registry::Linter::#linter.common_prefix(), #code),
         });
 
-        let const_ident = quote::format_ident!("NOQA_PREFIX_{}", i);
-        noqa_code_consts.extend(quote! {
-            const #const_ident: &str = crate::registry::Linter::#linter.common_prefix();
-        });
-        noqa_code_rule_match_arms.extend(quote! {
-            #(#attrs)* NoqaCode(#const_ident, #code) => Some(Rule::#rule_name),
-        });
-
         rule_group_match_arms.extend(quote! {
             #(#attrs)* Rule::#rule_name => #group,
         });
@@ -350,16 +340,6 @@ See also https://github.com/astral-sh/ruff/issues/2186.
                 }
             }
         }
-
-        impl NoqaCode {
-            pub fn rule(&self) -> Option<Rule> {
-                #noqa_code_consts
-                match self {
-                    #noqa_code_rule_match_arms
-                    _ => None
-                }
-            }
-        }
     };
     rule_to_code
 }

crates/ruff_macros/src/rule_namespace.rs

@@ -118,6 +118,10 @@ pub(crate) fn derive_impl(input: DeriveInput) -> syn::Result<proc_macro2::TokenS
                 None
             }
 
+            fn common_prefix(&self) -> &'static str {
+                match self { #common_prefix_match_arms }
+            }
+
             fn name(&self) -> &'static str {
                 match self { #name_match_arms }
             }
@@ -126,16 +130,6 @@ pub(crate) fn derive_impl(input: DeriveInput) -> syn::Result<proc_macro2::TokenS
                 match self { #url_match_arms }
             }
         }
-
-        impl #ident {
-            /// Returns the prefix that every single code that ruff uses to identify
-            /// rules from this linter starts with.  In the case that multiple
-            /// `#[prefix]`es are configured for the variant in the `Linter` enum
-            /// definition this is the empty string.
-            pub const fn common_prefix(&self) -> &'static str {
-                match self { #common_prefix_match_arms }
-            }
-        }
     })
 }
 

crates/ruff_workspace/src/configuration.rs

@@ -22,7 +22,7 @@ use ruff_cache::cache_dir;
 use ruff_formatter::IndentStyle;
 use ruff_graph::{AnalyzeSettings, Direction};
 use ruff_linter::line_width::{IndentWidth, LineLength};
-use ruff_linter::registry::{INCOMPATIBLE_CODES, Rule, RuleSet};
+use ruff_linter::registry::{INCOMPATIBLE_CODES, Rule, RuleNamespace, RuleSet};
 use ruff_linter::rule_selector::{PreviewOptions, Specificity};
 use ruff_linter::rules::{flake8_import_conventions, isort, pycodestyle};
 use ruff_linter::settings::fix_safety_table::FixSafetyTable;