Move enum_variants into the builder

Author: jschwe

bindgen/codegen/mod.rs

@@ -3275,6 +3275,8 @@ struct EnumBuilder {
     repr: syn::Type,
     /// The enum kind we are generating
     kind: EnumBuilderKind,
+    /// A list of all variants this enum has.
+    enum_variants: Vec<EnumVariantInfo>,
 }
 
 /// A helper type to construct different enum variations.
@@ -3350,18 +3352,18 @@ impl EnumBuilder {
             attrs,
             repr: repr.clone(),
             kind,
+            enum_variants: vec![],
         }
     }
 
     /// Add a variant to this enum.
     fn with_variant(
-        self,
+        mut self,
         ctx: &BindgenContext,
         variant: &EnumVariant,
         variant_doc: proc_macro2::TokenStream,
         mangling_prefix: Option<&str>,
         rust_ty: &syn::Type,
-        enum_variants: &mut Vec<EnumVariantInfo>,
         is_ty_named: bool,
     ) -> Self {
         let variant_name = ctx.rust_mangle(variant.name());
@@ -3378,7 +3380,7 @@ impl EnumBuilder {
         match self.kind {
             EnumBuilderKind::Rust { .. } => {
                 let name = ctx.rust_ident(variant_name);
-                enum_variants.push(EnumVariantInfo {
+                self.enum_variants.push(EnumVariantInfo {
                     variant_name: name,
                     variant_doc,
                     value: expr,
@@ -3397,7 +3399,7 @@ impl EnumBuilder {
                         None => variant_name,
                     })
                 };
-                enum_variants.push(EnumVariantInfo {
+                self.enum_variants.push(EnumVariantInfo {
                     variant_name: variant_ident,
                     variant_doc,
                     value: quote! { #rust_ty ( #expr )},
@@ -3415,7 +3417,7 @@ impl EnumBuilder {
                 };
 
                 let ident = ctx.rust_ident(constant_name);
-                enum_variants.push(EnumVariantInfo {
+                self.enum_variants.push(EnumVariantInfo {
                     variant_name: ident,
                     variant_doc,
                     value: quote! { #expr },
@@ -3425,7 +3427,7 @@ impl EnumBuilder {
             }
             EnumBuilderKind::ModuleConsts { .. } => {
                 let name = ctx.rust_ident(variant_name);
-                enum_variants.push(EnumVariantInfo {
+                self.enum_variants.push(EnumVariantInfo {
                     variant_name: name,
                     variant_doc,
                     value: quote! { #expr },
@@ -3476,7 +3478,6 @@ impl EnumBuilder {
         self,
         ctx: &BindgenContext,
         rust_ty: &syn::Type,
-        enum_variants: &[EnumVariantInfo],
     ) -> proc_macro2::TokenStream {
         let enum_ident = self.enum_type;
 
@@ -3485,7 +3486,7 @@ impl EnumBuilder {
             EnumBuilderKind::Rust { .. } => {
                 let mut variants = vec![];
 
-                for v in enum_variants {
+                for v in self.enum_variants {
                     let variant_doc = &v.variant_doc;
                     let variant_ident = &v.variant_name;
                     let variant_value = &v.value;
@@ -3506,7 +3507,7 @@ impl EnumBuilder {
             EnumBuilderKind::NewType { .. } => {
                 let mut variants = vec![];
 
-                for v in enum_variants {
+                for v in self.enum_variants {
                     let variant_doc = &v.variant_doc;
                     let variant_ident = &v.variant_name;
                     let variant_value = &v.value;
@@ -3522,7 +3523,7 @@ impl EnumBuilder {
             EnumBuilderKind::ModuleConsts { .. } => {
                 let mut variants = vec![];
 
-                for v in enum_variants {
+                for v in self.enum_variants {
                     let variant_doc = &v.variant_doc;
                     let variant_ident = &v.variant_name;
                     let variant_value = &v.value;
@@ -3826,8 +3827,6 @@ impl CodeGenerator for Enum {
         // do).
         let mut constified_variants = VecDeque::new();
 
-        let mut enum_variants = vec![];
-
         let mut iter = self.variants().iter().peekable();
         while let Some(variant) =
             iter.next().or_else(|| constified_variants.pop_front())
@@ -3895,7 +3894,6 @@ impl CodeGenerator for Enum {
                             variant_doc,
                             constant_mangling_prefix,
                             &enum_rust_ty,
-                            &mut enum_variants,
                             enum_ty.name().is_some(),
                         );
                     }
@@ -3907,7 +3905,6 @@ impl CodeGenerator for Enum {
                         variant_doc.clone(),
                         constant_mangling_prefix,
                         &enum_rust_ty,
-                        &mut enum_variants,
                         enum_ty.name().is_some(),
                     );
 
@@ -3947,7 +3944,7 @@ impl CodeGenerator for Enum {
             }
         }
 
-        let item = builder.build(ctx, &enum_rust_ty, &enum_variants);
+        let item = builder.build(ctx, &enum_rust_ty);
         result.push(item);
     }
 }