fix --newtype-global-enum option

Author: pvdrz

src/codegen/mod.rs

@@ -2814,24 +2814,19 @@ impl<'a> EnumBuilder<'a> {
                 is_global,
                 ..
             } => {
-                if ctx.options().rust_features().associated_const && is_ty_named
+                if ctx.options().rust_features().associated_const &&
+                    is_ty_named &&
+                    !is_global
                 {
                     let enum_ident = ctx.rust_ident(canonical_name);
                     let variant_ident = ctx.rust_ident(variant_name);
-                    let tokens = quote! {
-                        #doc
-                        pub const #variant_ident : #rust_ty = #rust_ty ( #expr );
-                    };
 
-                    if is_global {
-                        result.push(tokens);
-                    } else {
-                        result.push(quote! {
-                            impl #enum_ident {
-                                #tokens
-                            }
-                        });
-                    }
+                    result.push(quote! {
+                        impl #enum_ident {
+                            #doc
+                            pub const #variant_ident : #rust_ty = #rust_ty ( #expr );
+                        }
+                    });
                 } else {
                     let ident = ctx.rust_ident(match mangling_prefix {
                         Some(prefix) => {

src/lib.rs

@@ -315,6 +315,7 @@ impl Builder {
         let regex_sets = &[
             (&self.options.bitfield_enums, "--bitfield-enum"),
             (&self.options.newtype_enums, "--newtype-enum"),
+            (&self.options.newtype_global_enums, "--newtype-global-enum"),
             (&self.options.rustified_enums, "--rustified-enum"),
             (
                 &self.options.rustified_non_exhaustive_enums,
@@ -2072,6 +2073,7 @@ impl BindgenOptions {
             &mut self.constified_enums,
             &mut self.constified_enum_modules,
             &mut self.newtype_enums,
+            &mut self.newtype_global_enums,
             &mut self.rustified_enums,
             &mut self.rustified_non_exhaustive_enums,
             &mut self.type_alias,