Refactor additional diagnostics in rustc_attr

compiler/rustc_attr/src/builtin.rs

@@ -645,25 +645,18 @@ pub fn eval_condition(
                     NestedMetaItem::Literal(Lit { span, .. })
                     | NestedMetaItem::MetaItem(MetaItem { span, .. }),
                 ] => {
-                    sess.span_diagnostic
+                    sess.emit_err(session_diagnostics::ExpectedVersionLiteral { span: *span });
-                        .struct_span_err(*span, "expected a version literal")
-                        .emit();
                     return false;
                 }
                 [..] => {
-                    sess.span_diagnostic
+                    sess.emit_err(session_diagnostics::ExpectedSingleVersionLiteral {
-                        .struct_span_err(cfg.span, "expected single version literal")
+                        span: cfg.span,
-                        .emit();
+                    });
                     return false;
                 }
             };
             let Some(min_version) = parse_version(min_version.as_str(), false) else {
-                sess.span_diagnostic
+                sess.emit_warning(session_diagnostics::UnknownVersionLiteral { span: *span });
-                    .struct_span_warn(
-                        *span,
-                        "unknown version literal format, assuming it refers to a future version",
-                    )
-                    .emit();
                 return false;
             };
             let rustc_version = parse_version(env!("CFG_RELEASE"), true).unwrap();
@@ -706,13 +699,9 @@ pub fn eval_condition(
                     }),
                 sym::not => {
                     if mis.len() != 1 {
-                        struct_span_err!(
+                        sess.emit_err(session_diagnostics::ExpectedOneCfgPattern {
-                            sess.span_diagnostic,
+                            span: cfg.span,
-                            cfg.span,
+                        });
-                            E0536,
-                            "expected 1 cfg-pattern"
-                        )
-                        .emit();
                         return false;
                     }
 
@@ -738,21 +727,16 @@ pub fn eval_condition(
                     })
                 }
                 _ => {
-                    struct_span_err!(
+                    sess.emit_err(session_diagnostics::InvalidPredicate {
-                        sess.span_diagnostic,
+                        span: cfg.span,
-                        cfg.span,
+                        predicate: pprust::path_to_string(&cfg.path),
-                        E0537,
+                    });
-                        "invalid predicate `{}`",
-                        pprust::path_to_string(&cfg.path)
-                    )
-                    .emit();
                     false
                 }
             }
         }
         ast::MetaItemKind::Word | MetaItemKind::NameValue(..) if cfg.path.segments.len() != 1 => {
-            sess.span_diagnostic
+            sess.emit_err(session_diagnostics::CfgPredicateIdentifier { span: cfg.path.span });
-                .span_err(cfg.path.span, "`cfg` predicate key must be an identifier");
             true
         }
         MetaItemKind::NameValue(ref lit) if !lit.kind.is_str() => {
@@ -868,14 +852,10 @@ where
                             }
                             sym::suggestion => {
                                 if !sess.features_untracked().deprecated_suggestion {
-                                    let mut diag = sess.struct_span_err(
+                                    sess.emit_err(session_diagnostics::DeprecatedItemSuggestion {
-                                        mi.span,
+                                        span: mi.span,
-                                        "suggestions on deprecated items are unstable",
+                                        is_nightly: sess.is_nightly_build().then_some(()),
-                                    );
+                                    });
-                                    if sess.is_nightly_build() {
-                                        diag.help("add `#![feature(deprecated_suggestion)]` to the crate root");
-                                    }
-                                    diag.note("see #94785 for more details").emit();
                                 }
 
                                 if !get(mi, &mut suggestion) {
@@ -921,7 +901,7 @@ where
             }
 
             if note.is_none() {
-                struct_span_err!(diagnostic, attr.span, E0543, "missing 'note'").emit();
+                sess.emit_err(session_diagnostics::MissingNote { span: attr.span });
                 continue;
             }
         }

compiler/rustc_attr/src/session_diagnostics.rs

@@ -79,6 +79,68 @@ pub(crate) struct SoftNoArgs {
     pub span: Span,
 }
 
+#[derive(SessionDiagnostic)]
+#[error(attr::expected_version_literal)]
+pub(crate) struct ExpectedVersionLiteral {
+    #[primary_span]
+    pub span: Span,
+}
+
+#[derive(SessionDiagnostic)]
+#[error(attr::expected_single_version_literal)]
+pub(crate) struct ExpectedSingleVersionLiteral {
+    #[primary_span]
+    pub span: Span,
+}
+
+#[derive(SessionDiagnostic)]
+#[warning(attr::unknown_version_literal)]
+pub(crate) struct UnknownVersionLiteral {
+    #[primary_span]
+    pub span: Span,
+}
+
+#[derive(SessionDiagnostic)]
+#[error(attr::expected_one_cfg_pattern, code = "E0536")]
+pub(crate) struct ExpectedOneCfgPattern {
+    #[primary_span]
+    pub span: Span,
+}
+
+#[derive(SessionDiagnostic)]
+#[error(attr::invalid_predicate, code = "E0537")]
+pub(crate) struct InvalidPredicate {
+    #[primary_span]
+    pub span: Span,
+
+    pub predicate: String,
+}
+
+#[derive(SessionDiagnostic)]
+#[error(attr::cfg_predicate_identifier)]
+pub(crate) struct CfgPredicateIdentifier {
+    #[primary_span]
+    pub span: Span,
+}
+
+#[derive(SessionDiagnostic)]
+#[error(attr::deprecated_item_suggestion)]
+#[note]
+pub(crate) struct DeprecatedItemSuggestion {
+    #[primary_span]
+    pub span: Span,
+
+    #[help]
+    pub is_nightly: Option<()>,
+}
+
+#[derive(SessionDiagnostic)]
+#[error(attr::missing_note, code = "E0543")]
+pub(crate) struct MissingNote {
+    #[primary_span]
+    pub span: Span,
+}
+
 #[derive(SessionDiagnostic)]
 #[error(attr::invalid_issue_string, code = "E0545")]
 pub(crate) struct InvalidIssueString {

compiler/rustc_error_messages/locales/en-US/attr.ftl

@@ -55,3 +55,29 @@ attr_rustc_allowed_unstable_pairing =
 
 attr_soft_no_args =
     `soft` should not have any arguments
+
+attr_expected_version_literal =
+    expected a version literal
+
+attr_expected_single_version_literal =
+    expected single version literal
+
+attr_unknown_version_literal =
+    unknown version literal format, assuming it refers to a future version
+
+attr_expected_one_cfg_pattern =
+    expected 1 cfg-pattern
+
+attr_invalid_predicate =
+    invalid predicate `{$predicate}`
+
+attr_cfg_predicate_identifier =
+    `cfg` predicate key must be an identifier
+
+attr_deprecated_item_suggestion =
+    suggestions on deprecated items are unstable
+    .help = add `#![feature(deprecated_suggestion)]` to the crate root
+    .note = see #94785 for more details
+
+attr_missing_note =
+    missing 'note'