Rename DiagnosticDeriveKind as DiagDeriveKind.

Author: nnethercote

compiler/rustc_macros/src/diagnostics/diagnostic.rs

@@ -2,7 +2,7 @@
 
 use std::cell::RefCell;
 
-use crate::diagnostics::diagnostic_builder::DiagnosticDeriveKind;
+use crate::diagnostics::diagnostic_builder::DiagDeriveKind;
 use crate::diagnostics::error::{span_err, DiagnosticDeriveError};
 use crate::diagnostics::utils::SetOnce;
 use proc_macro2::TokenStream;
@@ -22,7 +22,7 @@ impl<'a> DiagnosticDerive<'a> {
 
     pub(crate) fn into_tokens(self) -> TokenStream {
         let DiagnosticDerive { mut structure } = self;
-        let kind = DiagnosticDeriveKind::Diagnostic;
+        let kind = DiagDeriveKind::Diagnostic;
         let slugs = RefCell::new(Vec::new());
         let implementation = kind.each_variant(&mut structure, |mut builder, variant| {
             let preamble = builder.preamble(variant);
@@ -104,7 +104,7 @@ impl<'a> LintDiagnosticDerive<'a> {
 
     pub(crate) fn into_tokens(self) -> TokenStream {
         let LintDiagnosticDerive { mut structure } = self;
-        let kind = DiagnosticDeriveKind::LintDiagnostic;
+        let kind = DiagDeriveKind::LintDiagnostic;
         let implementation = kind.each_variant(&mut structure, |mut builder, variant| {
             let preamble = builder.preamble(variant);
             let body = builder.body(variant);

compiler/rustc_macros/src/diagnostics/diagnostic_builder.rs

@@ -18,7 +18,7 @@ use super::utils::SubdiagnosticVariant;
 
 /// What kind of diagnostic is being derived - a fatal/error/warning or a lint?
 #[derive(Clone, Copy, PartialEq, Eq)]
-pub(crate) enum DiagnosticDeriveKind {
+pub(crate) enum DiagDeriveKind {
     Diagnostic,
     LintDiagnostic,
 }
@@ -28,7 +28,7 @@ pub(crate) enum DiagnosticDeriveKind {
 /// fatal/errors/warnings and `LintDiagnostic` for lints.
 pub(crate) struct DiagnosticDeriveVariantBuilder {
     /// The kind for the entire type.
-    pub kind: DiagnosticDeriveKind,
+    pub kind: DiagDeriveKind,
 
     /// Initialization of format strings for code suggestions.
     pub formatting_init: TokenStream,
@@ -55,7 +55,7 @@ impl HasFieldMap for DiagnosticDeriveVariantBuilder {
     }
 }
 
-impl DiagnosticDeriveKind {
+impl DiagDeriveKind {
     /// Call `f` for the struct or for each variant of the enum, returning a `TokenStream` with the
     /// tokens from `f` wrapped in an `match` expression. Emits errors for use of derive on unions
     /// or attributes on the type itself when input is an enum.
@@ -316,14 +316,14 @@ impl DiagnosticDeriveVariantBuilder {
             (Meta::Path(_), "skip_arg") => return Ok(quote! {}),
             (Meta::Path(_), "primary_span") => {
                 match self.kind {
-                    DiagnosticDeriveKind::Diagnostic => {
+                    DiagDeriveKind::Diagnostic => {
                         report_error_if_not_applied_to_span(attr, &info)?;
 
                         return Ok(quote! {
                             diag.span(#binding);
                         });
                     }
-                    DiagnosticDeriveKind::LintDiagnostic => {
+                    DiagDeriveKind::LintDiagnostic => {
                         throw_invalid_attr!(attr, |diag| {
                             diag.help("the `primary_span` field attribute is not valid for lint diagnostics")
                         })