Make bindgen generate enums as constants by default

Also simplifies the logic that determines which enum variation gets chosen.

46 files changed, 51 insertions, 34 deletions

diff --git a/tests/headers/anon_enum.hpp b/tests/headers/anon_enum.hpp
index 3e8ff3d4..23dc5ceb 100644
--- a/tests/headers/anon_enum.hpp
+++ b/tests/headers/anon_enum.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq
+// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
 struct Test {
   int foo;
   float bar;
diff --git a/tests/headers/anon_enum_trait.hpp b/tests/headers/anon_enum_trait.hpp
index 865411e2..6383c748 100644
--- a/tests/headers/anon_enum_trait.hpp
+++ b/tests/headers/anon_enum_trait.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq
+// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
 
 template<typename _Tp>
 class DataType {
diff --git a/tests/headers/anon_enum_whitelist.h b/tests/headers/anon_enum_whitelist.h
index 15cda6b1..fc4810e0 100644
--- a/tests/headers/anon_enum_whitelist.h
+++ b/tests/headers/anon_enum_whitelist.h
@@ -1,4 +1,4 @@
-// bindgen-flags: --whitelist-var NODE_.*
+// bindgen-flags: --whitelist-var NODE_.* --rustified-enum .*
 
 enum {
   NODE_FLAG_FOO,
diff --git a/tests/headers/anon_union.hpp b/tests/headers/anon_union.hpp
index 8e649abb..19c478d1 100644
--- a/tests/headers/anon_union.hpp
+++ b/tests/headers/anon_union.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq
+// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
 template<typename T>
 struct TErrorResult {
   enum UnionState {
diff --git a/tests/headers/anon_union_1_0.hpp b/tests/headers/anon_union_1_0.hpp
index 699efa32..314215bf 100644
--- a/tests/headers/anon_union_1_0.hpp
+++ b/tests/headers/anon_union_1_0.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq
+// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
 
 template<typename T>
 struct TErrorResult {
diff --git a/tests/headers/bitfield-enum-basic.hpp b/tests/headers/bitfield-enum-basic.hpp
index 364bebf2..c03f0e70 100644
--- a/tests/headers/bitfield-enum-basic.hpp
+++ b/tests/headers/bitfield-enum-basic.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --bitfield-enum "Foo|Buz|NS_.*|DUMMY_.*" -- -std=c++11
+// bindgen-flags: --bitfield-enum "Foo|Buz|NS_.*|DUMMY_.*" --rustified-enum .* -- -std=c++11
 
 enum Foo {
   Bar = 1 << 1,
diff --git a/tests/headers/bitfield_align_2.h b/tests/headers/bitfield_align_2.h
index c6e5e5e7..31d37f76 100644
--- a/tests/headers/bitfield_align_2.h
+++ b/tests/headers/bitfield_align_2.h
@@ -1,4 +1,4 @@
-
+// bindgen-flags: --rustified-enum .*
 enum MyEnum {
     ONE,
     TWO,
diff --git a/tests/headers/class_with_inner_struct.hpp b/tests/headers/class_with_inner_struct.hpp
index 3cb6cfed..66c2bd3f 100644
--- a/tests/headers/class_with_inner_struct.hpp
+++ b/tests/headers/class_with_inner_struct.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq
+// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
 // bindgen-flags: -- -std=c++11
 
 class A {
diff --git a/tests/headers/class_with_inner_struct_1_0.hpp b/tests/headers/class_with_inner_struct_1_0.hpp
index 0bb8a57f..1bae249f 100644
--- a/tests/headers/class_with_inner_struct_1_0.hpp
+++ b/tests/headers/class_with_inner_struct_1_0.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --rust-target 1.0  --with-derive-hash --with-derive-partialeq --with-derive-eq
+// bindgen-flags: --rust-target 1.0  --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
 // bindgen-flags: -- -std=c++11
 
 class A {
diff --git a/tests/headers/const_enum_unnamed.hpp b/tests/headers/const_enum_unnamed.hpp
index eb139434..bdd9700f 100644
--- a/tests/headers/const_enum_unnamed.hpp
+++ b/tests/headers/const_enum_unnamed.hpp
@@ -1,3 +1,4 @@
+// bindgen-flags: --rustified-enum .*
 
 enum {
   FOO_BAR,
diff --git a/tests/headers/constant-evaluate.h b/tests/headers/constant-evaluate.h
index f9f1fa66..ee9cfaa5 100644
--- a/tests/headers/constant-evaluate.h
+++ b/tests/headers/constant-evaluate.h
@@ -1,4 +1,5 @@
 // bindgen-unstable
+// bindgen-flags: --rustified-enum .*
 
 enum {
   foo = 4,
diff --git a/tests/headers/constify-all-enums.h b/tests/headers/constify-all-enums.h
index 7138bf20..6f4364e3 100644
--- a/tests/headers/constify-all-enums.h
+++ b/tests/headers/constify-all-enums.h
@@ -1,4 +1,3 @@
-// bindgen-flags: --constified-enum foo
 
 enum foo {
   THIS,
diff --git a/tests/headers/constify-enum.h b/tests/headers/constify-enum.h
index a5b4052c..9a9058d3 100644
--- a/tests/headers/constify-enum.h
+++ b/tests/headers/constify-enum.h
@@ -1,3 +1,4 @@
+// bindgen-flags: --rustified-enum .*
 
 enum nsCSSPropertyID {
   eCSSProperty_a,
diff --git a/tests/headers/enum.h b/tests/headers/enum.h
index f2d301e7..38ce4eee 100644
--- a/tests/headers/enum.h
+++ b/tests/headers/enum.h
@@ -1,3 +1,5 @@
+// bindgen-flags: --rustified-enum .*
+
 enum Foo {
     Bar = 0,
     Qux
diff --git a/tests/headers/enum_alias.hpp b/tests/headers/enum_alias.hpp
index 658f8fde..c3ecc351 100644
--- a/tests/headers/enum_alias.hpp
+++ b/tests/headers/enum_alias.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: -- -std=c++11
+// bindgen-flags: --rustified-enum .* -- -std=c++11
 
 typedef unsigned char uint8_t;
 
diff --git a/tests/headers/enum_and_vtable_mangling.hpp b/tests/headers/enum_and_vtable_mangling.hpp
index 4c7f4d2b..e332fc57 100644
--- a/tests/headers/enum_and_vtable_mangling.hpp
+++ b/tests/headers/enum_and_vtable_mangling.hpp
@@ -1,3 +1,4 @@
+// bindgen-flags: --rustified-enum .*
 
 enum {
     match,
diff --git a/tests/headers/enum_dupe.h b/tests/headers/enum_dupe.h
index 6d3591d5..826568fb 100644
--- a/tests/headers/enum_dupe.h
+++ b/tests/headers/enum_dupe.h
@@ -1,3 +1,5 @@
+// bindgen-flags: --rustified-enum .*
+
 enum Foo {
     Bar = 1,
     Dupe = 1
diff --git a/tests/headers/enum_explicit_type.hpp b/tests/headers/enum_explicit_type.hpp
index b2a4307e..e611de74 100644
--- a/tests/headers/enum_explicit_type.hpp
+++ b/tests/headers/enum_explicit_type.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: -- -std=c++11
+// bindgen-flags: --rustified-enum .* -- -std=c++11
 
 enum Foo: unsigned char {
     Bar = 0,
diff --git a/tests/headers/enum_in_template_with_typedef.hpp b/tests/headers/enum_in_template_with_typedef.hpp
index ac19b781..244d916c 100644
--- a/tests/headers/enum_in_template_with_typedef.hpp
+++ b/tests/headers/enum_in_template_with_typedef.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: -- -std=c++11
+// bindgen-flags: --rustified-enum .* -- -std=c++11
 
 namespace std {
   template <typename Char> class fbstring_core;
diff --git a/tests/headers/enum_negative.h b/tests/headers/enum_negative.h
index 6cbdfe04..267f799f 100644
--- a/tests/headers/enum_negative.h
+++ b/tests/headers/enum_negative.h
@@ -1,3 +1,5 @@
+// bindgen-flags: --rustified-enum .*
+
 enum Foo {
     Bar = -2,
     Qux = 1,
diff --git a/tests/headers/enum_packed.h b/tests/headers/enum_packed.h
index 8654d110..1c89b992 100644
--- a/tests/headers/enum_packed.h
+++ b/tests/headers/enum_packed.h
@@ -1,3 +1,5 @@
+// bindgen-flags: --rustified-enum .*
+
 enum __attribute__((packed)) Foo {
     Bar = 0,
     Qux
diff --git a/tests/headers/forward-enum-decl.hpp b/tests/headers/forward-enum-decl.hpp
index 2c4316c6..a3df8584 100644
--- a/tests/headers/forward-enum-decl.hpp
+++ b/tests/headers/forward-enum-decl.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: -- -std=c++11
+// bindgen-flags: --rustified-enum .* -- -std=c++11
 
 enum class CSSPseudoClassType : int;
 
diff --git a/tests/headers/func_ptr_in_struct.h b/tests/headers/func_ptr_in_struct.h
index 24e1f44f..dd608549 100644
--- a/tests/headers/func_ptr_in_struct.h
+++ b/tests/headers/func_ptr_in_struct.h
@@ -1,4 +1,4 @@
-// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq
+// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
 //
 enum baz;
 
diff --git a/tests/headers/issue-372.hpp b/tests/headers/issue-372.hpp
index a072f061..de144776 100644
--- a/tests/headers/issue-372.hpp
+++ b/tests/headers/issue-372.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --enable-cxx-namespaces
+// bindgen-flags: --enable-cxx-namespaces --rustified-enum .*
 template <typename a, int b> class c { a e[b]; };
 class d;
 template <typename g, g f> class C { c<d, f> h; };
diff --git a/tests/headers/issue-410.hpp b/tests/headers/issue-410.hpp
index a7a834cf..c91c83d1 100644
--- a/tests/headers/issue-410.hpp
+++ b/tests/headers/issue-410.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --enable-cxx-namespaces --whitelist-type JS::Value
+// bindgen-flags: --enable-cxx-namespaces --whitelist-type JS::Value --rustified-enum .*
 
 namespace JS {
 class Value;
diff --git a/tests/headers/issue-493.hpp b/tests/headers/issue-493.hpp
index 5d4cb4b8..280b8736 100644
--- a/tests/headers/issue-493.hpp
+++ b/tests/headers/issue-493.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq
+// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
 template<class _CharT, class _Traits, class _Allocator>
 class basic_string
 {
diff --git a/tests/headers/issue-493_1_0.hpp b/tests/headers/issue-493_1_0.hpp
index 4e383be3..7406d893 100644
--- a/tests/headers/issue-493_1_0.hpp
+++ b/tests/headers/issue-493_1_0.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq
+// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
 
 template<class _CharT, class _Traits, class _Allocator>
 class basic_string
diff --git a/tests/headers/issue-569-non-type-template-params-causing-layout-test-failures.hpp b/tests/headers/issue-569-non-type-template-params-causing-layout-test-failures.hpp
index 7f8c2d8a..964b69cb 100644
--- a/tests/headers/issue-569-non-type-template-params-causing-layout-test-failures.hpp
+++ b/tests/headers/issue-569-non-type-template-params-causing-layout-test-failures.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: -- -std=c++14
+// bindgen-flags: --rustified-enum .* -- -std=c++14
 
 // Generated by C-Reduce, cleaned up and given names for readability.
 
diff --git a/tests/headers/issue-888-enum-var-decl-jump.hpp b/tests/headers/issue-888-enum-var-decl-jump.hpp
index d7f31b3e..d7182c3c 100644
--- a/tests/headers/issue-888-enum-var-decl-jump.hpp
+++ b/tests/headers/issue-888-enum-var-decl-jump.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --enable-cxx-namespaces
+// bindgen-flags: --enable-cxx-namespaces --rustified-enum .*
 
 namespace Halide {
 struct Type;
diff --git a/tests/headers/jsval_layout_opaque.hpp b/tests/headers/jsval_layout_opaque.hpp
index 09b5bebe..7a1957cf 100644
--- a/tests/headers/jsval_layout_opaque.hpp
+++ b/tests/headers/jsval_layout_opaque.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq
+// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
 // bindgen-flags: -- -std=c++11
 
 /**
diff --git a/tests/headers/jsval_layout_opaque_1_0.hpp b/tests/headers/jsval_layout_opaque_1_0.hpp
index 61eefe1e..dcf6274d 100644
--- a/tests/headers/jsval_layout_opaque_1_0.hpp
+++ b/tests/headers/jsval_layout_opaque_1_0.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq
+// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
 // bindgen-flags: -- -std=c++11
 
 /**
diff --git a/tests/headers/layout_array_too_long.h b/tests/headers/layout_array_too_long.h
index 5240f040..a3ef3d20 100644
--- a/tests/headers/layout_array_too_long.h
+++ b/tests/headers/layout_array_too_long.h
@@ -1,4 +1,4 @@
-// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq
+// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
 typedef unsigned char uint8_t;
 typedef unsigned short uint16_t;
 typedef unsigned int uint32_t;
diff --git a/tests/headers/layout_cmdline_token.h b/tests/headers/layout_cmdline_token.h
index 34ebd017..68dd53b8 100644
--- a/tests/headers/layout_cmdline_token.h
+++ b/tests/headers/layout_cmdline_token.h
@@ -1,3 +1,4 @@
+// bindgen-flags: --rustified-enum .*
 
 /**
  * Stores a pointer to the ops struct, and the offset: the place to
diff --git a/tests/headers/layout_eth_conf.h b/tests/headers/layout_eth_conf.h
index 637b5696..71a430bf 100644
--- a/tests/headers/layout_eth_conf.h
+++ b/tests/headers/layout_eth_conf.h
@@ -1,4 +1,4 @@
-// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq
+// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
 typedef unsigned char uint8_t;
 typedef unsigned short uint16_t;
 typedef unsigned int uint32_t;
diff --git a/tests/headers/layout_eth_conf_1_0.h b/tests/headers/layout_eth_conf_1_0.h
index 285c8c7a..cf6fa6ad 100644
--- a/tests/headers/layout_eth_conf_1_0.h
+++ b/tests/headers/layout_eth_conf_1_0.h
@@ -1,4 +1,4 @@
-// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq
+// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
 
 typedef unsigned char uint8_t;
 typedef unsigned short uint16_t;
diff --git a/tests/headers/layout_large_align_field.h b/tests/headers/layout_large_align_field.h
index f4f412c6..5e87c2a1 100644
--- a/tests/headers/layout_large_align_field.h
+++ b/tests/headers/layout_large_align_field.h
@@ -1,3 +1,5 @@
+// bindgen-flags: --rustified-enum .*
+
 typedef unsigned char uint8_t;
 typedef unsigned short uint16_t;
 typedef unsigned int uint32_t;
diff --git a/tests/headers/no-recursive-whitelisting.h b/tests/headers/no-recursive-whitelisting.h
index 1d805d93..8eb8afea 100644
--- a/tests/headers/no-recursive-whitelisting.h
+++ b/tests/headers/no-recursive-whitelisting.h
@@ -1,4 +1,4 @@
-// bindgen-flags: --no-recursive-whitelist --whitelist-type "Foo" --raw-line "pub enum Bar {}"
+// bindgen-flags: --no-recursive-whitelist --whitelist-type "Foo" --raw-line "pub enum Bar {}" --rustified-enum .*
 
 struct Bar;
 
diff --git a/tests/headers/no-std.h b/tests/headers/no-std.h
index 7bee9657..9248cc3d 100644
--- a/tests/headers/no-std.h
+++ b/tests/headers/no-std.h
@@ -1,4 +1,4 @@
-// bindgen-flags: --ctypes-prefix "libc" --use-core --raw-line "#![no_std]" --raw-line "mod libc { pub type c_int = i32; pub enum c_void {} }"
+// bindgen-flags: --ctypes-prefix "libc" --use-core --raw-line "#![no_std]" --raw-line "mod libc { pub type c_int = i32; pub enum c_void {} }" --rustified-enum .*
 struct foo {
   int a, b;
   void* bar;
diff --git a/tests/headers/nsStyleAutoArray.hpp b/tests/headers/nsStyleAutoArray.hpp
index 950152c0..2a0bc216 100644
--- a/tests/headers/nsStyleAutoArray.hpp
+++ b/tests/headers/nsStyleAutoArray.hpp
@@ -1,3 +1,4 @@
+// bindgen-flags: --rustified-enum .*
 
 template<typename T>
 class nsTArray {
diff --git a/tests/headers/overflowed_enum.hpp b/tests/headers/overflowed_enum.hpp
index 1f2075a5..53a05ddf 100644
--- a/tests/headers/overflowed_enum.hpp
+++ b/tests/headers/overflowed_enum.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: -- -std=c++11 -Wno-narrowing
+// bindgen-flags: --rustified-enum .* -- -std=c++11 -Wno-narrowing
 
 enum Foo {
     BAP_ARM = 0x93fcb9,
diff --git a/tests/headers/prepend-enum-constified-variant.h b/tests/headers/prepend-enum-constified-variant.h
index aa526ffb..06ae264f 100644
--- a/tests/headers/prepend-enum-constified-variant.h
+++ b/tests/headers/prepend-enum-constified-variant.h
@@ -1,4 +1,4 @@
-// bindgen-flags: --no-prepend-enum-name
+// bindgen-flags: --no-prepend-enum-name --rustified-enum .*
 
 enum AVCodecID {
   AV_CODEC_ID_FIRST_UNKNOWN = 0x18000,
diff --git a/tests/headers/prepend_enum_name.hpp b/tests/headers/prepend_enum_name.hpp
index df4ecf1f..e7660369 100644
--- a/tests/headers/prepend_enum_name.hpp
+++ b/tests/headers/prepend_enum_name.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --constified-enum foo --no-prepend-enum-name
+// bindgen-flags: --no-prepend-enum-name
 
 enum foo {
 	FOO_BAR,
diff --git a/tests/headers/short-enums.hpp b/tests/headers/short-enums.hpp
index 484c84af..0b517d6f 100644
--- a/tests/headers/short-enums.hpp
+++ b/tests/headers/short-enums.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: -- -std=c++11 -fshort-enums
+// bindgen-flags: --rustified-enum .* -- -std=c++11 -fshort-enums
 
 typedef enum {
     SOME_VALUE = 0x1,
diff --git a/tests/headers/struct_typedef.h b/tests/headers/struct_typedef.h
index de861c5f..e996b28f 100644
--- a/tests/headers/struct_typedef.h
+++ b/tests/headers/struct_typedef.h
@@ -1,4 +1,4 @@
-// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq
+// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
 //
 typedef struct {
     _Bool has_name;
diff --git a/tests/headers/struct_typedef_ns.hpp b/tests/headers/struct_typedef_ns.hpp
index 07ecc160..a5a8f9a6 100644
--- a/tests/headers/struct_typedef_ns.hpp
+++ b/tests/headers/struct_typedef_ns.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --enable-cxx-namespaces
+// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --enable-cxx-namespaces --rustified-enum .*
 
 namespace whatever {
     typedef struct {
diff --git a/tests/headers/weird_bitfields.hpp b/tests/headers/weird_bitfields.hpp
index 68cbf4a5..7236d60a 100644
--- a/tests/headers/weird_bitfields.hpp
+++ b/tests/headers/weird_bitfields.hpp
@@ -1,3 +1,5 @@
+// bindgen-flags: --rustified-enum .*
+
 // You can guess where this is taken from...
 enum nsStyleSVGOpacitySource {
   eStyleSVGOpacitySource_Normal,