diff --git a/crates/ruff_macros/src/define_rule_mapping.rs b/crates/ruff_macros/src/define_rule_mapping.rs
index 76e679e798..2c7f0efa33 100644
--- a/crates/ruff_macros/src/define_rule_mapping.rs
+++ b/crates/ruff_macros/src/define_rule_mapping.rs
@@ -64,9 +64,8 @@ pub fn define_rule_mapping(mapping: &Mapping) -> proc_macro2::TokenStream {
     let rule_code_prefix = super::rule_code_prefix::expand(
         &Ident::new("Rule", Span::call_site()),
         &Ident::new("RuleCodePrefix", Span::call_site()),
-        mapping.entries.iter().map(|(code, ..)| code),
+        mapping.entries.iter().map(|(code, .., attr)| (code, attr)),
         |code| code_to_name[code],
-        mapping.entries.iter().map(|(.., attr)| attr),
     );
 
     quote! {
diff --git a/crates/ruff_macros/src/rule_code_prefix.rs b/crates/ruff_macros/src/rule_code_prefix.rs
index 6e98bfef32..aba584e43d 100644
--- a/crates/ruff_macros/src/rule_code_prefix.rs
+++ b/crates/ruff_macros/src/rule_code_prefix.rs
@@ -7,9 +7,8 @@ use syn::{Attribute, Ident};
 pub fn expand<'a>(
     rule_type: &Ident,
     prefix_ident: &Ident,
-    variants: impl Iterator<Item = &'a Ident>,
+    variants: impl Iterator<Item = (&'a Ident, &'a Vec<Attribute>)>,
     variant_name: impl Fn(&str) -> &'a Ident,
-    attr: impl Iterator<Item = &'a Vec<Attribute>>,
 ) -> proc_macro2::TokenStream {
     // Build up a map from prefix to matching RuleCodes.
     let mut prefix_to_codes: BTreeMap<String, BTreeMap<String, Vec<Attribute>>> =
@@ -17,7 +16,7 @@ pub fn expand<'a>(
 
     let mut pl_codes = BTreeMap::new();
 
-    for (variant, attr) in variants.zip(attr) {
+    for (variant, attr) in variants {
         let code_str = variant.to_string();
         let code_prefix_len = code_str
             .chars()