Remove AttributeLintKind::NonMetaItemDiagnosticAttribute variant

GuillaumeGomez · GuillaumeGomez · commit 7a07b795737d · 2026-04-23T23:08:40.000+02:00
diff --git a/compiler/rustc_attr_parsing/src/attributes/diagnostic/mod.rs b/compiler/rustc_attr_parsing/src/attributes/diagnostic/mod.rs
@@ -6,7 +6,7 @@ use rustc_hir::attrs::diagnostic::{
     Directive, FilterFormatString, Flag, FormatArg, FormatString, LitOrArg, Name, NameValue,
     OnUnimplementedCondition, Piece, Predicate,
 };
-use rustc_hir::lints::{AttributeLintKind, FormatWarning};
+use rustc_hir::lints::FormatWarning;
 use rustc_macros::Diagnostic;
 use rustc_parse_format::{
     Argument, FormatSpec, ParseError, ParseMode, Parser, Piece as RpfPiece, Position,
@@ -21,7 +21,7 @@ use crate::context::{AcceptContext, Stage};
 use crate::errors::{
     DisallowedPlaceholder, DisallowedPositionalArgument, IgnoredDiagnosticOption,
     InvalidFormatSpecifier, MalFormedDiagnosticAttributeLint, MissingOptionsForDiagnosticAttribute,
-    WrappedParserError,
+    NonMetaItemDiagnosticAttribute, WrappedParserError,
 };
 use crate::parser::{ArgParser, MetaItemListParser, MetaItemOrLitParser, MetaItemParser};
 
@@ -145,9 +145,9 @@ fn parse_list<'p, S: Stage>(
             // We're dealing with `#[diagnostic::attr()]`.
             // This can be because that is what the user typed, but that's also what we'd see
             // if the user used non-metaitem syntax. See `ArgParser::from_attr_args`.
-            cx.emit_lint(
+            cx.emit_dyn_lint(
                 MALFORMED_DIAGNOSTIC_ATTRIBUTES,
-                AttributeLintKind::NonMetaItemDiagnosticAttribute,
+                move |dcx, level| NonMetaItemDiagnosticAttribute.into_diag(dcx, level),
                 list.span,
             );
         }
diff --git a/compiler/rustc_attr_parsing/src/errors.rs b/compiler/rustc_attr_parsing/src/errors.rs
@@ -400,3 +400,10 @@ pub(crate) struct MissingOptionsForDiagnosticAttribute {
     pub attribute: &'static str,
     pub options: &'static str,
 }
+
+#[derive(Diagnostic)]
+#[diag("expected a literal or missing delimiter")]
+#[help(
+    "only literals are allowed as values for the `message`, `note` and `label` options. These options must be separated by a comma"
+)]
+pub(crate) struct NonMetaItemDiagnosticAttribute;
diff --git a/compiler/rustc_lint/src/early/diagnostics.rs b/compiler/rustc_lint/src/early/diagnostics.rs
@@ -6,8 +6,6 @@ use rustc_hir::lints::AttributeLintKind;
 use rustc_middle::ty::TyCtxt;
 use rustc_session::Session;
 
-use crate::lints;
-
 mod check_cfg;
 
 pub struct DiagAndSess<'sess> {
@@ -42,10 +40,6 @@ impl<'a> Diagnostic<'a, ()> for DecorateAttrLint<'_, '_, '_> {
                 check_cfg::unexpected_cfg_value(self.sess, self.tcx, name, value)
                     .into_diag(dcx, level)
             }
-
-            &AttributeLintKind::NonMetaItemDiagnosticAttribute => {
-                lints::NonMetaItemDiagnosticAttribute.into_diag(dcx, level)
-            }
         }
     }
 }
diff --git a/compiler/rustc_lint/src/lints.rs b/compiler/rustc_lint/src/lints.rs
@@ -3286,10 +3286,3 @@ impl Subdiagnostic for MismatchedLifetimeSyntaxesSuggestion {
 #[diag("`Eq::assert_receiver_is_total_eq` should never be implemented by hand")]
 #[note("this method was used to add checks to the `Eq` derive macro")]
 pub(crate) struct EqInternalMethodImplemented;
-
-#[derive(Diagnostic)]
-#[diag("expected a literal or missing delimiter")]
-#[help(
-    "only literals are allowed as values for the `message`, `note` and `label` options. These options must be separated by a comma"
-)]
-pub(crate) struct NonMetaItemDiagnosticAttribute;
diff --git a/compiler/rustc_lint_defs/src/lib.rs b/compiler/rustc_lint_defs/src/lib.rs
@@ -656,7 +656,6 @@ pub enum DeprecatedSinceKind {
 pub enum AttributeLintKind {
     UnexpectedCfgName((Symbol, Span), Option<(Symbol, Span)>),
     UnexpectedCfgValue((Symbol, Span), Option<(Symbol, Span)>),
-    NonMetaItemDiagnosticAttribute,
 }
 
 #[derive(Debug, Clone, HashStable_Generic)]

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@ use rustc_hir::lints::AttributeLintKind;`
`6`	`6`	`use rustc_middle::ty::TyCtxt;`
`7`	`7`	`use rustc_session::Session;`
`8`	`8`
`9`		`-use crate::lints;`
`10`		`-`
`11`	`9`	`mod check_cfg;`
`12`	`10`
`13`	`11`	`pub struct DiagAndSess<'sess> {`
`@@ -42,10 +40,6 @@ impl<'a> Diagnostic<'a, ()> for DecorateAttrLint<'_, '_, '_> {`
`42`	`40`	`check_cfg::unexpected_cfg_value(self.sess, self.tcx, name, value)`
`43`	`41`	`.into_diag(dcx, level)`
`44`	`42`	`}`
`45`		`-`
`46`		`- &AttributeLintKind::NonMetaItemDiagnosticAttribute => {`
`47`		`- lints::NonMetaItemDiagnosticAttribute.into_diag(dcx, level)`
`48`		`- }`
`49`	`43`	`}`
`50`	`44`	`}`
`51`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -656,7 +656,6 @@ pub enum DeprecatedSinceKind {`
`656`	`656`	`pub enum AttributeLintKind {`
`657`	`657`	`UnexpectedCfgName((Symbol, Span), Option<(Symbol, Span)>),`
`658`	`658`	`UnexpectedCfgValue((Symbol, Span), Option<(Symbol, Span)>),`
`659`		`- NonMetaItemDiagnosticAttribute,`
`660`	`659`	`}`
`661`	`660`
`662`	`661`	`#[derive(Debug, Clone, HashStable_Generic)]`