1 files changed, 29 insertions, 22 deletions

diff --git a/tests/expectations/nested.rs b/tests/expectations/nested.rs
index 2f7fae9a..fdd435aa 100644
--- a/tests/expectations/nested.rs
+++ b/tests/expectations/nested.rs
@@ -6,47 +6,54 @@
 
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct Struct_Calc {
+pub struct Calc {
     pub w: ::std::os::raw::c_int,
 }
-impl ::std::clone::Clone for Struct_Calc {
-    fn clone(&self) -> Self { *self }
-}
 #[test]
-fn bindgen_test_layout_Struct_Calc() {
-    assert_eq!(::std::mem::size_of::<Struct_Calc>() , 4usize);
-    assert_eq!(::std::mem::align_of::<Struct_Calc>() , 4usize);
+fn bindgen_test_layout_Calc() {
+    assert_eq!(::std::mem::size_of::<Calc>() , 4usize);
+    assert_eq!(::std::mem::align_of::<Calc>() , 4usize);
+}
+impl Clone for Calc {
+    fn clone(&self) -> Self { *self }
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct Struct_Test;
+pub struct Test {
+    pub _address: u8,
+}
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct Struct_Test_Size {
-    pub mWidth: Struct_Test_Size_Dimension,
-    pub mHeight: Struct_Test_Size_Dimension,
+pub struct Test_Size {
+    pub mWidth: Test_Size_Dimension,
+    pub mHeight: Test_Size_Dimension,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct Struct_Test_Size_Dimension {
-    pub _base: Struct_Calc,
+pub struct Test_Size_Dimension {
+    pub _base: Calc,
+}
+#[test]
+fn bindgen_test_layout_Test_Size_Dimension() {
+    assert_eq!(::std::mem::size_of::<Test_Size_Dimension>() , 4usize);
+    assert_eq!(::std::mem::align_of::<Test_Size_Dimension>() , 4usize);
 }
-impl ::std::clone::Clone for Struct_Test_Size_Dimension {
+impl Clone for Test_Size_Dimension {
     fn clone(&self) -> Self { *self }
 }
 #[test]
-fn bindgen_test_layout_Struct_Test_Size_Dimension() {
-    assert_eq!(::std::mem::size_of::<Struct_Test_Size_Dimension>() , 4usize);
-    assert_eq!(::std::mem::align_of::<Struct_Test_Size_Dimension>() , 4usize);
+fn bindgen_test_layout_Test_Size() {
+    assert_eq!(::std::mem::size_of::<Test_Size>() , 8usize);
+    assert_eq!(::std::mem::align_of::<Test_Size>() , 4usize);
 }
-impl ::std::clone::Clone for Struct_Test_Size {
+impl Clone for Test_Size {
     fn clone(&self) -> Self { *self }
 }
 #[test]
-fn bindgen_test_layout_Struct_Test_Size() {
-    assert_eq!(::std::mem::size_of::<Struct_Test_Size>() , 8usize);
-    assert_eq!(::std::mem::align_of::<Struct_Test_Size>() , 4usize);
+fn bindgen_test_layout_Test() {
+    assert_eq!(::std::mem::size_of::<Test>() , 1usize);
+    assert_eq!(::std::mem::align_of::<Test>() , 1usize);
 }
-impl ::std::clone::Clone for Struct_Test {
+impl Clone for Test {
     fn clone(&self) -> Self { *self }
 }