Merge "missing options" lints for diagnostic attributes

mejrs · mejrs · commit 57fd9747fb66 · 2026-04-12T21:37:45.000+02:00
diff --git a/compiler/rustc_attr_parsing/src/attributes/diagnostic/on_const.rs b/compiler/rustc_attr_parsing/src/attributes/diagnostic/on_const.rs
@@ -29,7 +29,9 @@ impl<S: Stage> AttributeParser<S> for OnConstParser {
                 ArgParser::NoArgs | ArgParser::List(_) => {
                     cx.emit_lint(
                         MALFORMED_DIAGNOSTIC_ATTRIBUTES,
-                        AttributeLintKind::MissingOptionsForOnConst,
+                        AttributeLintKind::MissingOptionsForDiagnosticAttribute {
+                            attribute: mode.as_str(),
+                        },
                         span,
                     );
                     return;
diff --git a/compiler/rustc_attr_parsing/src/attributes/diagnostic/on_move.rs b/compiler/rustc_attr_parsing/src/attributes/diagnostic/on_move.rs
@@ -32,7 +32,9 @@ impl OnMoveParser {
         let Some(list) = args.list() else {
             cx.emit_lint(
                 MALFORMED_DIAGNOSTIC_ATTRIBUTES,
-                AttributeLintKind::MissingOptionsForOnMove,
+                AttributeLintKind::MissingOptionsForDiagnosticAttribute {
+                    attribute: mode.as_str(),
+                },
                 span,
             );
             return;
diff --git a/compiler/rustc_attr_parsing/src/attributes/diagnostic/on_unimplemented.rs b/compiler/rustc_attr_parsing/src/attributes/diagnostic/on_unimplemented.rs
@@ -34,7 +34,9 @@ impl OnUnimplementedParser {
             ArgParser::NoArgs | ArgParser::List(_) => {
                 cx.emit_lint(
                     MALFORMED_DIAGNOSTIC_ATTRIBUTES,
-                    AttributeLintKind::MissingOptionsForOnUnimplemented,
+                    AttributeLintKind::MissingOptionsForDiagnosticAttribute {
+                        attribute: mode.as_str(),
+                    },
                     span,
                 );
                 return;
diff --git a/compiler/rustc_attr_parsing/src/attributes/diagnostic/on_unknown.rs b/compiler/rustc_attr_parsing/src/attributes/diagnostic/on_unknown.rs
@@ -28,7 +28,9 @@ impl OnUnknownParser {
             ArgParser::NoArgs | ArgParser::List(_) => {
                 cx.emit_lint(
                     MALFORMED_DIAGNOSTIC_ATTRIBUTES,
-                    AttributeLintKind::MissingOptionsForOnUnknown,
+                    AttributeLintKind::MissingOptionsForDiagnosticAttribute {
+                        attribute: mode.as_str(),
+                    },
                     span,
                 );
                 return;
diff --git a/compiler/rustc_lint/src/early/diagnostics.rs b/compiler/rustc_lint/src/early/diagnostics.rs
@@ -198,24 +198,15 @@ impl<'a> Diagnostic<'a, ()> for DecorateAttrLint<'_, '_, '_> {
                 lints::IgnoredDiagnosticOption { option_name, first_span, later_span }
                     .into_diag(dcx, level)
             }
-            &AttributeLintKind::MissingOptionsForOnUnimplemented => {
-                lints::MissingOptionsForOnUnimplementedAttr.into_diag(dcx, level)
-            }
-            &AttributeLintKind::MissingOptionsForOnConst => {
-                lints::MissingOptionsForOnConstAttr.into_diag(dcx, level)
+            &AttributeLintKind::MissingOptionsForDiagnosticAttribute { attribute } => {
+                lints::MissingOptionsForDiagnosticAttribute { attribute }.into_diag(dcx, level)
             }
             &AttributeLintKind::OnMoveMalformedFormatLiterals { name } => {
                 lints::OnMoveMalformedFormatLiterals { name }.into_diag(dcx, level)
             }
             &AttributeLintKind::OnMoveMalformedAttrExpectedLiteralOrDelimiter => {
                 lints::OnMoveMalformedAttrExpectedLiteralOrDelimiter.into_diag(dcx, level)
             }
-            &AttributeLintKind::MissingOptionsForOnMove => {
-                lints::MissingOptionsForOnMoveAttr.into_diag(dcx, level)
-            }
-            &AttributeLintKind::MissingOptionsForOnUnknown => {
-                lints::MissingOptionsForOnUnknownAttr.into_diag(dcx, level)
-            }
         }
     }
 }
diff --git a/compiler/rustc_lint/src/lints.rs b/compiler/rustc_lint/src/lints.rs
@@ -3584,24 +3584,11 @@ pub(crate) struct IgnoredDiagnosticOption {
 }
 
 #[derive(Diagnostic)]
-#[diag("missing options for `on_unimplemented` attribute")]
+#[diag("missing options for `{$attribute}` attribute")]
 #[help("at least one of the `message`, `note` and `label` options are expected")]
-pub(crate) struct MissingOptionsForOnUnimplementedAttr;
-
-#[derive(Diagnostic)]
-#[diag("missing options for `on_unknown` attribute")]
-#[help("at least one of the `message`, `note` and `label` options are expected")]
-pub(crate) struct MissingOptionsForOnUnknownAttr;
-
-#[derive(Diagnostic)]
-#[diag("missing options for `on_const` attribute")]
-#[help("at least one of the `message`, `note` and `label` options are expected")]
-pub(crate) struct MissingOptionsForOnConstAttr;
-
-#[derive(Diagnostic)]
-#[diag("missing options for `on_move` attribute")]
-#[help("at least one of the `message`, `note` and `label` options are expected")]
-pub(crate) struct MissingOptionsForOnMoveAttr;
+pub(crate) struct MissingOptionsForDiagnosticAttribute {
+    pub attribute: &'static str,
+}
 
 #[derive(Diagnostic)]
 #[diag("`Eq::assert_receiver_is_total_eq` should never be implemented by hand")]
diff --git a/compiler/rustc_lint_defs/src/lib.rs b/compiler/rustc_lint_defs/src/lib.rs
@@ -750,10 +750,9 @@ pub enum AttributeLintKind {
         first_span: Span,
         later_span: Span,
     },
-    MissingOptionsForOnUnimplemented,
-    MissingOptionsForOnConst,
-    MissingOptionsForOnUnknown,
-    MissingOptionsForOnMove,
+    MissingOptionsForDiagnosticAttribute {
+        attribute: &'static str,
+    },
     OnMoveMalformedFormatLiterals {
         name: Symbol,
     },
diff --git a/tests/ui/attributes/malformed-attrs.rs b/tests/ui/attributes/malformed-attrs.rs
@@ -140,7 +140,7 @@ pub fn test3() {}
 struct Test;
 
 #[diagnostic::on_unimplemented]
-//~^ WARN missing options for `on_unimplemented` attribute
+//~^ WARN missing options for `diagnostic::on_unimplemented` attribute
 #[diagnostic::on_unimplemented = 1]
 //~^ WARN malformed
 trait Hey {
diff --git a/tests/ui/attributes/malformed-attrs.stderr b/tests/ui/attributes/malformed-attrs.stderr
@@ -793,7 +793,7 @@ LL | #[no_implicit_prelude = 23]
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = help: `#[no_implicit_prelude]` can be applied to crates and modules
 
-warning: missing options for `on_unimplemented` attribute
+warning: missing options for `diagnostic::on_unimplemented` attribute
   --> $DIR/malformed-attrs.rs:142:1
    |
 LL | #[diagnostic::on_unimplemented]
diff --git a/tests/ui/diagnostic_namespace/on_move/report_warning_on_invalid_meta_item_syntax.rs b/tests/ui/diagnostic_namespace/on_move/report_warning_on_invalid_meta_item_syntax.rs
@@ -1,7 +1,7 @@
 #![feature(diagnostic_on_move)]
 
 #[diagnostic::on_move = "foo"]
-//~^WARN missing options for `on_move` attribute [malformed_diagnostic_attributes]
+//~^WARN missing options for `diagnostic::on_move` attribute [malformed_diagnostic_attributes]
 struct Foo;
 
 fn takes_foo(_: Foo) {}
diff --git a/tests/ui/diagnostic_namespace/on_move/report_warning_on_invalid_meta_item_syntax.stderr b/tests/ui/diagnostic_namespace/on_move/report_warning_on_invalid_meta_item_syntax.stderr
@@ -1,4 +1,4 @@
-warning: missing options for `on_move` attribute
+warning: missing options for `diagnostic::on_move` attribute
   --> $DIR/report_warning_on_invalid_meta_item_syntax.rs:3:1
    |
 LL | #[diagnostic::on_move = "foo"]
diff --git a/tests/ui/diagnostic_namespace/on_move/report_warning_on_missing_options.rs b/tests/ui/diagnostic_namespace/on_move/report_warning_on_missing_options.rs
@@ -1,7 +1,7 @@
 #![feature(diagnostic_on_move)]
 
 #[diagnostic::on_move]
-//~^WARN missing options for `on_move` attribute [malformed_diagnostic_attributes]
+//~^WARN missing options for `diagnostic::on_move` attribute [malformed_diagnostic_attributes]
 struct Foo;
 
 fn takes_foo(_: Foo) {}
diff --git a/tests/ui/diagnostic_namespace/on_move/report_warning_on_missing_options.stderr b/tests/ui/diagnostic_namespace/on_move/report_warning_on_missing_options.stderr
@@ -1,4 +1,4 @@
-warning: missing options for `on_move` attribute
+warning: missing options for `diagnostic::on_move` attribute
   --> $DIR/report_warning_on_missing_options.rs:3:1
    |
 LL | #[diagnostic::on_move]
diff --git a/tests/ui/diagnostic_namespace/on_unimplemented/do_not_fail_parsing_on_invalid_options_1.rs b/tests/ui/diagnostic_namespace/on_unimplemented/do_not_fail_parsing_on_invalid_options_1.rs
@@ -25,7 +25,7 @@ trait _Self {}
 trait Doom {}
 
 #[diagnostic::on_unimplemented]
-//~^WARN missing options for `on_unimplemented` attribute
+//~^WARN missing options for `diagnostic::on_unimplemented` attribute
 trait Whatever {}
 
 #[diagnostic::on_unimplemented(message = "{DoesNotExist}")]
diff --git a/tests/ui/diagnostic_namespace/on_unimplemented/do_not_fail_parsing_on_invalid_options_1.stderr b/tests/ui/diagnostic_namespace/on_unimplemented/do_not_fail_parsing_on_invalid_options_1.stderr
@@ -56,7 +56,7 @@ LL | #[diagnostic::on_unimplemented = "boom"]
    |
    = help: only `message`, `note` and `label` are allowed as options
 
-warning: missing options for `on_unimplemented` attribute
+warning: missing options for `diagnostic::on_unimplemented` attribute
   --> $DIR/do_not_fail_parsing_on_invalid_options_1.rs:27:1
    |
 LL | #[diagnostic::on_unimplemented]
diff --git a/tests/ui/diagnostic_namespace/on_unknown/malformed_attribute.rs b/tests/ui/diagnostic_namespace/on_unknown/malformed_attribute.rs
@@ -1,6 +1,6 @@
 #![feature(diagnostic_on_unknown)]
 #[diagnostic::on_unknown]
-//~^WARN missing options for `on_unknown` attribute
+//~^WARN missing options for `diagnostic::on_unknown` attribute
 use std::str::FromStr;
 
 #[diagnostic::on_unknown(foo = "bar", message = "foo")]
diff --git a/tests/ui/diagnostic_namespace/on_unknown/malformed_attribute.stderr b/tests/ui/diagnostic_namespace/on_unknown/malformed_attribute.stderr
@@ -6,7 +6,7 @@ LL | use std::str::NotExisting;
    |
    = note: unresolved import `std::str::NotExisting`
 
-warning: missing options for `on_unknown` attribute
+warning: missing options for `diagnostic::on_unknown` attribute
   --> $DIR/malformed_attribute.rs:2:1
    |
 LL | #[diagnostic::on_unknown]
diff --git a/tests/ui/on-unimplemented/bad-annotation.rs b/tests/ui/on-unimplemented/bad-annotation.rs
@@ -13,7 +13,7 @@ trait MyFromIterator<A> {
 }
 
 #[rustc_on_unimplemented]
-//~^ WARN missing options for `on_unimplemented` attribute
+//~^ WARN missing options for `rustc_on_unimplemented` attribute
 //~| NOTE part of
 trait NoContent {}
 
diff --git a/tests/ui/on-unimplemented/bad-annotation.stderr b/tests/ui/on-unimplemented/bad-annotation.stderr
@@ -126,7 +126,7 @@ warning: there is no parameter `abc` on trait `InvalidName2`
 LL | #[rustc_on_unimplemented(on(abc = "y", message = "y"))]
    |                             ^^^^^^^^^
 
-warning: missing options for `on_unimplemented` attribute
+warning: missing options for `rustc_on_unimplemented` attribute
   --> $DIR/bad-annotation.rs:15:1
    |
 LL | #[rustc_on_unimplemented]

Original file line number	Diff line number	Diff line change
`@@ -198,24 +198,15 @@ impl<'a> Diagnostic<'a, ()> for DecorateAttrLint<'_, '_, '_> {`
`198`	`198`	`lints::IgnoredDiagnosticOption { option_name, first_span, later_span }`
`199`	`199`	`.into_diag(dcx, level)`
`200`	`200`	`}`
`201`		`- &AttributeLintKind::MissingOptionsForOnUnimplemented => {`
`202`		`- lints::MissingOptionsForOnUnimplementedAttr.into_diag(dcx, level)`
`203`		`- }`
`204`		`- &AttributeLintKind::MissingOptionsForOnConst => {`
`205`		`- lints::MissingOptionsForOnConstAttr.into_diag(dcx, level)`
	`201`	`+ &AttributeLintKind::MissingOptionsForDiagnosticAttribute { attribute } => {`
	`202`	`+ lints::MissingOptionsForDiagnosticAttribute { attribute }.into_diag(dcx, level)`
`206`	`203`	`}`
`207`	`204`	`&AttributeLintKind::OnMoveMalformedFormatLiterals { name } => {`
`208`	`205`	`lints::OnMoveMalformedFormatLiterals { name }.into_diag(dcx, level)`
`209`	`206`	`}`
`210`	`207`	`&AttributeLintKind::OnMoveMalformedAttrExpectedLiteralOrDelimiter => {`
`211`	`208`	`lints::OnMoveMalformedAttrExpectedLiteralOrDelimiter.into_diag(dcx, level)`
`212`	`209`	`}`
`213`		`- &AttributeLintKind::MissingOptionsForOnMove => {`
`214`		`- lints::MissingOptionsForOnMoveAttr.into_diag(dcx, level)`
`215`		`- }`
`216`		`- &AttributeLintKind::MissingOptionsForOnUnknown => {`
`217`		`- lints::MissingOptionsForOnUnknownAttr.into_diag(dcx, level)`
`218`		`- }`
`219`	`210`	`}`
`220`	`211`	`}`
`221`	`212`	`}`
Original file line number	Diff line number	Diff line change
`@@ -793,7 +793,7 @@ LL \| #[no_implicit_prelude = 23]`
`793`	`793`	`= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!`
`794`	`794`	= help: `#[no_implicit_prelude]` can be applied to crates and modules
`795`	`795`
`796`		-warning: missing options for `on_unimplemented` attribute
	`796`	+warning: missing options for `diagnostic::on_unimplemented` attribute
`797`	`797`	`--> $DIR/malformed-attrs.rs:142:1`
`798`	`798`	`\|`
`799`	`799`	`LL \| #[diagnostic::on_unimplemented]`