Unify diagnostic namespace lints as requested in review

Also add the feature gate to the lint

Author: weiznich

compiler/rustc_hir_analysis/src/check/check.rs

@@ -29,7 +29,7 @@ use rustc_middle::ty::{
     TypeVisitableExt,
 };
 use rustc_session::lint::builtin::{
-    MALFORMED_DIAGNOSTIC_ATTRIBUTES, UNINHABITED_STATIC, UNSUPPORTED_CALLING_CONVENTIONS,
+    UNINHABITED_STATIC, UNKNOWN_OR_MALFORMED_DIAGNOSTIC_ATTRIBUTES, UNSUPPORTED_CALLING_CONVENTIONS,
 };
 use rustc_span::symbol::sym;
 use rustc_span::{self, Span};
@@ -582,7 +582,7 @@ fn check_item_type(tcx: TyCtxt<'_>, id: hir::ItemId) {
             .next()
         {
             tcx.emit_spanned_lint(
-                MALFORMED_DIAGNOSTIC_ATTRIBUTES,
+                UNKNOWN_OR_MALFORMED_DIAGNOSTIC_ATTRIBUTES,
                 tcx.hir().local_def_id_to_hir_id(item_def_id.expect_local()),
                 vec![attr.span],
                 DiagnosticOnUnimplementedOnlyForTraits,

compiler/rustc_lint_defs/src/builtin.rs

@@ -3442,8 +3442,8 @@ declare_lint_pass! {
         UNFULFILLED_LINT_EXPECTATIONS,
         UNINHABITED_STATIC,
         UNKNOWN_CRATE_TYPES,
-        UNKNOWN_DIAGNOSTIC_ATTRIBUTES,
         UNKNOWN_LINTS,
+        UNKNOWN_OR_MALFORMED_DIAGNOSTIC_ATTRIBUTES,
         UNNAMEABLE_TEST_ITEMS,
         UNNAMEABLE_TYPES,
         UNREACHABLE_CODE,
@@ -4463,7 +4463,8 @@ declare_lint! {
 }
 
 declare_lint! {
-    /// The `unknown_diagnostic_attributes` lint detects unrecognized diagnostic attributes.
+    /// The `unknown_or_malformed_diagnostic_attributes` lint detects unrecognized or otherwise malformed
+    /// diagnostic attributes.
     ///
     /// ### Example
     ///
@@ -4482,33 +4483,10 @@ declare_lint! {
     /// the spelling, and check the diagnostic attribute listing for the correct name. Also
     /// consider if you are using an old version of the compiler, and the attribute
     /// is only available in a newer version.
-    pub UNKNOWN_DIAGNOSTIC_ATTRIBUTES,
+    pub UNKNOWN_OR_MALFORMED_DIAGNOSTIC_ATTRIBUTES,
     Warn,
-    "unrecognized diagnostic attribute"
-}
-
-declare_lint! {
-    /// The `malformed_diagnostic_attributes` lint detects malformed diagnostic attributes.
-    ///
-    /// ### Example
-    ///
-    /// ```rust
-    /// #![feature(diagnostic_namespace)]
-    /// #[diagnostic::on_unimplemented]
-    /// struct Foo;
-    /// ```
-    ///
-    /// {{produces}}
-    ///
-    /// ### Explanation
-    ///
-    /// It is usually a mistake to specify invalid options to an existing diagnostic attribute.
-    /// Check the spelling, and check the diagnostic attribute listing for the correct set of options.
-    /// Also consider if you are using an old version of the compiler. Certain options may only
-    /// be available on newer compiler versions
-    pub MALFORMED_DIAGNOSTIC_ATTRIBUTES,
-    Warn,
-    "unrecognized diagnostic attribute options"
+    "unrecognized or malformed diagnostic attribute",
+    @feature_gate = sym::diagnostic_namespace;
 }
 
 declare_lint! {

compiler/rustc_resolve/src/macros.rs

@@ -25,7 +25,7 @@ use rustc_middle::middle::stability;
 use rustc_middle::ty::RegisteredTools;
 use rustc_middle::ty::{TyCtxt, Visibility};
 use rustc_session::lint::builtin::{
-    LEGACY_DERIVE_HELPERS, SOFT_UNSTABLE, UNKNOWN_DIAGNOSTIC_ATTRIBUTES,
+    LEGACY_DERIVE_HELPERS, SOFT_UNSTABLE, UNKNOWN_OR_MALFORMED_DIAGNOSTIC_ATTRIBUTES,
 };
 use rustc_session::lint::builtin::{UNUSED_MACROS, UNUSED_MACRO_RULES};
 use rustc_session::lint::BuiltinLintDiagnostics;
@@ -612,7 +612,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
             && path.segments[1].ident.name != sym::on_unimplemented
         {
             self.tcx.sess.parse_sess.buffer_lint(
-                UNKNOWN_DIAGNOSTIC_ATTRIBUTES,
+                UNKNOWN_OR_MALFORMED_DIAGNOSTIC_ATTRIBUTES,
                 path.segments[1].span(),
                 node_id,
                 "unknown diagnostic attribute",

compiler/rustc_trait_selection/src/traits/error_reporting/on_unimplemented.rs

@@ -9,7 +9,7 @@ use rustc_hir::def_id::DefId;
 use rustc_middle::ty::GenericArgsRef;
 use rustc_middle::ty::{self, GenericParamDefKind, TyCtxt};
 use rustc_parse_format::{ParseMode, Parser, Piece, Position};
-use rustc_session::lint::builtin::MALFORMED_DIAGNOSTIC_ATTRIBUTES;
+use rustc_session::lint::builtin::UNKNOWN_OR_MALFORMED_DIAGNOSTIC_ATTRIBUTES;
 use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::{Span, DUMMY_SP};
 use std::iter;
@@ -445,7 +445,7 @@ impl<'tcx> OnUnimplementedDirective {
 
             if is_diagnostic_namespace_variant {
                 tcx.emit_spanned_lint(
-                    MALFORMED_DIAGNOSTIC_ATTRIBUTES,
+                    UNKNOWN_OR_MALFORMED_DIAGNOSTIC_ATTRIBUTES,
                     tcx.hir().local_def_id_to_hir_id(item_def_id.expect_local()),
                     vec![item.span()],
                     NoValueInOnUnimplementedLint,
@@ -508,7 +508,7 @@ impl<'tcx> OnUnimplementedDirective {
                 }))
             } else {
                 tcx.emit_spanned_lint(
-                    MALFORMED_DIAGNOSTIC_ATTRIBUTES,
+                    UNKNOWN_OR_MALFORMED_DIAGNOSTIC_ATTRIBUTES,
                     tcx.hir().local_def_id_to_hir_id(item_def_id.expect_local()),
                     vec![attr.span],
                     NoValueInOnUnimplementedLint,
@@ -517,7 +517,7 @@ impl<'tcx> OnUnimplementedDirective {
             }
         } else if is_diagnostic_namespace_variant {
             tcx.emit_spanned_lint(
-                MALFORMED_DIAGNOSTIC_ATTRIBUTES,
+                UNKNOWN_OR_MALFORMED_DIAGNOSTIC_ATTRIBUTES,
                 tcx.hir().local_def_id_to_hir_id(item_def_id.expect_local()),
                 vec![attr.span],
                 NoValueInOnUnimplementedLint,

tests/ui/diagnostic_namespace/feature-gate-diagnostic_namespace.rs

@@ -1,12 +1,12 @@
 #[diagnostic::non_existing_attribute]
 //~^ERROR `#[diagnostic]` attribute name space is experimental [E0658]
-//~|WARNING unknown diagnostic attribute [unknown_diagnostic_attributes]
+//~|WARNING unknown diagnostic attribute [unknown_or_malformed_diagnostic_attributes]
 pub trait Bar {
 }
 
 #[diagnostic::non_existing_attribute(with_option = "foo")]
 //~^ERROR `#[diagnostic]` attribute name space is experimental [E0658]
-//~|WARNING unknown diagnostic attribute [unknown_diagnostic_attributes]
+//~|WARNING unknown diagnostic attribute [unknown_or_malformed_diagnostic_attributes]
 struct Foo;
 
 fn main() {

tests/ui/diagnostic_namespace/feature-gate-diagnostic_namespace.stderr

@@ -22,7 +22,7 @@ warning: unknown diagnostic attribute
 LL | #[diagnostic::non_existing_attribute]
    |               ^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: `#[warn(unknown_diagnostic_attributes)]` on by default
+   = note: `#[warn(unknown_or_malformed_diagnostic_attributes)]` on by default
 
 warning: unknown diagnostic attribute
   --> $DIR/feature-gate-diagnostic_namespace.rs:7:15

tests/ui/diagnostic_namespace/non_existing_attributes_accepted.stderr

@@ -4,7 +4,7 @@ warning: unknown diagnostic attribute
 LL | #[diagnostic::non_existing_attribute]
    |               ^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: `#[warn(unknown_diagnostic_attributes)]` on by default
+   = note: `#[warn(unknown_or_malformed_diagnostic_attributes)]` on by default
 
 warning: unknown diagnostic attribute
   --> $DIR/non_existing_attributes_accepted.rs:8:15

tests/ui/diagnostic_namespace/on_unimplemented/do_not_fail_parsing_on_invalid_options_1.stderr

@@ -4,7 +4,7 @@ warning: malformed `on_unimplemented` attribute
 LL | #[diagnostic::on_unimplemented(unsupported = "foo")]
    |                                ^^^^^^^^^^^^^^^^^^^
    |
-   = note: `#[warn(malformed_diagnostic_attributes)]` on by default
+   = note: `#[warn(unknown_or_malformed_diagnostic_attributes)]` on by default
 
 warning: `#[diagnostic::on_unimplemented]` can only be applied to trait definitions
   --> $DIR/do_not_fail_parsing_on_invalid_options_1.rs:8:1