Rename DiagnosticDeriveVariantBuilder as DiagDeriveVariantBuilder.

Author: nnethercote

compiler/rustc_macros/src/diagnostics/diagnostic_builder.rs

@@ -24,7 +24,7 @@ pub(crate) enum DiagDeriveKind {
 /// Tracks persistent information required for a specific variant when building up individual calls
 /// to diagnostic methods for generated diagnostic derives - both `Diagnostic` for
 /// fatal/errors/warnings and `LintDiagnostic` for lints.
-pub(crate) struct DiagnosticDeriveVariantBuilder {
+pub(crate) struct DiagDeriveVariantBuilder {
     /// The kind for the entire type.
     pub kind: DiagDeriveKind,
 
@@ -47,7 +47,7 @@ pub(crate) struct DiagnosticDeriveVariantBuilder {
     pub code: SpannedOption<()>,
 }
 
-impl HasFieldMap for DiagnosticDeriveVariantBuilder {
+impl HasFieldMap for DiagDeriveVariantBuilder {
     fn get_field_binding(&self, field: &String) -> Option<&TokenStream> {
         self.field_map.get(field)
     }
@@ -59,7 +59,7 @@ impl DiagDeriveKind {
     /// or attributes on the type itself when input is an enum.
     pub(crate) fn each_variant<'s, F>(self, structure: &mut Structure<'s>, f: F) -> TokenStream
     where
-        F: for<'v> Fn(DiagnosticDeriveVariantBuilder, &VariantInfo<'v>) -> TokenStream,
+        F: for<'v> Fn(DiagDeriveVariantBuilder, &VariantInfo<'v>) -> TokenStream,
     {
         let ast = structure.ast();
         let span = ast.span().unwrap();
@@ -88,7 +88,7 @@ impl DiagDeriveKind {
                 // name will need to do.
                 _ => variant.ast().ident.span().unwrap(),
             };
-            let builder = DiagnosticDeriveVariantBuilder {
+            let builder = DiagDeriveVariantBuilder {
                 kind: self,
                 span,
                 field_map: build_field_mapping(variant),
@@ -107,7 +107,7 @@ impl DiagDeriveKind {
     }
 }
 
-impl DiagnosticDeriveVariantBuilder {
+impl DiagDeriveVariantBuilder {
     /// Generates calls to `code` and similar functions based on the attributes on the type or
     /// variant.
     pub(crate) fn preamble(&mut self, variant: &VariantInfo<'_>) -> TokenStream {
@@ -165,7 +165,7 @@ impl DiagnosticDeriveVariantBuilder {
         Ok(Some((subdiag.kind, slug, subdiag.no_span)))
     }
 
-    /// Establishes state in the `DiagnosticDeriveBuilder` resulting from the struct
+    /// Establishes state in the `DiagDeriveVariantBuilder` resulting from the struct
     /// attributes like `#[diag(..)]`, such as the slug and error code. Generates
     /// diagnostic builder calls for setting error code and creating note/help messages.
     fn generate_structure_code_for_attr(