Rollup merge of rust-lang#133746 - oli-obk:push-xwyrylxmrtvq, r=jieyouxu

GuillaumeGomez · web-flow · commit 6f9f17fc08d9 · 2024-12-02T23:08:58.000+01:00
Change `AttrArgs::Eq` to a struct variant Cleanups for simplifying rust-lang#131808 Basically changes `AttrArgs::Eq` to a struct variant and then avoids several matches on `AttrArgsEq` in favor of methods on it. This will make future refactorings simpler, as they can either keep methods or switch to field accesses without having to restructure code
diff --git a/compiler/rustc_ast/src/ast.rs b/compiler/rustc_ast/src/ast.rs
@@ -1731,12 +1731,12 @@ pub enum AttrArgs {
     /// Delimited arguments: `#[attr()/[]/{}]`.
     Delimited(DelimArgs),
     /// Arguments of a key-value attribute: `#[attr = "value"]`.
-    Eq(
+    Eq {
         /// Span of the `=` token.
-        Span,
-        /// The "value".
-        AttrArgsEq,
-    ),
+        eq_span: Span,
+
+        value: AttrArgsEq,
+    },
 }
 
 // The RHS of an `AttrArgs::Eq` starts out as an expression. Once macro
@@ -1748,15 +1748,39 @@ pub enum AttrArgsEq {
     Hir(MetaItemLit),
 }
 
+impl AttrArgsEq {
+    pub fn span(&self) -> Span {
+        match self {
+            AttrArgsEq::Ast(p) => p.span,
+            AttrArgsEq::Hir(lit) => lit.span,
+        }
+    }
+
+    pub fn unwrap_ast(&self) -> &Expr {
+        match self {
+            AttrArgsEq::Ast(p) => p,
+            AttrArgsEq::Hir(lit) => {
+                unreachable!("in literal form when getting inner tokens: {lit:?}")
+            }
+        }
+    }
+
+    pub fn unwrap_ast_mut(&mut self) -> &mut P<Expr> {
+        match self {
+            AttrArgsEq::Ast(p) => p,
+            AttrArgsEq::Hir(lit) => {
+                unreachable!("in literal form when getting inner tokens: {lit:?}")
+            }
+        }
+    }
+}
+
 impl AttrArgs {
     pub fn span(&self) -> Option<Span> {
         match self {
             AttrArgs::Empty => None,
             AttrArgs::Delimited(args) => Some(args.dspan.entire()),
-            AttrArgs::Eq(eq_span, AttrArgsEq::Ast(expr)) => Some(eq_span.to(expr.span)),
-            AttrArgs::Eq(_, AttrArgsEq::Hir(lit)) => {
-                unreachable!("in literal form when getting span: {:?}", lit);
-            }
+            AttrArgs::Eq { eq_span, value } => Some(eq_span.to(value.span())),
         }
     }
 
@@ -1766,10 +1790,7 @@ impl AttrArgs {
         match self {
             AttrArgs::Empty => TokenStream::default(),
             AttrArgs::Delimited(args) => args.tokens.clone(),
-            AttrArgs::Eq(_, AttrArgsEq::Ast(expr)) => TokenStream::from_ast(expr),
-            AttrArgs::Eq(_, AttrArgsEq::Hir(lit)) => {
-                unreachable!("in literal form when getting inner tokens: {:?}", lit)
-            }
+            AttrArgs::Eq { value, .. } => TokenStream::from_ast(value.unwrap_ast()),
         }
     }
 }
@@ -1783,10 +1804,10 @@ where
         match self {
             AttrArgs::Empty => {}
             AttrArgs::Delimited(args) => args.hash_stable(ctx, hasher),
-            AttrArgs::Eq(_eq_span, AttrArgsEq::Ast(expr)) => {
+            AttrArgs::Eq { value: AttrArgsEq::Ast(expr), .. } => {
                 unreachable!("hash_stable {:?}", expr);
             }
-            AttrArgs::Eq(eq_span, AttrArgsEq::Hir(lit)) => {
+            AttrArgs::Eq { eq_span, value: AttrArgsEq::Hir(lit) } => {
                 eq_span.hash_stable(ctx, hasher);
                 lit.hash_stable(ctx, hasher);
             }
diff --git a/compiler/rustc_ast/src/attr/mod.rs b/compiler/rustc_ast/src/attr/mod.rs
@@ -250,7 +250,7 @@ impl AttrItem {
             AttrArgs::Delimited(args) if args.delim == Delimiter::Parenthesis => {
                 MetaItemKind::list_from_tokens(args.tokens.clone())
             }
-            AttrArgs::Delimited(_) | AttrArgs::Eq(..) | AttrArgs::Empty => None,
+            AttrArgs::Delimited(_) | AttrArgs::Eq { .. } | AttrArgs::Empty => None,
         }
     }
 
@@ -268,7 +268,7 @@ impl AttrItem {
     /// ```
     fn value_str(&self) -> Option<Symbol> {
         match &self.args {
-            AttrArgs::Eq(_, args) => args.value_str(),
+            AttrArgs::Eq { value, .. } => value.value_str(),
             AttrArgs::Delimited(_) | AttrArgs::Empty => None,
         }
     }
@@ -492,7 +492,7 @@ impl MetaItemKind {
                 MetaItemKind::list_from_tokens(tokens.clone()).map(MetaItemKind::List)
             }
             AttrArgs::Delimited(..) => None,
-            AttrArgs::Eq(_, AttrArgsEq::Ast(expr)) => match expr.kind {
+            AttrArgs::Eq { value: AttrArgsEq::Ast(expr), .. } => match expr.kind {
                 ExprKind::Lit(token_lit) => {
                     // Turn failures to `None`, we'll get parse errors elsewhere.
                     MetaItemLit::from_token_lit(token_lit, expr.span)
@@ -501,7 +501,9 @@ impl MetaItemKind {
                 }
                 _ => None,
             },
-            AttrArgs::Eq(_, AttrArgsEq::Hir(lit)) => Some(MetaItemKind::NameValue(lit.clone())),
+            AttrArgs::Eq { value: AttrArgsEq::Hir(lit), .. } => {
+                Some(MetaItemKind::NameValue(lit.clone()))
+            }
         }
     }
 }
@@ -702,7 +704,7 @@ pub fn mk_attr_name_value_str(
         tokens: None,
     });
     let path = Path::from_ident(Ident::new(name, span));
-    let args = AttrArgs::Eq(span, AttrArgsEq::Ast(expr));
+    let args = AttrArgs::Eq { eq_span: span, value: AttrArgsEq::Ast(expr) };
     mk_attr(g, style, unsafety, path, args, span)
 }
 
diff --git a/compiler/rustc_ast/src/mut_visit.rs b/compiler/rustc_ast/src/mut_visit.rs
@@ -451,13 +451,10 @@ fn visit_attr_args<T: MutVisitor>(vis: &mut T, args: &mut AttrArgs) {
     match args {
         AttrArgs::Empty => {}
         AttrArgs::Delimited(args) => visit_delim_args(vis, args),
-        AttrArgs::Eq(eq_span, AttrArgsEq::Ast(expr)) => {
-            vis.visit_expr(expr);
+        AttrArgs::Eq { eq_span, value } => {
+            vis.visit_expr(value.unwrap_ast_mut());
             vis.visit_span(eq_span);
         }
-        AttrArgs::Eq(_eq_span, AttrArgsEq::Hir(lit)) => {
-            unreachable!("in literal form when visiting mac args eq: {:?}", lit)
-        }
     }
 }
 
diff --git a/compiler/rustc_ast/src/visit.rs b/compiler/rustc_ast/src/visit.rs
@@ -1273,10 +1273,7 @@ pub fn walk_attr_args<'a, V: Visitor<'a>>(visitor: &mut V, args: &'a AttrArgs) -
     match args {
         AttrArgs::Empty => {}
         AttrArgs::Delimited(_args) => {}
-        AttrArgs::Eq(_eq_span, AttrArgsEq::Ast(expr)) => try_visit!(visitor.visit_expr(expr)),
-        AttrArgs::Eq(_eq_span, AttrArgsEq::Hir(lit)) => {
-            unreachable!("in literal form when walking mac args eq: {:?}", lit)
-        }
+        AttrArgs::Eq { value, .. } => try_visit!(visitor.visit_expr(value.unwrap_ast())),
     }
     V::Result::output()
 }
diff --git a/compiler/rustc_ast_lowering/src/lib.rs b/compiler/rustc_ast_lowering/src/lib.rs
@@ -889,7 +889,8 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
             // This is an inert key-value attribute - it will never be visible to macros
             // after it gets lowered to HIR. Therefore, we can extract literals to handle
             // nonterminals in `#[doc]` (e.g. `#[doc = $e]`).
-            AttrArgs::Eq(eq_span, AttrArgsEq::Ast(expr)) => {
+            &AttrArgs::Eq { eq_span, ref value } => {
+                let expr = value.unwrap_ast();
                 // In valid code the value always ends up as a single literal. Otherwise, a dummy
                 // literal suffices because the error is handled elsewhere.
                 let lit = if let ExprKind::Lit(token_lit) = expr.kind
@@ -905,10 +906,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
                         span: DUMMY_SP,
                     }
                 };
-                AttrArgs::Eq(*eq_span, AttrArgsEq::Hir(lit))
-            }
-            AttrArgs::Eq(_, AttrArgsEq::Hir(lit)) => {
-                unreachable!("in literal form when lowering mac args eq: {:?}", lit)
+                AttrArgs::Eq { eq_span, value: AttrArgsEq::Hir(lit) }
             }
         }
     }
diff --git a/compiler/rustc_ast_pretty/src/pprust/state.rs b/compiler/rustc_ast_pretty/src/pprust/state.rs
@@ -648,14 +648,14 @@ pub trait PrintState<'a>: std::ops::Deref<Target = pp::Printer> + std::ops::Dere
             AttrArgs::Empty => {
                 self.print_path(&item.path, false, 0);
             }
-            AttrArgs::Eq(_, AttrArgsEq::Ast(expr)) => {
+            AttrArgs::Eq { value: AttrArgsEq::Ast(expr), .. } => {
                 self.print_path(&item.path, false, 0);
                 self.space();
                 self.word_space("=");
                 let token_str = self.expr_to_string(expr);
                 self.word(token_str);
             }
-            AttrArgs::Eq(_, AttrArgsEq::Hir(lit)) => {
+            AttrArgs::Eq { value: AttrArgsEq::Hir(lit), .. } => {
                 self.print_path(&item.path, false, 0);
                 self.space();
                 self.word_space("=");
diff --git a/compiler/rustc_expand/src/expand.rs b/compiler/rustc_expand/src/expand.rs
@@ -732,7 +732,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
                         _ => item.to_tokens(),
                     };
                     let attr_item = attr.unwrap_normal_item();
-                    if let AttrArgs::Eq(..) = attr_item.args {
+                    if let AttrArgs::Eq { .. } = attr_item.args {
                         self.cx.dcx().emit_err(UnsupportedKeyValue { span });
                     }
                     let inner_tokens = attr_item.args.inner_tokens();
diff --git a/compiler/rustc_parse/src/parser/mod.rs b/compiler/rustc_parse/src/parser/mod.rs
@@ -1376,7 +1376,7 @@ impl<'a> Parser<'a> {
             AttrArgs::Delimited(args)
         } else if self.eat(&token::Eq) {
             let eq_span = self.prev_token.span;
-            AttrArgs::Eq(eq_span, AttrArgsEq::Ast(self.parse_expr_force_collect()?))
+            AttrArgs::Eq { eq_span, value: AttrArgsEq::Ast(self.parse_expr_force_collect()?) }
         } else {
             AttrArgs::Empty
         })
diff --git a/compiler/rustc_parse/src/validate_attr.rs b/compiler/rustc_parse/src/validate_attr.rs
@@ -43,7 +43,7 @@ pub fn check_attr(psess: &ParseSess, attr: &Attribute) {
             }
         }
         _ => {
-            if let AttrArgs::Eq(..) = attr_item.args {
+            if let AttrArgs::Eq { .. } = attr_item.args {
                 // All key-value attributes are restricted to meta-item syntax.
                 match parse_meta(psess, attr) {
                     Ok(_) => {}
@@ -70,7 +70,7 @@ pub fn parse_meta<'a>(psess: &'a ParseSess, attr: &Attribute) -> PResult<'a, Met
                     parse_in(psess, tokens.clone(), "meta list", |p| p.parse_meta_seq_top())?;
                 MetaItemKind::List(nmis)
             }
-            AttrArgs::Eq(_, AttrArgsEq::Ast(expr)) => {
+            AttrArgs::Eq { value: AttrArgsEq::Ast(expr), .. } => {
                 if let ast::ExprKind::Lit(token_lit) = expr.kind {
                     let res = ast::MetaItemLit::from_token_lit(token_lit, expr.span);
                     let res = match res {
@@ -116,7 +116,9 @@ pub fn parse_meta<'a>(psess: &'a ParseSess, attr: &Attribute) -> PResult<'a, Met
                     return Err(err);
                 }
             }
-            AttrArgs::Eq(_, AttrArgsEq::Hir(lit)) => MetaItemKind::NameValue(lit.clone()),
+            AttrArgs::Eq { value: AttrArgsEq::Hir(lit), .. } => {
+                MetaItemKind::NameValue(lit.clone())
+            }
         },
     })
 }
diff --git a/compiler/rustc_resolve/src/rustdoc.rs b/compiler/rustc_resolve/src/rustdoc.rs
@@ -220,9 +220,9 @@ pub fn attrs_to_doc_fragments<'a>(
 
 fn span_for_value(attr: &ast::Attribute) -> Span {
     if let ast::AttrKind::Normal(normal) = &attr.kind
-        && let ast::AttrArgs::Eq(_, ast::AttrArgsEq::Hir(meta)) = &normal.item.args
+        && let ast::AttrArgs::Eq { value, .. } = &normal.item.args
     {
-        meta.span.with_ctxt(attr.span.ctxt())
+        value.span().with_ctxt(attr.span.ctxt())
     } else {
         attr.span
     }
diff --git a/compiler/rustc_trait_selection/src/error_reporting/traits/on_unimplemented.rs b/compiler/rustc_trait_selection/src/error_reporting/traits/on_unimplemented.rs
@@ -1,7 +1,7 @@
 use std::iter;
 use std::path::PathBuf;
 
-use rustc_ast::{AttrArgs, AttrArgsEq, AttrKind, Attribute, MetaItemInner};
+use rustc_ast::{AttrArgs, AttrKind, Attribute, MetaItemInner};
 use rustc_data_structures::fx::FxHashMap;
 use rustc_errors::codes::*;
 use rustc_errors::{ErrorGuaranteed, struct_span_code_err};
@@ -639,8 +639,7 @@ impl<'tcx> OnUnimplementedDirective {
                 let report_span = match &item.args {
                     AttrArgs::Empty => item.path.span,
                     AttrArgs::Delimited(args) => args.dspan.entire(),
-                    AttrArgs::Eq(eq_span, AttrArgsEq::Ast(expr)) => eq_span.to(expr.span),
-                    AttrArgs::Eq(span, AttrArgsEq::Hir(expr)) => span.to(expr.span),
+                    AttrArgs::Eq { eq_span, value } => eq_span.to(value.span()),
                 };
 
                 if let Some(item_def_id) = item_def_id.as_local() {
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs
@@ -2647,7 +2647,7 @@ fn filter_doc_attr(normal: &mut ast::NormalAttr, is_inline: bool) {
             });
             args.tokens = TokenStream::new(tokens);
         }
-        ast::AttrArgs::Empty | ast::AttrArgs::Eq(..) => {}
+        ast::AttrArgs::Empty | ast::AttrArgs::Eq { .. } => {}
     }
 }
 
diff --git a/src/tools/clippy/clippy_lints/src/attrs/should_panic_without_expect.rs b/src/tools/clippy/clippy_lints/src/attrs/should_panic_without_expect.rs
@@ -9,7 +9,7 @@ use rustc_span::sym;
 
 pub(super) fn check(cx: &EarlyContext<'_>, attr: &Attribute) {
     if let AttrKind::Normal(normal_attr) = &attr.kind {
-        if let AttrArgs::Eq(_, AttrArgsEq::Ast(_)) = &normal_attr.item.args {
+        if let AttrArgs::Eq { value:  AttrArgsEq::Ast(_), .. } = &normal_attr.item.args {
             // `#[should_panic = ".."]` found, good
             return;
         }
diff --git a/src/tools/clippy/clippy_lints/src/doc/include_in_doc_without_cfg.rs b/src/tools/clippy/clippy_lints/src/doc/include_in_doc_without_cfg.rs
@@ -12,7 +12,7 @@ pub fn check(cx: &LateContext<'_>, attrs: &[Attribute]) {
         if !attr.span.from_expansion()
             && let AttrKind::Normal(ref normal) = attr.kind
             && normal.item.path == sym::doc
-            && let AttrArgs::Eq(_, AttrArgsEq::Hir(ref meta)) = normal.item.args
+            && let AttrArgs::Eq { value: AttrArgsEq::Hir(ref meta), .. } = normal.item.args
             && !attr.span.contains(meta.span)
             // Since the `include_str` is already expanded at this point, we can only take the
             // whole attribute snippet and then modify for our suggestion.
diff --git a/src/tools/clippy/clippy_lints/src/large_include_file.rs b/src/tools/clippy/clippy_lints/src/large_include_file.rs
@@ -96,7 +96,7 @@ impl LateLintPass<'_> for LargeIncludeFile {
             && let AttrKind::Normal(ref normal) = attr.kind
             && let Some(doc) = attr.doc_str()
             && doc.as_str().len() as u64 > self.max_file_size
-            && let AttrArgs::Eq(_, AttrArgsEq::Hir(ref meta)) = normal.item.args
+            && let AttrArgs::Eq { value: AttrArgsEq::Hir(ref meta), .. } = normal.item.args
             && !attr.span.contains(meta.span)
             // Since the `include_str` is already expanded at this point, we can only take the
             // whole attribute snippet and then modify for our suggestion.
diff --git a/src/tools/clippy/clippy_utils/src/ast_utils.rs b/src/tools/clippy/clippy_utils/src/ast_utils.rs
@@ -872,8 +872,8 @@ pub fn eq_attr_args(l: &AttrArgs, r: &AttrArgs) -> bool {
     match (l, r) {
         (Empty, Empty) => true,
         (Delimited(la), Delimited(ra)) => eq_delim_args(la, ra),
-        (Eq(_, AttrArgsEq::Ast(le)), Eq(_, AttrArgsEq::Ast(re))) => eq_expr(le, re),
-        (Eq(_, AttrArgsEq::Hir(ll)), Eq(_, AttrArgsEq::Hir(rl))) => ll.kind == rl.kind,
+        (Eq { value: AttrArgsEq::Ast(le), .. }, Eq{ value: AttrArgsEq::Ast(re), .. }) => eq_expr(le, re),
+        (Eq { value: AttrArgsEq::Hir(ll), .. }, Eq{ value: AttrArgsEq::Hir(rl), .. }) => ll.kind == rl.kind,
         _ => false,
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ impl AttrItem {`
`250`	`250`	`AttrArgs::Delimited(args) if args.delim == Delimiter::Parenthesis => {`
`251`	`251`	`MetaItemKind::list_from_tokens(args.tokens.clone())`
`252`	`252`	`}`
`253`		`- AttrArgs::Delimited(_) \| AttrArgs::Eq(..) \| AttrArgs::Empty => None,`
	`253`	`+ AttrArgs::Delimited(_) \| AttrArgs::Eq { .. } \| AttrArgs::Empty => None,`
`254`	`254`	`}`
`255`	`255`	`}`
`256`	`256`
`@@ -268,7 +268,7 @@ impl AttrItem {`
`268`	`268`	/// ```
`269`	`269`	`fn value_str(&self) -> Option<Symbol> {`
`270`	`270`	`match &self.args {`
`271`		`- AttrArgs::Eq(_, args) => args.value_str(),`
	`271`	`+ AttrArgs::Eq { value, .. } => value.value_str(),`
`272`	`272`	`AttrArgs::Delimited(_) \| AttrArgs::Empty => None,`
`273`	`273`	`}`
`274`	`274`	`}`
`@@ -492,7 +492,7 @@ impl MetaItemKind {`
`492`	`492`	`MetaItemKind::list_from_tokens(tokens.clone()).map(MetaItemKind::List)`
`493`	`493`	`}`
`494`	`494`	`AttrArgs::Delimited(..) => None,`
`495`		`- AttrArgs::Eq(_, AttrArgsEq::Ast(expr)) => match expr.kind {`
	`495`	`+ AttrArgs::Eq { value: AttrArgsEq::Ast(expr), .. } => match expr.kind {`
`496`	`496`	`ExprKind::Lit(token_lit) => {`
`497`	`497`	// Turn failures to `None`, we'll get parse errors elsewhere.
`498`	`498`	`MetaItemLit::from_token_lit(token_lit, expr.span)`
`@@ -501,7 +501,9 @@ impl MetaItemKind {`
`501`	`501`	`}`
`502`	`502`	`_ => None,`
`503`	`503`	`},`
`504`		`- AttrArgs::Eq(_, AttrArgsEq::Hir(lit)) => Some(MetaItemKind::NameValue(lit.clone())),`
	`504`	`+ AttrArgs::Eq { value: AttrArgsEq::Hir(lit), .. } => {`
	`505`	`+ Some(MetaItemKind::NameValue(lit.clone()))`
	`506`	`+ }`
`505`	`507`	`}`
`506`	`508`	`}`
`507`	`509`	`}`
`@@ -702,7 +704,7 @@ pub fn mk_attr_name_value_str(`
`702`	`704`	`tokens: None,`
`703`	`705`	`});`
`704`	`706`	`let path = Path::from_ident(Ident::new(name, span));`
`705`		`- let args = AttrArgs::Eq(span, AttrArgsEq::Ast(expr));`
	`707`	`+ let args = AttrArgs::Eq { eq_span: span, value: AttrArgsEq::Ast(expr) };`
`706`	`708`	`mk_attr(g, style, unsafety, path, args, span)`
`707`	`709`	`}`
`708`	`710`
Original file line number	Diff line number	Diff line change
`@@ -451,13 +451,10 @@ fn visit_attr_args<T: MutVisitor>(vis: &mut T, args: &mut AttrArgs) {`
`451`	`451`	`match args {`
`452`	`452`	`AttrArgs::Empty => {}`
`453`	`453`	`AttrArgs::Delimited(args) => visit_delim_args(vis, args),`
`454`		`- AttrArgs::Eq(eq_span, AttrArgsEq::Ast(expr)) => {`
`455`		`- vis.visit_expr(expr);`
	`454`	`+ AttrArgs::Eq { eq_span, value } => {`
	`455`	`+ vis.visit_expr(value.unwrap_ast_mut());`
`456`	`456`	`vis.visit_span(eq_span);`
`457`	`457`	`}`
`458`		`- AttrArgs::Eq(_eq_span, AttrArgsEq::Hir(lit)) => {`
`459`		`- unreachable!("in literal form when visiting mac args eq: {:?}", lit)`
`460`		`- }`
`461`	`458`	`}`
`462`	`459`	`}`
`463`	`460`
Original file line number	Diff line number	Diff line change
`@@ -1273,10 +1273,7 @@ pub fn walk_attr_args<'a, V: Visitor<'a>>(visitor: &mut V, args: &'a AttrArgs) -`
`1273`	`1273`	`match args {`
`1274`	`1274`	`AttrArgs::Empty => {}`
`1275`	`1275`	`AttrArgs::Delimited(_args) => {}`
`1276`		`- AttrArgs::Eq(_eq_span, AttrArgsEq::Ast(expr)) => try_visit!(visitor.visit_expr(expr)),`
`1277`		`- AttrArgs::Eq(_eq_span, AttrArgsEq::Hir(lit)) => {`
`1278`		`- unreachable!("in literal form when walking mac args eq: {:?}", lit)`
`1279`		`- }`
	`1276`	`+ AttrArgs::Eq { value, .. } => try_visit!(visitor.visit_expr(value.unwrap_ast())),`
`1280`	`1277`	`}`
`1281`	`1278`	`V::Result::output()`
`1282`	`1279`	`}`
Original file line number	Diff line number	Diff line change
`@@ -889,7 +889,8 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {`
`889`	`889`	`// This is an inert key-value attribute - it will never be visible to macros`
`890`	`890`	`// after it gets lowered to HIR. Therefore, we can extract literals to handle`
`891`	`891`	// nonterminals in `#[doc]` (e.g. `#[doc = $e]`).
`892`		`- AttrArgs::Eq(eq_span, AttrArgsEq::Ast(expr)) => {`
	`892`	`+ &AttrArgs::Eq { eq_span, ref value } => {`
	`893`	`+ let expr = value.unwrap_ast();`
`893`	`894`	`// In valid code the value always ends up as a single literal. Otherwise, a dummy`
`894`	`895`	`// literal suffices because the error is handled elsewhere.`
`895`	`896`	`let lit = if let ExprKind::Lit(token_lit) = expr.kind`
`@@ -905,10 +906,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {`
`905`	`906`	`span: DUMMY_SP,`
`906`	`907`	`}`
`907`	`908`	`};`
`908`		`- AttrArgs::Eq(*eq_span, AttrArgsEq::Hir(lit))`
`909`		`- }`
`910`		`- AttrArgs::Eq(_, AttrArgsEq::Hir(lit)) => {`
`911`		`- unreachable!("in literal form when lowering mac args eq: {:?}", lit)`
	`909`	`+ AttrArgs::Eq { eq_span, value: AttrArgsEq::Hir(lit) }`
`912`	`910`	`}`
`913`	`911`	`}`
`914`	`912`	`}`
Original file line number	Diff line number	Diff line change
`@@ -732,7 +732,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {`
`732`	`732`	`_ => item.to_tokens(),`
`733`	`733`	`};`
`734`	`734`	`let attr_item = attr.unwrap_normal_item();`
`735`		`- if let AttrArgs::Eq(..) = attr_item.args {`
	`735`	`+ if let AttrArgs::Eq { .. } = attr_item.args {`
`736`	`736`	`self.cx.dcx().emit_err(UnsupportedKeyValue { span });`
`737`	`737`	`}`
`738`	`738`	`let inner_tokens = attr_item.args.inner_tokens();`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ pub fn check_attr(psess: &ParseSess, attr: &Attribute) {`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`_ => {`
`46`		`- if let AttrArgs::Eq(..) = attr_item.args {`
	`46`	`+ if let AttrArgs::Eq { .. } = attr_item.args {`
`47`	`47`	`// All key-value attributes are restricted to meta-item syntax.`
`48`	`48`	`match parse_meta(psess, attr) {`
`49`	`49`	`Ok(_) => {}`
`@@ -70,7 +70,7 @@ pub fn parse_meta<'a>(psess: &'a ParseSess, attr: &Attribute) -> PResult<'a, Met`
`70`	`70`	`parse_in(psess, tokens.clone(), "meta list", \|p\| p.parse_meta_seq_top())?;`
`71`	`71`	`MetaItemKind::List(nmis)`
`72`	`72`	`}`
`73`		`- AttrArgs::Eq(_, AttrArgsEq::Ast(expr)) => {`
	`73`	`+ AttrArgs::Eq { value: AttrArgsEq::Ast(expr), .. } => {`
`74`	`74`	`if let ast::ExprKind::Lit(token_lit) = expr.kind {`
`75`	`75`	`let res = ast::MetaItemLit::from_token_lit(token_lit, expr.span);`
`76`	`76`	`let res = match res {`
`@@ -116,7 +116,9 @@ pub fn parse_meta<'a>(psess: &'a ParseSess, attr: &Attribute) -> PResult<'a, Met`
`116`	`116`	`return Err(err);`
`117`	`117`	`}`
`118`	`118`	`}`
`119`		`- AttrArgs::Eq(_, AttrArgsEq::Hir(lit)) => MetaItemKind::NameValue(lit.clone()),`
	`119`	`+ AttrArgs::Eq { value: AttrArgsEq::Hir(lit), .. } => {`
	`120`	`+ MetaItemKind::NameValue(lit.clone())`
	`121`	`+ }`
`120`	`122`	`},`
`121`	`123`	`})`
`122`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -220,9 +220,9 @@ pub fn attrs_to_doc_fragments<'a>(`
`220`	`220`
`221`	`221`	`fn span_for_value(attr: &ast::Attribute) -> Span {`
`222`	`222`	`if let ast::AttrKind::Normal(normal) = &attr.kind`
`223`		`- && let ast::AttrArgs::Eq(_, ast::AttrArgsEq::Hir(meta)) = &normal.item.args`
	`223`	`+ && let ast::AttrArgs::Eq { value, .. } = &normal.item.args`
`224`	`224`	`{`
`225`		`- meta.span.with_ctxt(attr.span.ctxt())`
	`225`	`+ value.span().with_ctxt(attr.span.ctxt())`
`226`	`226`	`} else {`
`227`	`227`	`attr.span`
`228`	`228`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2647,7 +2647,7 @@ fn filter_doc_attr(normal: &mut ast::NormalAttr, is_inline: bool) {`
`2647`	`2647`	`});`
`2648`	`2648`	`args.tokens = TokenStream::new(tokens);`
`2649`	`2649`	`}`
`2650`		`- ast::AttrArgs::Empty \| ast::AttrArgs::Eq(..) => {}`
	`2650`	`+ ast::AttrArgs::Empty \| ast::AttrArgs::Eq { .. } => {}`
`2651`	`2651`	`}`
`2652`	`2652`	`}`
`2653`	`2653`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ use rustc_span::sym;`
`9`	`9`
`10`	`10`	`pub(super) fn check(cx: &EarlyContext<'_>, attr: &Attribute) {`
`11`	`11`	`if let AttrKind::Normal(normal_attr) = &attr.kind {`
`12`		`- if let AttrArgs::Eq(_, AttrArgsEq::Ast(_)) = &normal_attr.item.args {`
	`12`	`+ if let AttrArgs::Eq { value: AttrArgsEq::Ast(_), .. } = &normal_attr.item.args {`
`13`	`13`	// `#[should_panic = ".."]` found, good
`14`	`14`	`return;`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -872,8 +872,8 @@ pub fn eq_attr_args(l: &AttrArgs, r: &AttrArgs) -> bool {`
`872`	`872`	`match (l, r) {`
`873`	`873`	`(Empty, Empty) => true,`
`874`	`874`	`(Delimited(la), Delimited(ra)) => eq_delim_args(la, ra),`
`875`		`- (Eq(_, AttrArgsEq::Ast(le)), Eq(_, AttrArgsEq::Ast(re))) => eq_expr(le, re),`
`876`		`- (Eq(_, AttrArgsEq::Hir(ll)), Eq(_, AttrArgsEq::Hir(rl))) => ll.kind == rl.kind,`
	`875`	`+ (Eq { value: AttrArgsEq::Ast(le), .. }, Eq{ value: AttrArgsEq::Ast(re), .. }) => eq_expr(le, re),`
	`876`	`+ (Eq { value: AttrArgsEq::Hir(ll), .. }, Eq{ value: AttrArgsEq::Hir(rl), .. }) => ll.kind == rl.kind,`
`877`	`877`	`_ => false,`
`878`	`878`	`}`
`879`	`879`	`}`