diff options
-rw-r--r-- | src/codegen/mod.rs | 6 | ||||
-rw-r--r-- | tests/expectations/tests/enum_and_vtable_mangling.rs | 1 | ||||
-rw-r--r-- | tests/expectations/tests/nested_vtable.rs | 1 | ||||
-rw-r--r-- | tests/expectations/tests/ref_argument_array.rs | 1 | ||||
-rw-r--r-- | tests/expectations/tests/virtual_dtor.rs | 1 | ||||
-rw-r--r-- | tests/expectations/tests/virtual_inheritance.rs | 2 | ||||
-rw-r--r-- | tests/expectations/tests/virtual_overloaded.rs | 1 | ||||
-rw-r--r-- | tests/expectations/tests/vtable_recursive_sig.rs | 1 |
8 files changed, 1 insertions, 13 deletions
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs index 7db083e7..577b8aab 100644 --- a/src/codegen/mod.rs +++ b/src/codegen/mod.rs @@ -706,11 +706,7 @@ impl<'a> CodeGenerator for Vtable<'a> { assert_eq!(item.id(), self.item_id); // For now, generate an empty struct, later we should generate function // pointers and whatnot. - let mut attributes = vec![attributes::repr("C")]; - - if ctx.options().derive_default { - attributes.push(attributes::derives(&["Default"])) - } + let attributes = vec![attributes::repr("C")]; let vtable = aster::AstBuilder::new() .item() diff --git a/tests/expectations/tests/enum_and_vtable_mangling.rs b/tests/expectations/tests/enum_and_vtable_mangling.rs index 300edd39..f1a58093 100644 --- a/tests/expectations/tests/enum_and_vtable_mangling.rs +++ b/tests/expectations/tests/enum_and_vtable_mangling.rs @@ -10,7 +10,6 @@ pub const whatever_else: _bindgen_ty_1 = _bindgen_ty_1::whatever_else; #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub enum _bindgen_ty_1 { match_ = 0, whatever_else = 1, } #[repr(C)] -#[derive(Default)] pub struct C__bindgen_vtable { } #[repr(C)] diff --git a/tests/expectations/tests/nested_vtable.rs b/tests/expectations/tests/nested_vtable.rs index e16a23d7..62466ee0 100644 --- a/tests/expectations/tests/nested_vtable.rs +++ b/tests/expectations/tests/nested_vtable.rs @@ -5,7 +5,6 @@ #[repr(C)] -#[derive(Default)] pub struct nsISupports__bindgen_vtable { } #[repr(C)] diff --git a/tests/expectations/tests/ref_argument_array.rs b/tests/expectations/tests/ref_argument_array.rs index 714467f6..ac761796 100644 --- a/tests/expectations/tests/ref_argument_array.rs +++ b/tests/expectations/tests/ref_argument_array.rs @@ -6,7 +6,6 @@ pub const NSID_LENGTH: ::std::os::raw::c_uint = 10; #[repr(C)] -#[derive(Default)] pub struct nsID__bindgen_vtable { } #[repr(C)] diff --git a/tests/expectations/tests/virtual_dtor.rs b/tests/expectations/tests/virtual_dtor.rs index 0c410977..9df3c31c 100644 --- a/tests/expectations/tests/virtual_dtor.rs +++ b/tests/expectations/tests/virtual_dtor.rs @@ -5,7 +5,6 @@ #[repr(C)] -#[derive(Default)] pub struct nsSlots__bindgen_vtable { } #[repr(C)] diff --git a/tests/expectations/tests/virtual_inheritance.rs b/tests/expectations/tests/virtual_inheritance.rs index 6896eb31..a09ad567 100644 --- a/tests/expectations/tests/virtual_inheritance.rs +++ b/tests/expectations/tests/virtual_inheritance.rs @@ -25,7 +25,6 @@ impl Clone for A { fn clone(&self) -> Self { *self } } #[repr(C)] -#[derive(Default)] pub struct B__bindgen_vtable { } #[repr(C)] @@ -53,7 +52,6 @@ impl Default for B { fn default() -> Self { unsafe { ::std::mem::zeroed() } } } #[repr(C)] -#[derive(Default)] pub struct C__bindgen_vtable { } #[repr(C)] diff --git a/tests/expectations/tests/virtual_overloaded.rs b/tests/expectations/tests/virtual_overloaded.rs index e7ae9f4a..b10d2adc 100644 --- a/tests/expectations/tests/virtual_overloaded.rs +++ b/tests/expectations/tests/virtual_overloaded.rs @@ -5,7 +5,6 @@ #[repr(C)] -#[derive(Default)] pub struct C__bindgen_vtable { } #[repr(C)] diff --git a/tests/expectations/tests/vtable_recursive_sig.rs b/tests/expectations/tests/vtable_recursive_sig.rs index 716ce39f..18e4f07e 100644 --- a/tests/expectations/tests/vtable_recursive_sig.rs +++ b/tests/expectations/tests/vtable_recursive_sig.rs @@ -23,7 +23,6 @@ impl Default for Derived { fn default() -> Self { unsafe { ::std::mem::zeroed() } } } #[repr(C)] -#[derive(Default)] pub struct Base__bindgen_vtable { } #[repr(C)] |