Skip to content

Commit 5d4e52d

Browse files
committed
Update tests without Copy/Clone/Eq*/Ord* derives for opaque types
1 parent e838f14 commit 5d4e52d

19 files changed

+18
-21
lines changed

tests/expectations/tests/annotation_hide.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/// <div rustbindgen opaque></div>
1111
#[repr(C)]
1212
#[repr(align(4))]
13-
#[derive(Debug, Default, Copy, Clone)]
13+
#[derive(Debug, Default)]
1414
pub struct D {
1515
pub _bindgen_opaque_blob: u32,
1616
}

tests/expectations/tests/bitfield_large_overflow.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#[repr(C)]
1111
#[repr(align(8))]
12-
#[derive(Debug, Default, Copy, Clone)]
12+
#[derive(Debug, Default)]
1313
pub struct _bindgen_ty_1 {
1414
pub _bindgen_opaque_blob: [u64; 10usize],
1515
}

tests/expectations/tests/doggo-or-null.rs

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ fn bindgen_test_layout_Null() {
5656
/// this test to make sure that opaque unions don't derive and still compile.
5757
#[repr(C)]
5858
#[repr(align(4))]
59-
#[derive(Copy, Clone)]
6059
pub union DoggoOrNull {
6160
pub _bindgen_opaque_blob: u32,
6261
}

tests/expectations/tests/empty-union.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
)]
99

1010
#[repr(C)]
11-
#[derive(Copy, Clone)]
1211
pub union a__bindgen_ty_1 {
1312
pub _address: u8,
1413
}

tests/expectations/tests/forward_declared_opaque.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@
88
)]
99

1010
#[repr(C)]
11-
#[derive(Copy, Clone)]
1211
pub struct a {
1312
_unused: [u8; 0],
1413
}
1514
#[repr(C)]
16-
#[derive(Debug, Default, Copy, Clone)]
15+
#[derive(Debug, Default)]
1716
pub struct b {
1817
_unused: [u8; 0],
1918
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub mod root {
1515
#[allow(unused_imports)]
1616
use self::super::super::root;
1717
#[repr(C)]
18-
#[derive(Debug, Default, Copy, Clone)]
18+
#[derive(Debug, Default)]
1919
pub struct Maybe {
2020
pub _address: u8,
2121
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub mod root {
1515
#[allow(unused_imports)]
1616
use self::super::super::root;
1717
#[repr(C)]
18-
#[derive(Debug, Default, Copy, Clone)]
18+
#[derive(Debug, Default)]
1919
pub struct Rooted {
2020
pub _address: u8,
2121
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub mod root {
1212
#[allow(unused_imports)]
1313
use self::super::root;
1414
#[repr(C)]
15-
#[derive(Debug, Default, Copy, Clone)]
15+
#[derive(Debug, Default)]
1616
pub struct nsRefPtrHashtable {
1717
pub _address: u8,
1818
}

tests/expectations/tests/issue-801-opaque-sloppiness.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub struct A {
1414
}
1515
#[repr(C)]
1616
#[repr(align(1))]
17-
#[derive(Debug, Default, Copy, Clone, Hash, PartialEq, Eq)]
17+
#[derive(Debug, Default)]
1818
pub struct B {
1919
pub _bindgen_opaque_blob: u8,
2020
}

tests/expectations/tests/issue-807-opaque-types-methods-being-generated.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ fn bindgen_test_layout_SuchWow() {
6363
}
6464
#[repr(C)]
6565
#[repr(align(1))]
66-
#[derive(Debug, Default, Copy, Clone, Hash, PartialEq, Eq)]
66+
#[derive(Debug, Default)]
6767
pub struct Opaque {
6868
pub _bindgen_opaque_blob: u8,
6969
}

tests/expectations/tests/no-hash-opaque.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#[repr(C)]
1111
#[repr(align(4))]
12-
#[derive(Debug, Default, Copy, Clone)]
12+
#[derive(Debug, Default)]
1313
pub struct NoHash {
1414
pub _bindgen_opaque_blob: u32,
1515
}

tests/expectations/tests/no-partialeq-opaque.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#[repr(C)]
1111
#[repr(align(4))]
12-
#[derive(Debug, Default, Copy, Clone)]
12+
#[derive(Debug, Default)]
1313
pub struct NoPartialEq {
1414
pub _bindgen_opaque_blob: u32,
1515
}

tests/expectations/tests/opaque-template-inst-member-2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/// This is like `opaque-template-inst-member.hpp` except exercising the cases
1111
/// where we are OK to derive Debug/Hash/PartialEq.
1212
#[repr(C)]
13-
#[derive(Debug, Default, Copy, Clone, Hash, PartialEq, Eq)]
13+
#[derive(Debug, Default)]
1414
pub struct OpaqueTemplate {
1515
pub _address: u8,
1616
}

tests/expectations/tests/opaque-template-inst-member.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
)]
99

1010
#[repr(C)]
11-
#[derive(Debug, Default, Copy, Clone, Hash, PartialEq, Eq)]
11+
#[derive(Debug, Default)]
1212
pub struct OpaqueTemplate {
1313
pub _address: u8,
1414
}

tests/expectations/tests/opaque-tracing.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ extern "C" {
1313
}
1414
#[repr(C)]
1515
#[repr(align(4))]
16-
#[derive(Debug, Default, Copy, Clone, Hash, PartialEq, Eq)]
16+
#[derive(Debug, Default)]
1717
pub struct Container {
1818
pub _bindgen_opaque_blob: [u32; 2usize],
1919
}

tests/expectations/tests/opaque_in_struct.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/// <div rustbindgen opaque>
1111
#[repr(C)]
1212
#[repr(align(4))]
13-
#[derive(Debug, Default, Copy, Clone, Hash, PartialEq, Eq)]
13+
#[derive(Debug, Default)]
1414
pub struct opaque {
1515
pub _bindgen_opaque_blob: u32,
1616
}

tests/expectations/tests/opaque_pointer.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/// <div rustbindgen opaque></div>
1111
#[repr(C)]
1212
#[repr(align(4))]
13-
#[derive(Debug, Default, Copy, Clone, Hash, PartialEq, Eq)]
13+
#[derive(Debug, Default)]
1414
pub struct OtherOpaque {
1515
pub _bindgen_opaque_blob: u32,
1616
}
@@ -29,7 +29,7 @@ fn bindgen_test_layout_OtherOpaque() {
2929
}
3030
/// <div rustbindgen opaque></div>
3131
#[repr(C)]
32-
#[derive(Debug, Default, Copy, Clone, Hash, PartialEq, Eq)]
32+
#[derive(Debug, Default)]
3333
pub struct Opaque {
3434
pub _address: u8,
3535
}

tests/expectations/tests/template.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ impl Default for PODButContainsDtor {
358358
}
359359
/// <div rustbindgen opaque>
360360
#[repr(C)]
361-
#[derive(Debug, Default, Copy, Clone, Hash, PartialEq, Eq)]
361+
#[derive(Debug, Default)]
362362
pub struct Opaque {
363363
pub _address: u8,
364364
}

tests/expectations/tests/templatized-bitfield.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/// be, so we cannot allocate bitfield units. The best thing we can do is make
1212
/// the struct opaque.
1313
#[repr(C)]
14-
#[derive(Debug, Default, Copy, Clone)]
14+
#[derive(Debug, Default)]
1515
pub struct TemplatizedBitfield {
1616
pub _address: u8,
1717
}

0 commit comments

Comments
 (0)