Rename from "enum variant" to "enum style"

7 files changed, 19 insertions, 20 deletions

diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs
index 4575f9b2..8c602eae 100644
--- a/src/codegen/mod.rs
+++ b/src/codegen/mod.rs
@@ -2521,7 +2521,7 @@ impl CodeGenerator for Enum {
         } else if self.is_rustified_enum(ctx, item) {
             EnumVariation::Rust
         } else {
-            ctx.options().default_enum_variant
+            ctx.options().default_enum_style
         };
 
         let mut attrs = vec![];
diff --git a/src/lib.rs b/src/lib.rs
index 38b91494..9a2d4f14 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -204,15 +204,15 @@ impl Builder {
         output_vector.push("--rust-target".into());
         output_vector.push(self.options.rust_target.into());
 
-        if self.options.default_enum_variant != Default::default() {
+        if self.options.default_enum_style != Default::default() {
             output_vector.push("--default-enum-variant=".into());
-            output_vector.push(match self.options.default_enum_variant {
+            output_vector.push(match self.options.default_enum_style {
                 codegen::EnumVariation::Rust => "rust",
                 codegen::EnumVariation::Bitfield => "bitfield",
                 codegen::EnumVariation::Consts => "consts",
                 codegen::EnumVariation::ModuleConsts => "moduleconsts",
             }.into())
-        };
+        }
 
         self.options
             .bitfield_enums
@@ -740,10 +740,9 @@ impl Builder {
         self.whitelist_var(arg)
     }
 
-
-    /// Set the default type of code to generate for enums
-    pub fn default_enum_variant(mut self, arg: codegen::EnumVariation) -> Builder {
-        self.options.default_enum_variant = arg;
+    /// Set the default style of code to generate for enums
+    pub fn default_enum_style(mut self, arg: codegen::EnumVariation) -> Builder {
+        self.options.default_enum_style = arg;
         self
     }
 
@@ -1257,8 +1256,8 @@ struct BindgenOptions {
     /// Whitelisted variables. See docs for `whitelisted_types` for more.
     whitelisted_vars: RegexSet,
 
-    /// The default type of code to generate for enums
-    default_enum_variant: codegen::EnumVariation,
+    /// The default style of code to generate for enums
+    default_enum_style: codegen::EnumVariation,
 
     /// The enum patterns to mark an enum as bitfield.
     bitfield_enums: RegexSet,
@@ -1478,7 +1477,7 @@ impl Default for BindgenOptions {
             whitelisted_types: Default::default(),
             whitelisted_functions: Default::default(),
             whitelisted_vars: Default::default(),
-            default_enum_variant: Default::default(),
+            default_enum_style: Default::default(),
             bitfield_enums: Default::default(),
             rustified_enums: Default::default(),
             constified_enum_modules: Default::default(),
diff --git a/src/options.rs b/src/options.rs
index 9405aff9..97b2556b 100644
--- a/src/options.rs
+++ b/src/options.rs
@@ -26,9 +26,9 @@ where
             Arg::with_name("header")
                 .help("C or C++ header file")
                 .required(true),
-            Arg::with_name("default-enum-variant")
-                .long("default-enum-variant")
-                .help("choose one")
+            Arg::with_name("default-enum-style")
+                .long("default-enum-style")
+                .help("The default style of code used to generate enums.")
                 .value_name("variant")
                 .default_value("consts")
                 .possible_values(&["consts", "moduleconsts", "bitfield", "rust"])
@@ -310,8 +310,8 @@ where
         builder = builder.rust_target(RustTarget::from_str(rust_target)?);
     }
 
-    if let Some(variant) = matches.value_of("default-enum-variant") {
-        builder = builder.default_enum_variant(EnumVariation::from_str(variant)?)
+    if let Some(variant) = matches.value_of("default-enum-style") {
+        builder = builder.default_enum_style(EnumVariation::from_str(variant)?)
     }
 
     if let Some(bitfields) = matches.values_of("bitfield-enum") {
diff --git a/tests/headers/enum-default-bitfield.h b/tests/headers/enum-default-bitfield.h
index a73f2838..be284132 100644
--- a/tests/headers/enum-default-bitfield.h
+++ b/tests/headers/enum-default-bitfield.h
@@ -1,4 +1,4 @@
-// bindgen-flags: --default-enum-variant=bitfield --constified-enum-module=Neg
+// bindgen-flags: --default-enum-style=bitfield --constified-enum-module=Neg
 
 enum Foo {
     Bar = 0,
diff --git a/tests/headers/enum-default-consts.h b/tests/headers/enum-default-consts.h
index 17f0afc4..448c3030 100644
--- a/tests/headers/enum-default-consts.h
+++ b/tests/headers/enum-default-consts.h
@@ -1,4 +1,4 @@
-// bindgen-flags: --default-enum-variant=consts --constified-enum-module=Neg
+// bindgen-flags: --default-enum-style=consts --constified-enum-module=Neg
 
 enum Foo {
     Bar = 0,
diff --git a/tests/headers/enum-default-module.h b/tests/headers/enum-default-module.h
index e586cca2..a2f3d7ad 100644
--- a/tests/headers/enum-default-module.h
+++ b/tests/headers/enum-default-module.h
@@ -1,4 +1,4 @@
-// bindgen-flags: --default-enum-variant=moduleconsts --constified-enum-module=Neg
+// bindgen-flags: --default-enum-style=moduleconsts --constified-enum-module=Neg
 
 enum Foo {
     Bar = 0,
diff --git a/tests/headers/enum-default-rust.h b/tests/headers/enum-default-rust.h
index 797863c3..282c62f3 100644
--- a/tests/headers/enum-default-rust.h
+++ b/tests/headers/enum-default-rust.h
@@ -1,4 +1,4 @@
-// bindgen-flags: --default-enum-variant=rust --constified-enum-module=Neg
+// bindgen-flags: --default-enum-style=rust --constified-enum-module=Neg
 
 enum Foo {
     Bar = 0,