Rename diagnostic derive things.

First, make the derive label match the trait being derived:
- derive(Diagnostic)     -> derive(IntoDiag)
- derive(Subdiagnostic)  -> derive(AddToDiag)
- derive(LintDiagnostic) -> derive(DecorateLint)

Then rename various other things:
- session_diagnostic_derive    -> into_diag_derive
- session_subdiagnostic_derive -> add_to_diag_derive
- lint_diagnostic_derive       -> decorate_lint_derive
- DiagnosticDerive             -> IntoDiagDerive
- LintDiagnosticDerive         -> DecorateLintDerive
- SubdiagnosticDeriveBuilder   -> AddToDiagDerive (note: dropped the `Builder` suffix)

Author: nnethercote

compiler/rustc_ast_lowering/src/errors.rs

@@ -1,10 +1,10 @@
 use rustc_errors::{
     codes::*, AddToDiag, Diag, DiagArgFromDisplay, EmissionGuarantee, SubdiagMessageOp,
 };
-use rustc_macros::{Diagnostic, Subdiagnostic};
+use rustc_macros::{AddToDiag, IntoDiag};
 use rustc_span::{symbol::Ident, Span, Symbol};
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_generic_type_with_parentheses, code = E0214)]
 pub struct GenericTypeWithParentheses {
     #[primary_span]
@@ -14,7 +14,7 @@ pub struct GenericTypeWithParentheses {
     pub sub: Option<UseAngleBrackets>,
 }
 
-#[derive(Subdiagnostic)]
+#[derive(AddToDiag)]
 #[multipart_suggestion(ast_lowering_use_angle_brackets, applicability = "maybe-incorrect")]
 pub struct UseAngleBrackets {
     #[suggestion_part(code = "<")]
@@ -23,7 +23,7 @@ pub struct UseAngleBrackets {
     pub close_param: Span,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_invalid_abi, code = E0703)]
 #[note]
 pub struct InvalidAbi {
@@ -51,7 +51,7 @@ impl AddToDiag for InvalidAbiReason {
     }
 }
 
-#[derive(Subdiagnostic)]
+#[derive(AddToDiag)]
 #[suggestion(
     ast_lowering_invalid_abi_suggestion,
     code = "{suggestion}",
@@ -63,7 +63,7 @@ pub struct InvalidAbiSuggestion {
     pub suggestion: String,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_assoc_ty_parentheses)]
 pub struct AssocTyParentheses {
     #[primary_span]
@@ -72,7 +72,7 @@ pub struct AssocTyParentheses {
     pub sub: AssocTyParenthesesSub,
 }
 
-#[derive(Subdiagnostic)]
+#[derive(AddToDiag)]
 pub enum AssocTyParenthesesSub {
     #[multipart_suggestion(ast_lowering_remove_parentheses)]
     Empty {
@@ -88,7 +88,7 @@ pub enum AssocTyParenthesesSub {
     },
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_misplaced_impl_trait, code = E0562)]
 #[note]
 pub struct MisplacedImplTrait<'a> {
@@ -97,7 +97,7 @@ pub struct MisplacedImplTrait<'a> {
     pub position: DiagArgFromDisplay<'a>,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_assoc_ty_binding_in_dyn)]
 pub struct MisplacedAssocTyBinding {
     #[primary_span]
@@ -106,23 +106,23 @@ pub struct MisplacedAssocTyBinding {
     pub suggestion: Option<Span>,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_underscore_expr_lhs_assign)]
 pub struct UnderscoreExprLhsAssign {
     #[primary_span]
     #[label]
     pub span: Span,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_base_expression_double_dot, code = E0797)]
 pub struct BaseExpressionDoubleDot {
     #[primary_span]
     #[suggestion(code = "/* expr */", applicability = "has-placeholders", style = "verbose")]
     pub span: Span,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_await_only_in_async_fn_and_blocks, code = E0728)]
 pub struct AwaitOnlyInAsyncFnAndBlocks {
     #[primary_span]
@@ -132,50 +132,50 @@ pub struct AwaitOnlyInAsyncFnAndBlocks {
     pub item_span: Option<Span>,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_coroutine_too_many_parameters, code = E0628)]
 pub struct CoroutineTooManyParameters {
     #[primary_span]
     pub fn_decl_span: Span,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_closure_cannot_be_static, code = E0697)]
 pub struct ClosureCannotBeStatic {
     #[primary_span]
     pub fn_decl_span: Span,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_functional_record_update_destructuring_assignment)]
 pub struct FunctionalRecordUpdateDestructuringAssignment {
     #[primary_span]
     #[suggestion(code = "", applicability = "machine-applicable")]
     pub span: Span,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_async_coroutines_not_supported, code = E0727)]
 pub struct AsyncCoroutinesNotSupported {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_inline_asm_unsupported_target, code = E0472)]
 pub struct InlineAsmUnsupportedTarget {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_att_syntax_only_x86)]
 pub struct AttSyntaxOnlyX86 {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_abi_specified_multiple_times)]
 pub struct AbiSpecifiedMultipleTimes {
     #[primary_span]
@@ -187,14 +187,14 @@ pub struct AbiSpecifiedMultipleTimes {
     pub equivalent: Option<()>,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_clobber_abi_not_supported)]
 pub struct ClobberAbiNotSupported {
     #[primary_span]
     pub abi_span: Span,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[note]
 #[diag(ast_lowering_invalid_abi_clobber_abi)]
 pub struct InvalidAbiClobberAbi {
@@ -203,7 +203,7 @@ pub struct InvalidAbiClobberAbi {
     pub supported_abis: String,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_invalid_register)]
 pub struct InvalidRegister<'a> {
     #[primary_span]
@@ -212,7 +212,7 @@ pub struct InvalidRegister<'a> {
     pub error: &'a str,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_invalid_register_class)]
 pub struct InvalidRegisterClass<'a> {
     #[primary_span]
@@ -221,7 +221,7 @@ pub struct InvalidRegisterClass<'a> {
     pub error: &'a str,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_invalid_asm_template_modifier_reg_class)]
 pub struct InvalidAsmTemplateModifierRegClass {
     #[primary_span]
@@ -233,15 +233,15 @@ pub struct InvalidAsmTemplateModifierRegClass {
     pub sub: InvalidAsmTemplateModifierRegClassSub,
 }
 
-#[derive(Subdiagnostic)]
+#[derive(AddToDiag)]
 pub enum InvalidAsmTemplateModifierRegClassSub {
     #[note(ast_lowering_support_modifiers)]
     SupportModifier { class_name: Symbol, modifiers: String },
     #[note(ast_lowering_does_not_support_modifiers)]
     DoesNotSupportModifier { class_name: Symbol },
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_invalid_asm_template_modifier_const)]
 pub struct InvalidAsmTemplateModifierConst {
     #[primary_span]
@@ -251,7 +251,7 @@ pub struct InvalidAsmTemplateModifierConst {
     pub op_span: Span,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_invalid_asm_template_modifier_sym)]
 pub struct InvalidAsmTemplateModifierSym {
     #[primary_span]
@@ -261,15 +261,15 @@ pub struct InvalidAsmTemplateModifierSym {
     pub op_span: Span,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_register_class_only_clobber)]
 pub struct RegisterClassOnlyClobber {
     #[primary_span]
     pub op_span: Span,
     pub reg_class_name: Symbol,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_register_conflict)]
 pub struct RegisterConflict<'a> {
     #[primary_span]
@@ -283,7 +283,7 @@ pub struct RegisterConflict<'a> {
     pub in_out: Option<Span>,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[help]
 #[diag(ast_lowering_sub_tuple_binding)]
 pub struct SubTupleBinding<'a> {
@@ -301,7 +301,7 @@ pub struct SubTupleBinding<'a> {
     pub ctx: &'a str,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_extra_double_dot)]
 pub struct ExtraDoubleDot<'a> {
     #[primary_span]
@@ -312,22 +312,22 @@ pub struct ExtraDoubleDot<'a> {
     pub ctx: &'a str,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[note]
 #[diag(ast_lowering_misplaced_double_dot)]
 pub struct MisplacedDoubleDot {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_misplaced_relax_trait_bound)]
 pub struct MisplacedRelaxTraitBound {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_match_arm_with_no_body)]
 pub struct MatchArmWithNoBody {
     #[primary_span]
@@ -336,7 +336,7 @@ pub struct MatchArmWithNoBody {
     pub suggestion: Span,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_never_pattern_with_body)]
 pub struct NeverPatternWithBody {
     #[primary_span]
@@ -345,29 +345,29 @@ pub struct NeverPatternWithBody {
     pub span: Span,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_never_pattern_with_guard)]
 pub struct NeverPatternWithGuard {
     #[primary_span]
     #[suggestion(code = "", applicability = "maybe-incorrect")]
     pub span: Span,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_arbitrary_expression_in_pattern)]
 pub struct ArbitraryExpressionInPattern {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_inclusive_range_with_no_end)]
 pub struct InclusiveRangeWithNoEnd {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 pub enum BadReturnTypeNotation {
     #[diag(ast_lowering_bad_return_type_notation_inputs)]
     Inputs {
@@ -383,22 +383,22 @@ pub enum BadReturnTypeNotation {
     },
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_generic_param_default_in_binder)]
 pub(crate) struct GenericParamDefaultInBinder {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_async_bound_not_on_trait)]
 pub(crate) struct AsyncBoundNotOnTrait {
     #[primary_span]
     pub span: Span,
     pub descr: &'static str,
 }
 
-#[derive(Diagnostic)]
+#[derive(IntoDiag)]
 #[diag(ast_lowering_async_bound_only_for_fn_traits)]
 pub(crate) struct AsyncBoundOnlyForFnTraits {
     #[primary_span]