Use attribute name in message for "outer attr used as inner attr" errors

Author: scrabsha

compiler/rustc_passes/messages.ftl

@@ -462,7 +462,7 @@ passes_object_lifetime_err =
     {$repr}
 
 passes_outer_crate_level_attr =
-    crate-level attribute should be an inner attribute: add an exclamation mark: `#![foo]`
+    crate-level attribute should be an inner attribute: add an exclamation mark: `#![{$attr_name}]`
 
 
 passes_panic_unwind_without_std =

compiler/rustc_passes/src/check_attr.rs

@@ -371,12 +371,21 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
                     attr.ident().and_then(|ident| BUILTIN_ATTRIBUTE_MAP.get(&ident.name))
                 {
                     match style {
-                        Some(ast::AttrStyle::Outer) => self.tcx.emit_node_span_lint(
-                            UNUSED_ATTRIBUTES,
-                            hir_id,
-                            attr.span(),
-                            errors::OuterCrateLevelAttr,
-                        ),
+                        Some(ast::AttrStyle::Outer) => {
+                            let attr_name = attr
+                                .ident()
+                                .as_ref()
+                                .map(|ident| ident.as_str())
+                                .unwrap_or_else(|| "foo")
+                                .to_string();
+
+                            self.tcx.emit_node_span_lint(
+                                UNUSED_ATTRIBUTES,
+                                hir_id,
+                                attr.span(),
+                                errors::OuterCrateLevelAttr { attr_name },
+                            )
+                        }
                         Some(ast::AttrStyle::Inner) | None => self.tcx.emit_node_span_lint(
                             UNUSED_ATTRIBUTES,
                             hir_id,
@@ -1817,12 +1826,21 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
         {
             if hir_id != CRATE_HIR_ID {
                 match style {
-                    Some(ast::AttrStyle::Outer) => self.tcx.emit_node_span_lint(
-                        UNUSED_ATTRIBUTES,
-                        hir_id,
-                        attr.span(),
-                        errors::OuterCrateLevelAttr,
-                    ),
+                    Some(ast::AttrStyle::Outer) => {
+                        let attr_name = attr
+                            .ident()
+                            .as_ref()
+                            .map(|ident| ident.as_str())
+                            .unwrap_or_else(|| "foo")
+                            .to_string();
+
+                        self.tcx.emit_node_span_lint(
+                            UNUSED_ATTRIBUTES,
+                            hir_id,
+                            attr.span(),
+                            errors::OuterCrateLevelAttr { attr_name },
+                        )
+                    }
                     Some(ast::AttrStyle::Inner) | None => self.tcx.emit_node_span_lint(
                         UNUSED_ATTRIBUTES,
                         hir_id,

compiler/rustc_passes/src/errors.rs

@@ -64,7 +64,9 @@ pub(crate) struct MixedExportNameAndNoMangle {
 
 #[derive(LintDiagnostic)]
 #[diag(passes_outer_crate_level_attr)]
-pub(crate) struct OuterCrateLevelAttr;
+pub(crate) struct OuterCrateLevelAttr {
+    pub(crate) attr_name: String,
+}
 
 #[derive(LintDiagnostic)]
 #[diag(passes_inner_crate_level_attr)]