Fix incorrect cfg structured suggestion

Keep a span for the attribute *within* the square brackets as part of
the `AttrKind`.

```
error: `cfg` is not followed by parentheses
  --> $DIR/cfg-attr-syntax-validation.rs:4:1
   |
LL | #[cfg = 10]
   | ^^^^^^^^^^^
   |
help: expected syntax is
   |
LL - #[cfg = 10]
LL + #[cfg(/* predicate */)]
   |
```

Noticed in #137343 (comment).

Author: estebank

compiler/rustc_ast/src/ast.rs

@@ -3326,6 +3326,7 @@ impl NormalAttr {
                 path: Path::from_ident(ident),
                 args: AttrArgs::Empty,
                 tokens: None,
+                span: ident.span,
             },
             tokens: None,
         }
@@ -3339,6 +3340,7 @@ pub struct AttrItem {
     pub args: AttrArgs,
     // Tokens for the meta item, e.g. just the `foo` within `#[foo]` or `#![foo]`.
     pub tokens: Option<LazyAttrTokenStream>,
+    pub span: Span,
 }
 
 impl AttrItem {

compiler/rustc_ast/src/attr/mod.rs

@@ -231,7 +231,7 @@ impl Attribute {
     /// Extracts the MetaItem from inside this Attribute.
     pub fn meta(&self) -> Option<MetaItem> {
         match &self.kind {
-            AttrKind::Normal(normal) => normal.item.meta(self.span),
+            AttrKind::Normal(normal) => normal.item.meta(),
             AttrKind::DocComment(..) => None,
         }
     }
@@ -297,12 +297,12 @@ impl AttrItem {
         }
     }
 
-    pub fn meta(&self, span: Span) -> Option<MetaItem> {
+    pub fn meta(&self) -> Option<MetaItem> {
         Some(MetaItem {
             unsafety: Safety::Default,
             path: self.path.clone(),
             kind: self.meta_kind()?,
-            span,
+            span: self.span(),
         })
     }
 
@@ -644,8 +644,15 @@ fn mk_attr(
     path: Path,
     args: AttrArgs,
     span: Span,
+    inner_span: Span,
 ) -> Attribute {
-    mk_attr_from_item(g, AttrItem { unsafety, path, args, tokens: None }, None, style, span)
+    mk_attr_from_item(
+        g,
+        AttrItem { unsafety, path, args, tokens: None, span: inner_span },
+        None,
+        style,
+        span,
+    )
 }
 
 pub fn mk_attr_from_item(
@@ -669,10 +676,11 @@ pub fn mk_attr_word(
     unsafety: Safety,
     name: Symbol,
     span: Span,
+    inner_span: Span,
 ) -> Attribute {
     let path = Path::from_ident(Ident::new(name, span));
     let args = AttrArgs::Empty;
-    mk_attr(g, style, unsafety, path, args, span)
+    mk_attr(g, style, unsafety, path, args, span, inner_span)
 }
 
 pub fn mk_attr_nested_word(
@@ -682,6 +690,7 @@ pub fn mk_attr_nested_word(
     outer: Symbol,
     inner: Symbol,
     span: Span,
+    inner_span: Span,
 ) -> Attribute {
     let inner_tokens = TokenStream::new(vec![TokenTree::Token(
         Token::from_ast_ident(Ident::new(inner, span)),
@@ -694,7 +703,7 @@ pub fn mk_attr_nested_word(
         delim: Delimiter::Parenthesis,
         tokens: inner_tokens,
     });
-    mk_attr(g, style, unsafety, path, attr_args, span)
+    mk_attr(g, style, unsafety, path, attr_args, span, inner_span)
 }
 
 pub fn mk_attr_name_value_str(
@@ -704,6 +713,7 @@ pub fn mk_attr_name_value_str(
     name: Symbol,
     val: Symbol,
     span: Span,
+    inner_span: Span,
 ) -> Attribute {
     let lit = token::Lit::new(token::Str, escape_string_symbol(val), None);
     let expr = P(Expr {
@@ -715,7 +725,7 @@ pub fn mk_attr_name_value_str(
     });
     let path = Path::from_ident(Ident::new(name, span));
     let args = AttrArgs::Eq { eq_span: span, expr };
-    mk_attr(g, style, unsafety, path, args, span)
+    mk_attr(g, style, unsafety, path, args, span, inner_span)
 }
 
 pub fn filter_by_name<A: AttributeExt>(attrs: &[A], name: Symbol) -> impl Iterator<Item = &A> {

compiler/rustc_ast/src/visit.rs

@@ -1878,7 +1878,7 @@ macro_rules! common_visitor_and_walkers {
             match kind {
                 AttrKind::Normal(normal) => {
                     let NormalAttr { item, tokens: _ } = &$($mut)?**normal;
-                    let AttrItem { unsafety: _, path, args, tokens: _ } = item;
+                    let AttrItem { unsafety: _, path, args, tokens: _, span: _ } = item;
                     try_visit!(vis.visit_path(path));
                     try_visit!(walk_attr_args(vis, args));
                 }

compiler/rustc_ast_lowering/src/expr.rs

@@ -1992,6 +1992,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
             sym::allow,
             sym::unreachable_code,
             try_span,
+            try_span,
         );
         let attrs: AttrVec = thin_vec![attr];
 

compiler/rustc_ast_pretty/src/pprust/state.rs

@@ -287,6 +287,7 @@ fn print_crate_inner<'a>(
             sym::feature,
             sym::prelude_import,
             DUMMY_SP,
+            DUMMY_SP,
         );
         s.print_attribute(&fake_attr);
 
@@ -300,6 +301,7 @@ fn print_crate_inner<'a>(
                 Safety::Default,
                 sym::no_std,
                 DUMMY_SP,
+                DUMMY_SP,
             );
             s.print_attribute(&fake_attr);
         }

compiler/rustc_builtin_macros/src/alloc_error_handler.rs

@@ -92,7 +92,7 @@ fn generate_handler(cx: &ExtCtxt<'_>, handler: Ident, span: Span, sig_span: Span
         define_opaque: None,
     }));
 
-    let attrs = thin_vec![cx.attr_word(sym::rustc_std_internal_symbol, span)];
+    let attrs = thin_vec![cx.attr_word(sym::rustc_std_internal_symbol, span, span)];
 
     let item = cx.item(span, attrs, kind);
     cx.stmt_item(sig_span, item)

compiler/rustc_builtin_macros/src/assert/context.rs

@@ -112,7 +112,12 @@ impl<'cx, 'a> Context<'cx, 'a> {
             self.span,
             self.cx.item(
                 self.span,
-                thin_vec![self.cx.attr_nested_word(sym::allow, sym::unused_imports, self.span)],
+                thin_vec![self.cx.attr_nested_word(
+                    sym::allow,
+                    sym::unused_imports,
+                    self.span,
+                    self.span
+                )],
                 ItemKind::Use(UseTree {
                     prefix: self.cx.path(self.span, self.cx.std_path(&[sym::asserting])),
                     kind: UseTreeKind::Nested {

compiler/rustc_builtin_macros/src/autodiff.rs

@@ -362,6 +362,7 @@ mod llvm_enzyme {
             path: ast::Path::from_ident(Ident::with_dummy_span(sym::inline)),
             args: ast::AttrArgs::Delimited(never_arg),
             tokens: None,
+            span,
         };
         let inline_never_attr = P(ast::NormalAttr { item: inline_item, tokens: None });
         let new_id = ecx.sess.psess.attr_id_generator.mk_attr_id();

compiler/rustc_builtin_macros/src/deriving/clone.rs

@@ -81,7 +81,7 @@ pub(crate) fn expand_deriving_clone(
             explicit_self: true,
             nonself_args: Vec::new(),
             ret_ty: Self_,
-            attributes: thin_vec![cx.attr_word(sym::inline, span)],
+            attributes: thin_vec![cx.attr_word(sym::inline, span, span)],
             fieldless_variants_strategy: FieldlessVariantsStrategy::Default,
             combine_substructure: substructure,
         }],

compiler/rustc_builtin_macros/src/deriving/cmp/eq.rs

@@ -32,9 +32,9 @@ pub(crate) fn expand_deriving_eq(
             nonself_args: vec![],
             ret_ty: Unit,
             attributes: thin_vec![
-                cx.attr_word(sym::inline, span),
-                cx.attr_nested_word(sym::doc, sym::hidden, span),
-                cx.attr_nested_word(sym::coverage, sym::off, span)
+                cx.attr_word(sym::inline, span, span),
+                cx.attr_nested_word(sym::doc, sym::hidden, span, span),
+                cx.attr_nested_word(sym::coverage, sym::off, span, span)
             ],
             fieldless_variants_strategy: FieldlessVariantsStrategy::Unify,
             combine_substructure: combine_substructure(Box::new(|a, b, c| {

compiler/rustc_builtin_macros/src/deriving/cmp/ord.rs

@@ -28,7 +28,7 @@ pub(crate) fn expand_deriving_ord(
             explicit_self: true,
             nonself_args: vec![(self_ref(), sym::other)],
             ret_ty: Path(path_std!(cmp::Ordering)),
-            attributes: thin_vec![cx.attr_word(sym::inline, span)],
+            attributes: thin_vec![cx.attr_word(sym::inline, span, span)],
             fieldless_variants_strategy: FieldlessVariantsStrategy::Unify,
             combine_substructure: combine_substructure(Box::new(|a, b, c| cs_cmp(a, b, c))),
         }],

compiler/rustc_builtin_macros/src/deriving/cmp/partial_eq.rs

@@ -41,7 +41,7 @@ pub(crate) fn expand_deriving_partial_eq(
         explicit_self: true,
         nonself_args: vec![(self_ref(), sym::other)],
         ret_ty: Path(path_local!(bool)),
-        attributes: thin_vec![cx.attr_word(sym::inline, span)],
+        attributes: thin_vec![cx.attr_word(sym::inline, span, span)],
         fieldless_variants_strategy: FieldlessVariantsStrategy::Unify,
         combine_substructure: combine_substructure(Box::new(|a, b, c| {
             BlockOrExpr::new_expr(get_substructure_equality_expr(a, b, c))

compiler/rustc_builtin_macros/src/deriving/cmp/partial_ord.rs

@@ -47,7 +47,7 @@ pub(crate) fn expand_deriving_partial_ord(
         explicit_self: true,
         nonself_args: vec![(self_ref(), sym::other)],
         ret_ty,
-        attributes: thin_vec![cx.attr_word(sym::inline, span)],
+        attributes: thin_vec![cx.attr_word(sym::inline, span, span)],
         fieldless_variants_strategy: FieldlessVariantsStrategy::Unify,
         combine_substructure: combine_substructure(Box::new(|cx, span, substr| {
             cs_partial_cmp(cx, span, substr, discr_then_data)

compiler/rustc_builtin_macros/src/deriving/coerce_pointee.rs

@@ -98,7 +98,7 @@ pub(crate) fn expand_deriving_coerce_pointee(
 
     // Declare helper function that adds implementation blocks.
     // FIXME(dingxiangfei2009): Investigate the set of attributes on target struct to be propagated to impls
-    let attrs = thin_vec![cx.attr_word(sym::automatically_derived, span),];
+    let attrs = thin_vec![cx.attr_word(sym::automatically_derived, span, span),];
     // # Validity assertion which will be checked later in `rustc_hir_analysis::coherence::builtins`.
     {
         let trait_path =

compiler/rustc_builtin_macros/src/deriving/debug.rs

@@ -32,7 +32,7 @@ pub(crate) fn expand_deriving_debug(
             explicit_self: true,
             nonself_args: vec![(fmtr, sym::f)],
             ret_ty: Path(path_std!(fmt::Result)),
-            attributes: thin_vec![cx.attr_word(sym::inline, span)],
+            attributes: thin_vec![cx.attr_word(sym::inline, span, span)],
             fieldless_variants_strategy:
                 FieldlessVariantsStrategy::SpecializeIfAllVariantsFieldless,
             combine_substructure: combine_substructure(Box::new(|a, b, c| {

compiler/rustc_builtin_macros/src/deriving/default.rs

@@ -35,7 +35,7 @@ pub(crate) fn expand_deriving_default(
             explicit_self: false,
             nonself_args: Vec::new(),
             ret_ty: Self_,
-            attributes: thin_vec![cx.attr_word(sym::inline, span)],
+            attributes: thin_vec![cx.attr_word(sym::inline, span, span)],
             fieldless_variants_strategy: FieldlessVariantsStrategy::Default,
             combine_substructure: combine_substructure(Box::new(|cx, trait_span, substr| {
                 match substr.fields {

compiler/rustc_builtin_macros/src/deriving/generic/mod.rs

@@ -785,7 +785,7 @@ impl<'a> TraitDef<'a> {
         let path = cx.path_all(self.span, false, vec![type_ident], self_params);
         let self_type = cx.ty_path(path);
 
-        let attrs = thin_vec![cx.attr_word(sym::automatically_derived, self.span),];
+        let attrs = thin_vec![cx.attr_word(sym::automatically_derived, self.span, self.span)];
         let opt_trait_ref = Some(trait_ref);
 
         cx.item(

compiler/rustc_builtin_macros/src/deriving/hash.rs

@@ -33,7 +33,7 @@ pub(crate) fn expand_deriving_hash(
             explicit_self: true,
             nonself_args: vec![(Ref(Box::new(Path(arg)), Mutability::Mut), sym::state)],
             ret_ty: Unit,
-            attributes: thin_vec![cx.attr_word(sym::inline, span)],
+            attributes: thin_vec![cx.attr_word(sym::inline, span, span)],
             fieldless_variants_strategy: FieldlessVariantsStrategy::Unify,
             combine_substructure: combine_substructure(Box::new(|a, b, c| {
                 hash_substructure(a, b, c)

compiler/rustc_builtin_macros/src/global_allocator.rs

@@ -102,7 +102,7 @@ impl AllocFnFactory<'_, '_> {
     }
 
     fn attrs(&self) -> AttrVec {
-        thin_vec![self.cx.attr_word(sym::rustc_std_internal_symbol, self.span)]
+        thin_vec![self.cx.attr_word(sym::rustc_std_internal_symbol, self.span, self.span)]
     }
 
     fn arg_ty(&self, input: &AllocatorMethodInput, args: &mut ThinVec<Param>) -> P<Expr> {

compiler/rustc_builtin_macros/src/proc_macro_harness.rs

@@ -372,9 +372,9 @@ fn mk_decls(cx: &mut ExtCtxt<'_>, macros: &[ProcMacro]) -> P<ast::Item> {
         cx.expr_array_ref(span, decls),
     );
     decls_static.attrs.extend([
-        cx.attr_word(sym::rustc_proc_macro_decls, span),
-        cx.attr_word(sym::used, span),
-        cx.attr_nested_word(sym::allow, sym::deprecated, span),
+        cx.attr_word(sym::rustc_proc_macro_decls, span, span),
+        cx.attr_word(sym::used, span, span),
+        cx.attr_nested_word(sym::allow, sym::deprecated, span, span),
     ]);
 
     let block = cx.expr_block(

compiler/rustc_builtin_macros/src/standard_library_imports.rs

@@ -43,7 +43,7 @@ pub fn inject(
 
     let item = cx.item(
         span,
-        thin_vec![cx.attr_word(sym::macro_use, span)],
+        thin_vec![cx.attr_word(sym::macro_use, span, span)],
         ast::ItemKind::ExternCrate(None, Ident::new(name, ident_span)),
     );
 
@@ -67,7 +67,7 @@ pub fn inject(
     // Inject the relevant crate's prelude.
     let use_item = cx.item(
         span,
-        thin_vec![cx.attr_word(sym::prelude_import, span)],
+        thin_vec![cx.attr_word(sym::prelude_import, span, span)],
         ast::ItemKind::Use(ast::UseTree {
             prefix: cx.path(span, import_path),
             kind: ast::UseTreeKind::Glob,

compiler/rustc_builtin_macros/src/test.rs

@@ -69,7 +69,12 @@ pub(crate) fn expand_test_case(
                 kind: ast::VisibilityKind::Public,
                 tokens: None,
             };
-            item.attrs.push(ecx.attr_name_value_str(sym::rustc_test_marker, test_path_symbol, sp));
+            item.attrs.push(ecx.attr_name_value_str(
+                sym::rustc_test_marker,
+                test_path_symbol,
+                sp,
+                sp,
+            ));
         }
         _ => {}
     }
@@ -200,7 +205,7 @@ pub(crate) fn expand_test_or_bench(
     // corresponding macro declaration in `core::macros`.
     let coverage_off = |mut expr: P<ast::Expr>| {
         assert_matches!(expr.kind, ast::ExprKind::Closure(_));
-        expr.attrs.push(cx.attr_nested_word(sym::coverage, sym::off, sp));
+        expr.attrs.push(cx.attr_nested_word(sym::coverage, sym::off, sp, sp));
         expr
     };
 
@@ -272,11 +277,11 @@ pub(crate) fn expand_test_or_bench(
             sp,
             thin_vec![
                 // #[cfg(test)]
-                cx.attr_nested_word(sym::cfg, sym::test, attr_sp),
+                cx.attr_nested_word(sym::cfg, sym::test, attr_sp, attr_sp),
                 // #[rustc_test_marker = "test_case_sort_key"]
-                cx.attr_name_value_str(sym::rustc_test_marker, test_path_symbol, attr_sp),
+                cx.attr_name_value_str(sym::rustc_test_marker, test_path_symbol, attr_sp, attr_sp),
                 // #[doc(hidden)]
-                cx.attr_nested_word(sym::doc, sym::hidden, attr_sp),
+                cx.attr_nested_word(sym::doc, sym::hidden, attr_sp, attr_sp),
             ],
             // const $ident: test::TestDescAndFn =
             ast::ItemKind::Const(

compiler/rustc_builtin_macros/src/test_harness.rs

@@ -208,6 +208,7 @@ impl<'a> MutVisitor for EntryPointCleaner<'a> {
                     sym::allow,
                     sym::dead_code,
                     self.def_site,
+                    self.def_site,
                 );
                 item.attrs.retain(|attr| !attr.has_name(sym::rustc_main));
                 item.attrs.push(allow_dead_code);
@@ -312,11 +313,11 @@ fn mk_main(cx: &mut TestCtxt<'_>) -> P<ast::Item> {
     );
 
     // #[rustc_main]
-    let main_attr = ecx.attr_word(sym::rustc_main, sp);
+    let main_attr = ecx.attr_word(sym::rustc_main, sp, sp);
     // #[coverage(off)]
-    let coverage_attr = ecx.attr_nested_word(sym::coverage, sym::off, sp);
+    let coverage_attr = ecx.attr_nested_word(sym::coverage, sym::off, sp, sp);
     // #[doc(hidden)]
-    let doc_hidden_attr = ecx.attr_nested_word(sym::doc, sym::hidden, sp);
+    let doc_hidden_attr = ecx.attr_nested_word(sym::doc, sym::hidden, sp, sp);
 
     // pub fn main() { ... }
     let main_ret_ty = ecx.ty(sp, ast::TyKind::Tup(ThinVec::new()));