Rename SubdiagnosticDeriveVariantBuilder as SubdiagDeriveVariantBuilder.

Author: nnethercote

compiler/rustc_macros/src/diagnostics/subdiagnostic.rs

@@ -62,7 +62,7 @@ impl SubdiagnosticDeriveBuilder {
 
             structure.bind_with(|_| synstructure::BindStyle::Move);
             let variants_ = structure.each_variant(|variant| {
-                let mut builder = SubdiagnosticDeriveVariantBuilder {
+                let mut builder = SubdiagDeriveVariantBuilder {
                     parent: &self,
                     variant,
                     span,
@@ -107,7 +107,7 @@ impl SubdiagnosticDeriveBuilder {
 /// for the final generated method. This is a separate struct to `SubdiagnosticDerive`
 /// only to be able to destructure and split `self.builder` and the `self.structure` up to avoid a
 /// double mut borrow later on.
-struct SubdiagnosticDeriveVariantBuilder<'parent, 'a> {
+struct SubdiagDeriveVariantBuilder<'parent, 'a> {
     /// The identifier to use for the generated `Diag` instance.
     parent: &'parent SubdiagnosticDeriveBuilder,
 
@@ -137,7 +137,7 @@ struct SubdiagnosticDeriveVariantBuilder<'parent, 'a> {
     is_enum: bool,
 }
 
-impl<'parent, 'a> HasFieldMap for SubdiagnosticDeriveVariantBuilder<'parent, 'a> {
+impl<'parent, 'a> HasFieldMap for SubdiagDeriveVariantBuilder<'parent, 'a> {
     fn get_field_binding(&self, field: &String) -> Option<&TokenStream> {
         self.fields.get(field)
     }
@@ -181,7 +181,7 @@ impl<'a> FromIterator<&'a SubdiagnosticKind> for KindsStatistics {
     }
 }
 
-impl<'parent, 'a> SubdiagnosticDeriveVariantBuilder<'parent, 'a> {
+impl<'parent, 'a> SubdiagDeriveVariantBuilder<'parent, 'a> {
     fn identify_kind(&mut self) -> Result<Vec<(SubdiagnosticKind, Path, bool)>, DiagDeriveError> {
         let mut kind_slugs = vec![];