Rename EnumBuilderVariant -> EnumBuilderKind

Author: jschwe

bindgen/codegen/mod.rs

@@ -3275,11 +3275,11 @@ struct EnumBuilder {
     /// The representation of the enum, e.g. `u32`.
     repr: syn::Type,
     /// The enum kind we are generating
-    kind: EnumBuilderVariant,
+    kind: EnumBuilderKind,
 }
 
 /// A helper type to construct different enum variations.
-enum EnumBuilderVariant {
+enum EnumBuilderKind {
     Rust {
         non_exhaustive: bool,
     },
@@ -3300,7 +3300,7 @@ enum EnumBuilderVariant {
 impl EnumBuilder {
     /// Returns true if the builder is for a rustified enum.
     fn is_rust_enum(&self) -> bool {
-        matches!(self.kind, EnumBuilderVariant::Rust { .. })
+        matches!(self.kind, EnumBuilderKind::Rust { .. })
     }
 
     /// Create a new enum given an item builder, a canonical name, a name for
@@ -3321,17 +3321,17 @@ impl EnumBuilder {
             EnumVariation::NewType {
                 is_bitfield,
                 is_global,
-            } => EnumBuilderVariant::NewType {
+            } => EnumBuilderKind::NewType {
                 is_bitfield,
                 is_global,
                 is_anonymous: enum_is_anonymous,
             },
 
             EnumVariation::Rust { non_exhaustive } => {
-                EnumBuilderVariant::Rust { non_exhaustive }
+                EnumBuilderKind::Rust { non_exhaustive }
             }
 
-            EnumVariation::Consts => EnumBuilderVariant::Consts {
+            EnumVariation::Consts => EnumBuilderKind::Consts {
                 needs_typedef: !has_typedef,
             },
 
@@ -3341,7 +3341,7 @@ impl EnumBuilder {
                     Span::call_site(),
                 );
 
-                EnumBuilderVariant::ModuleConsts {
+                EnumBuilderKind::ModuleConsts {
                     module_name: ident.clone(),
                 }
             }
@@ -3377,7 +3377,7 @@ impl EnumBuilder {
         };
 
         match self.kind {
-            EnumBuilderVariant::Rust { .. } => {
+            EnumBuilderKind::Rust { .. } => {
                 let name = ctx.rust_ident(variant_name);
                 enum_variants.push(EnumVariantInfo {
                     variant_name: name,
@@ -3387,7 +3387,7 @@ impl EnumBuilder {
                 self
             }
 
-            EnumBuilderVariant::NewType { is_global, .. } => {
+            EnumBuilderKind::NewType { is_global, .. } => {
                 let variant_ident = if is_ty_named && !is_global {
                     ctx.rust_ident(variant_name)
                 } else {
@@ -3407,7 +3407,7 @@ impl EnumBuilder {
                 self
             }
 
-            EnumBuilderVariant::Consts { .. } => {
+            EnumBuilderKind::Consts { .. } => {
                 let constant_name = match mangling_prefix {
                     Some(prefix) => {
                         Cow::Owned(format!("{prefix}_{variant_name}"))
@@ -3424,7 +3424,7 @@ impl EnumBuilder {
 
                 self
             }
-            EnumBuilderVariant::ModuleConsts { .. } => {
+            EnumBuilderKind::ModuleConsts { .. } => {
                 let name = ctx.rust_ident(variant_name);
                 enum_variants.push(EnumVariantInfo {
                     variant_name: name,
@@ -3492,7 +3492,7 @@ impl EnumBuilder {
 
         // 1. Construct a list of the enum variants
         let variants = match self.kind {
-            EnumBuilderVariant::Rust { .. } => {
+            EnumBuilderKind::Rust { .. } => {
                 let mut variants = vec![];
 
                 for (variant_ident, variant_doc, variant_value) in
@@ -3511,7 +3511,7 @@ impl EnumBuilder {
                 }
                 variants
             }
-            EnumBuilderVariant::NewType { .. } => {
+            EnumBuilderKind::NewType { .. } => {
                 let mut variants = vec![];
 
                 for (variant_ident, variant_doc, variant_value) in
@@ -3524,8 +3524,8 @@ impl EnumBuilder {
                 }
                 variants
             }
-            EnumBuilderVariant::Consts { .. } |
-            EnumBuilderVariant::ModuleConsts { .. } => {
+            EnumBuilderKind::Consts { .. } |
+            EnumBuilderKind::ModuleConsts { .. } => {
                 let mut variants = vec![];
 
                 for (variant_ident, variant_doc, variant_value) in
@@ -3544,7 +3544,7 @@ impl EnumBuilder {
 
         // 2. Generate the enum representation
         let enum_ = match self.kind {
-            EnumBuilderVariant::Rust { non_exhaustive } => {
+            EnumBuilderKind::Rust { non_exhaustive } => {
                 let non_exhaustive_opt =
                     non_exhaustive.then(attributes::non_exhaustive);
 
@@ -3559,7 +3559,7 @@ impl EnumBuilder {
                     }
                 }
             }
-            EnumBuilderVariant::NewType {
+            EnumBuilderKind::NewType {
                 is_bitfield,
                 is_global,
                 is_anonymous,
@@ -3595,7 +3595,7 @@ impl EnumBuilder {
                      pub struct #enum_ident (pub #enum_repr);
                 }
             }
-            EnumBuilderVariant::Consts { needs_typedef } => {
+            EnumBuilderKind::Consts { needs_typedef } => {
                 let typedef_opt = needs_typedef.then(|| {
                     quote! {
                         #( #attrs )*
@@ -3608,7 +3608,7 @@ impl EnumBuilder {
                     #typedef_opt
                 }
             }
-            EnumBuilderVariant::ModuleConsts { module_name, .. } => {
+            EnumBuilderKind::ModuleConsts { module_name, .. } => {
                 quote! {
                     // todo: Probably some attributes, e.g. `cfg` should apply to the `mod`.
                     pub mod #module_name {