Merge pull request rust-lang#5 from martinboehme/enum-and-typedef-original-name

Emit `bindgen_original_name` attribute also for enums and typedefs

Author: adetaylor

src/codegen/mod.rs

@@ -914,8 +914,16 @@ impl CodeGenerator for Type {
                     return;
                 }
 
+                let mut attributes = Vec::new();
+                if let Some(original_name) = item.original_name(ctx) {
+                    if name != original_name {
+                        attributes.push(attributes::original_name(&original_name));
+                    }
+                }
+
                 tokens.append_all(match alias_style {
                     AliasVariation::TypeAlias => quote! {
+                        #( #attributes )*
                         pub type #rust_name
                     },
                     AliasVariation::NewType | AliasVariation::NewTypeDeref => {
@@ -925,8 +933,7 @@ impl CodeGenerator for Type {
                             alias_style
                         );
 
-                        let mut attributes =
-                            vec![attributes::repr("transparent")];
+                        attributes.push(attributes::repr("transparent"));
                         let derivable_traits = derives_of_item(item, ctx);
                         if !derivable_traits.is_empty() {
                             let derives: Vec<_> = derivable_traits.into();
@@ -2940,6 +2947,12 @@ impl CodeGenerator for Enum {
 
         let mut attrs = vec![];
 
+        if let Some(original_name) = item.original_name(ctx) {
+            if name != original_name {
+                attrs.push(attributes::original_name(&original_name));
+            }
+        }
+
         // TODO(emilio): Delegate this to the builders?
         match variation {
             EnumVariation::Rust { non_exhaustive } => {

tests/expectations/tests/381-decltype-alias.rs

@@ -11,4 +11,5 @@
 pub struct std_allocator_traits {
     pub _address: u8,
 }
+#[bindgen_original_name("allocator_traits::__size_type")]
 pub type std_allocator_traits___size_type<_Alloc> = _Alloc;

tests/expectations/tests/anon_enum_trait.rs

@@ -10,9 +10,13 @@
 pub struct DataType {
     pub _address: u8,
 }
+#[bindgen_original_name("DataType::value_type")]
 pub type DataType_value_type<_Tp> = _Tp;
+#[bindgen_original_name("DataType::work_type")]
 pub type DataType_work_type<_Tp> = DataType_value_type<_Tp>;
+#[bindgen_original_name("DataType::channel_type")]
 pub type DataType_channel_type<_Tp> = DataType_value_type<_Tp>;
+#[bindgen_original_name("DataType::vec_type")]
 pub type DataType_vec_type<_Tp> = DataType_value_type<_Tp>;
 pub const DataType_generic_type: DataType__bindgen_ty_1 =
     DataType__bindgen_ty_1::generic_type;

tests/expectations/tests/anon_union.rs

@@ -17,6 +17,7 @@ impl TErrorResult_UnionState {
         TErrorResult_UnionState::HasMessage;
 }
 #[repr(i32)]
+#[bindgen_original_name("TErrorResult::UnionState")]
 #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum TErrorResult_UnionState {
     HasMessage = 0,

tests/expectations/tests/anon_union_1_0.rs

@@ -59,6 +59,7 @@ pub struct TErrorResult {
 pub const TErrorResult_UnionState_HasException: TErrorResult_UnionState =
     TErrorResult_UnionState::HasMessage;
 #[repr(i32)]
+#[bindgen_original_name("TErrorResult::UnionState")]
 #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum TErrorResult_UnionState {
     HasMessage = 0,

tests/expectations/tests/builtin-template.rs

@@ -5,4 +5,5 @@
     non_upper_case_globals
 )]
 
+#[bindgen_original_name("make_integer_sequence")]
 pub type std_make_integer_sequence = u8;

tests/expectations/tests/call-conv-typedef.rs

@@ -7,6 +7,7 @@
 #![cfg(not(test))]
 
 pub type void_fn = ::std::option::Option<unsafe extern "stdcall" fn()>;
+#[bindgen_original_name("fn")]
 pub type fn_ = ::std::option::Option<
     unsafe extern "stdcall" fn(id: ::std::os::raw::c_int) -> void_fn,
 >;

tests/expectations/tests/class_with_enum.rs

@@ -0,0 +1,29 @@
+#![allow(
+    dead_code,
+    non_snake_case,
+    non_camel_case_types,
+    non_upper_case_globals
+)]
+
+#[repr(C)]
+#[derive(Debug, Default, Copy, Clone)]
+pub struct A {
+    pub _address: u8,
+}
+pub const A_B_B1: A_B = 0;
+pub const A_B_B2: A_B = 1;
+#[bindgen_original_name("A::B")]
+pub type A_B = ::std::os::raw::c_uint;
+#[test]
+fn bindgen_test_layout_A() {
+    assert_eq!(
+        ::std::mem::size_of::<A>(),
+        1usize,
+        concat!("Size of: ", stringify!(A))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<A>(),
+        1usize,
+        concat!("Alignment of ", stringify!(A))
+    );
+}

tests/expectations/tests/class_with_typedef.rs

@@ -15,7 +15,9 @@ pub struct C {
     pub d: AnotherInt,
     pub other_ptr: *mut AnotherInt,
 }
+#[bindgen_original_name("C::MyInt")]
 pub type C_MyInt = ::std::os::raw::c_int;
+#[bindgen_original_name("C::Lookup")]
 pub type C_Lookup = *const ::std::os::raw::c_char;
 #[test]
 fn bindgen_test_layout_C() {

tests/expectations/tests/constify-module-enums-simple-nonamespace.rs

@@ -6,6 +6,7 @@
 )]
 
 pub mod one_Foo {
+    #[bindgen_original_name("Foo")]
     pub type Type = ::std::os::raw::c_int;
     pub const Variant1: Type = 0;
     pub const Variant2: Type = 1;

tests/expectations/tests/constify-module-enums-types.rs

@@ -20,13 +20,15 @@ pub mod anon_enum {
     pub const Variant3: Type = 2;
 }
 pub mod ns1_foo {
+    #[bindgen_original_name("foo")]
     pub type Type = ::std::os::raw::c_uint;
     pub const THIS: Type = 0;
     pub const SHOULD_BE: Type = 1;
     pub const A_CONSTANT: Type = 2;
     pub const ALSO_THIS: Type = 42;
 }
 pub mod ns2_Foo {
+    #[bindgen_original_name("Foo")]
     pub type Type = ::std::os::raw::c_int;
     pub const Variant1: Type = 0;
     pub const Variant2: Type = 1;
@@ -205,6 +207,7 @@ impl Default for Baz {
     }
 }
 pub mod one_Foo {
+    #[bindgen_original_name("Foo")]
     pub type Type = ::std::os::raw::c_int;
     pub const Variant1: Type = 0;
     pub const Variant2: Type = 1;

tests/expectations/tests/derive-debug-function-pointer.rs

@@ -11,6 +11,7 @@ pub struct Nice {
     pub pointer: Nice_Function,
     pub large_array: [::std::os::raw::c_int; 34usize],
 }
+#[bindgen_original_name("Nice::Function")]
 pub type Nice_Function =
     ::std::option::Option<unsafe extern "C" fn(data: ::std::os::raw::c_int)>;
 #[test]

tests/expectations/tests/elaborated.rs

@@ -5,6 +5,7 @@
     non_upper_case_globals
 )]
 
+#[bindgen_original_name("whatever_t")]
 pub type whatever_whatever_t = ::std::os::raw::c_int;
 extern "C" {
     #[link_name = "\u{1}_Z9somethingPKi"]

tests/expectations/tests/enum_in_template.rs

@@ -12,4 +12,5 @@ pub struct Foo {
 }
 pub const Foo_Bar_A: Foo_Bar = 0;
 pub const Foo_Bar_B: Foo_Bar = 0;
+#[bindgen_original_name("Foo::Bar")]
 pub type Foo_Bar = i32;

tests/expectations/tests/enum_in_template_with_typedef.rs

@@ -11,11 +11,13 @@
 pub struct std_fbstring_core {
     pub _address: u8,
 }
+#[bindgen_original_name("fbstring_core::category_type")]
 pub type std_fbstring_core_category_type = u8;
 impl std_fbstring_core_Category {
     pub const Bar: std_fbstring_core_Category = std_fbstring_core_Category::Foo;
 }
 #[repr(u8)]
+#[bindgen_original_name("fbstring_core::Category")]
 #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum std_fbstring_core_Category {
     Foo = 0,

tests/expectations/tests/eval-value-dependent.rs

@@ -10,4 +10,5 @@
 pub struct e {
     pub _address: u8,
 }
+#[bindgen_original_name("e::f")]
 pub type e_f<d> = d;

tests/expectations/tests/in_class_typedef.rs

@@ -10,7 +10,9 @@
 pub struct Foo {
     pub _address: u8,
 }
+#[bindgen_original_name("Foo::elem_type")]
 pub type Foo_elem_type<T> = T;
+#[bindgen_original_name("Foo::ptr_type")]
 pub type Foo_ptr_type<T> = *mut T;
 #[repr(C)]
 #[derive(Debug, Default, Copy, Clone)]

tests/expectations/tests/issue-1113-template-references.rs

@@ -23,6 +23,7 @@ impl<K, V> Default for Entry<K, V> {
 pub struct nsBaseHashtable {
     pub _address: u8,
 }
+#[bindgen_original_name("nsBaseHashtable::EntryType")]
 pub type nsBaseHashtable_EntryType<K, V> = Entry<K, V>;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]

tests/expectations/tests/issue-1382-rust-primitive-types.rs

@@ -5,13 +5,21 @@
     non_upper_case_globals
 )]
 
+#[bindgen_original_name("i8")]
 pub type i8_ = i8;
+#[bindgen_original_name("u8")]
 pub type u8_ = u8;
+#[bindgen_original_name("i16")]
 pub type i16_ = i16;
+#[bindgen_original_name("u16")]
 pub type u16_ = u16;
+#[bindgen_original_name("i32")]
 pub type i32_ = i32;
+#[bindgen_original_name("u32")]
 pub type u32_ = u32;
+#[bindgen_original_name("i64")]
 pub type i64_ = i64;
+#[bindgen_original_name("u64")]
 pub type u64_ = u64;
 #[repr(C)]
 #[derive(Debug, Default, Copy, Clone)]

tests/expectations/tests/issue-493.rs

@@ -53,8 +53,11 @@ impl<T> ::std::cmp::Eq for __BindgenUnionField<T> {}
 pub struct basic_string {
     pub _address: u8,
 }
+#[bindgen_original_name("basic_string::size_type")]
 pub type basic_string_size_type = ::std::os::raw::c_ulonglong;
+#[bindgen_original_name("basic_string::value_type")]
 pub type basic_string_value_type = ::std::os::raw::c_char;
+#[bindgen_original_name("basic_string::pointer")]
 pub type basic_string_pointer = *mut basic_string_value_type;
 #[repr(C)]
 #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]

tests/expectations/tests/issue-493_1_0.rs

@@ -53,8 +53,11 @@ impl<T> ::std::cmp::Eq for __BindgenUnionField<T> {}
 pub struct basic_string {
     pub _address: u8,
 }
+#[bindgen_original_name("basic_string::size_type")]
 pub type basic_string_size_type = ::std::os::raw::c_ulonglong;
+#[bindgen_original_name("basic_string::value_type")]
 pub type basic_string_value_type = ::std::os::raw::c_char;
+#[bindgen_original_name("basic_string::pointer")]
 pub type basic_string_pointer = *mut basic_string_value_type;
 #[repr(C)]
 #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]

tests/expectations/tests/issue-544-stylo-creduce-2.rs

@@ -9,7 +9,9 @@
 pub struct Foo {
     pub member: Foo_SecondAlias,
 }
+#[bindgen_original_name("Foo::FirstAlias")]
 pub type Foo_FirstAlias = [u8; 0usize];
+#[bindgen_original_name("Foo::SecondAlias")]
 pub type Foo_SecondAlias = [u8; 0usize];
 impl Default for Foo {
     fn default() -> Self {

tests/expectations/tests/issue-569-non-type-template-params-causing-layout-test-failures.rs

@@ -13,6 +13,7 @@ pub enum _bindgen_ty_1 {
     ENUM_VARIANT_1 = 0,
     ENUM_VARIANT_2 = 1,
 }
+#[bindgen_original_name("Alias")]
 pub type JS_Alias = u8;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]

tests/expectations/tests/issue-584-stylo-template-analysis-panic.rs

@@ -12,6 +12,7 @@ pub type RefPtr<T> = T;
 pub struct A {
     pub _address: u8,
 }
+#[bindgen_original_name("A::a")]
 pub type A_a = b;
 #[test]
 fn bindgen_test_layout_A() {

tests/expectations/tests/issue-638-stylo-cannot-find-T-in-this-scope.rs

@@ -22,6 +22,7 @@ pub struct UsesRefPtrWithAliasedTypeParam<U> {
     pub member: RefPtr<UsesRefPtrWithAliasedTypeParam_V<U>>,
     pub _phantom_0: ::std::marker::PhantomData<::std::cell::UnsafeCell<U>>,
 }
+#[bindgen_original_name("UsesRefPtrWithAliasedTypeParam::V")]
 pub type UsesRefPtrWithAliasedTypeParam_V<U> = U;
 impl<U> Default for UsesRefPtrWithAliasedTypeParam<U> {
     fn default() -> Self {

tests/expectations/tests/issue-645-cannot-find-type-T-in-this-scope.rs

@@ -13,6 +13,7 @@ pub struct HasRefPtr<T> {
     pub refptr_member: RefPtr<HasRefPtr_TypedefOfT<T>>,
     pub _phantom_0: ::std::marker::PhantomData<::std::cell::UnsafeCell<T>>,
 }
+#[bindgen_original_name("HasRefPtr::TypedefOfT")]
 pub type HasRefPtr_TypedefOfT<T> = T;
 impl<T> Default for HasRefPtr<T> {
     fn default() -> Self {

tests/expectations/tests/issue-674-1.rs

@@ -17,6 +17,7 @@ pub mod root {
         pub struct Maybe {
             pub _address: u8,
         }
+        #[bindgen_original_name("Maybe::ValueType")]
         pub type Maybe_ValueType<T> = T;
     }
     #[repr(C)]

tests/expectations/tests/issue-674-2.rs

@@ -17,6 +17,7 @@ pub mod root {
         pub struct Rooted {
             pub _address: u8,
         }
+        #[bindgen_original_name("Rooted::ElementType")]
         pub type Rooted_ElementType<T> = T;
     }
     #[repr(C)]

tests/expectations/tests/issue-674-3.rs

@@ -14,6 +14,7 @@ pub mod root {
     pub struct nsRefPtrHashtable {
         pub _address: u8,
     }
+    #[bindgen_original_name("nsRefPtrHashtable::UserDataType")]
     pub type nsRefPtrHashtable_UserDataType<PtrType> = *mut PtrType;
     #[repr(C)]
     #[derive(Debug, Default, Copy, Clone)]

tests/expectations/tests/issue-820-unused-template-param-in-alias.rs

@@ -5,4 +5,5 @@
     non_upper_case_globals
 )]
 
+#[bindgen_original_name("Foo::self_type")]
 pub type Foo_self_type = u8;

tests/expectations/tests/libclang-9/issue-769-bad-instantiation-test.rs

@@ -20,6 +20,7 @@ pub mod root {
             unsafe { ::std::mem::zeroed() }
         }
     }
+    #[bindgen_original_name("AutoValueVector::Alias")]
     pub type AutoValueVector_Alias = ::std::os::raw::c_int;
     #[test]
     fn __bindgen_test_layout_Rooted_open0_int_close0_instantiation() {

tests/expectations/tests/nsBaseHashtable.rs

@@ -21,8 +21,10 @@ pub struct nsTHashtable {
 pub struct nsBaseHashtable {
     pub _address: u8,
 }
+#[bindgen_original_name("nsBaseHashtable::KeyType")]
 pub type nsBaseHashtable_KeyType = [u8; 0usize];
 #[bindgen_unused_template_param]
+#[bindgen_original_name("nsBaseHashtable::EntryType")]
 pub type nsBaseHashtable_EntryType = nsBaseHashtableET;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]

tests/expectations/tests/nsStyleAutoArray.rs

@@ -24,6 +24,7 @@ pub struct nsStyleAutoArray<T> {
     pub _phantom_0: ::std::marker::PhantomData<::std::cell::UnsafeCell<T>>,
 }
 #[repr(i32)]
+#[bindgen_original_name("nsStyleAutoArray::WithSingleInitialElement")]
 #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum nsStyleAutoArray_WithSingleInitialElement {
     WITH_SINGLE_INITIAL_ELEMENT = 0,

tests/expectations/tests/replace_template_alias.rs

@@ -8,6 +8,7 @@
 /// But the replacement type does use T!
 ///
 /// <div rustbindgen replaces="JS::detail::MaybeWrapped" />
+#[bindgen_original_name("MaybeWrapped")]
 pub type JS_detail_MaybeWrapped<T> = T;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]

tests/expectations/tests/replaces_double.rs

@@ -17,6 +17,7 @@ impl<T> Default for Wrapper_Wrapped<T> {
         unsafe { ::std::mem::zeroed() }
     }
 }
+#[bindgen_original_name("Wrapper::Type")]
 pub type Wrapper_Type<T> = Wrapper_Wrapped<T>;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -25,6 +26,7 @@ pub struct Rooted<T> {
     pub _phantom_0: ::std::marker::PhantomData<::std::cell::UnsafeCell<T>>,
 }
 /// <div rustbindgen replaces="Rooted_MaybeWrapped"></div>
+#[bindgen_original_name("Rooted::Rooted_MaybeWrapped")]
 pub type Rooted_MaybeWrapped<T> = T;
 impl<T> Default for Rooted<T> {
     fn default() -> Self {

tests/expectations/tests/struct_with_typedef_template_arg.rs

@@ -10,5 +10,6 @@
 pub struct Proxy {
     pub _address: u8,
 }
+#[bindgen_original_name("Proxy::foo")]
 pub type Proxy_foo<T> =
     ::std::option::Option<unsafe extern "C" fn(bar: *mut T)>;