Move `__bindgen_anon_` to constant `DEFAULT_ANON_FIELDS_PREFIX`

2 files changed, 10 insertions, 5 deletions

diff --git a/src/lib.rs b/src/lib.rs
index e492efc4..9bbefaad 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -94,6 +94,9 @@ type HashMap<K, V> = ::rustc_hash::FxHashMap<K, V>;
 type HashSet<K> = ::rustc_hash::FxHashSet<K>;
 pub(crate) use std::collections::hash_map::Entry;
 
+/// Default prefix for the anon fields.
+pub const DEFAULT_ANON_FIELDS_PREFIX: &'static str = "__bindgen_anon_";
+
 fn args_are_cpp(clang_args: &[String]) -> bool {
     return clang_args
         .windows(2)
@@ -385,8 +388,10 @@ impl Builder {
             output_vector.push(prefix.clone());
         }
 
-        output_vector.push("--anon-fields-prefix".into());
-        output_vector.push(self.options.anon_fields_prefix.clone());
+        if self.options.anon_fields_prefix != DEFAULT_ANON_FIELDS_PREFIX {
+            output_vector.push("--anon-fields-prefix".into());
+            output_vector.push(self.options.anon_fields_prefix.clone());
+        }
 
         if self.options.emit_ast {
             output_vector.push("--emit-clang-ast".into());
@@ -1821,7 +1826,7 @@ impl Default for BindgenOptions {
             disable_header_comment: false,
             use_core: false,
             ctypes_prefix: None,
-            anon_fields_prefix: "__bindgen_anon_".into(),
+            anon_fields_prefix: DEFAULT_ANON_FIELDS_PREFIX.into(),
             namespaced_constants: true,
             msvc_mangling: false,
             convert_floats: true,
diff --git a/src/options.rs b/src/options.rs
index 4844b91a..1ba349a9 100644
--- a/src/options.rs
+++ b/src/options.rs
@@ -1,6 +1,6 @@
 use bindgen::{
     builder, AliasVariation, Builder, CodegenConfig, EnumVariation, RustTarget,
-    RUST_TARGET_STRINGS,
+    DEFAULT_ANON_FIELDS_PREFIX, RUST_TARGET_STRINGS,
 };
 use clap::{App, Arg};
 use std::fs::File;
@@ -238,7 +238,7 @@ where
                 .long("anon-fields-prefix")
                 .help("Use the given prefix for the anon fields.")
                 .value_name("prefix")
-                .default_value("__bindgen_anon_")
+                .default_value(DEFAULT_ANON_FIELDS_PREFIX)
                 .takes_value(true),
             Arg::with_name("time-phases")
                 .long("time-phases")