diff options
| author | Emilio Cobos Álvarez <emilio@crisal.io> | 2021-12-21 13:04:59 +0100 |
|---|---|---|
| committer | Emilio Cobos Álvarez <emilio@crisal.io> | 2021-12-29 20:20:19 +0100 |
| commit | ada0ac52107451a50f377fee04002db24e0ce02c (patch) | |
| tree | c907cd4bc2ea2afd4adc67ee6e915e7cbde53c83 | |
| parent | bcbd72d7f89a1fdfae59fad8db47ca4892d9c940 (diff) | |
codegen: Don't automatically derive Debug and Copy for non-rust enums.
Fixes #2143
| -rw-r--r-- | src/codegen/mod.rs | 11 | ||||
| -rw-r--r-- | tests/expectations/tests/enum-no-debug-rust.rs | 8 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs index 19886e3d..bee299ed 100644 --- a/src/codegen/mod.rs +++ b/src/codegen/mod.rs @@ -3005,14 +3005,9 @@ impl CodeGenerator for Enum { if !variation.is_const() { let mut derives = derives_of_item(item, ctx); - // For backwards compat, enums always derive Debug/Clone/Eq/PartialEq/Hash, even - // if we don't generate those by default. - if !item.annotations().disallow_debug() { - derives.insert(DerivableTraits::DEBUG); - } - if !item.annotations().disallow_copy() { - derives.insert(DerivableTraits::COPY); - } + // For backwards compat, enums always derive + // Clone/Eq/PartialEq/Hash, even if we don't generate those by + // default. derives.insert( DerivableTraits::CLONE | DerivableTraits::HASH | diff --git a/tests/expectations/tests/enum-no-debug-rust.rs b/tests/expectations/tests/enum-no-debug-rust.rs index fa06fbc0..dbcbd052 100644 --- a/tests/expectations/tests/enum-no-debug-rust.rs +++ b/tests/expectations/tests/enum-no-debug-rust.rs @@ -13,7 +13,7 @@ pub struct foo { pub const foo_FOO_A: foo__bindgen_ty_1 = foo__bindgen_ty_1::FOO_A; pub const foo_FOO_B: foo__bindgen_ty_1 = foo__bindgen_ty_1::FOO_B; #[repr(u32)] -#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] +#[derive(Copy, Clone, Hash, PartialEq, Eq)] pub enum foo__bindgen_ty_1 { FOO_A = 0, FOO_B = 1, @@ -51,7 +51,7 @@ impl Default for foo { } } #[repr(u32)] -#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] +#[derive(Copy, Clone, Hash, PartialEq, Eq)] pub enum Foo { Bar = 0, Qux = 1, @@ -70,8 +70,8 @@ pub enum NoDebug { } #[repr(u32)] /// <div rustbindgen derive="Debug"></div> -#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] +#[derive(Copy, Clone, Hash, PartialEq, Eq, Debug)] pub enum Debug { Debug1 = 0, Debug2 = 1, -}
\ No newline at end of file +} |