1 files changed, 25 insertions, 24 deletions

diff --git a/tests/expectations/class_nested.rs b/tests/expectations/class_nested.rs
index 22e72209..593e156d 100644
--- a/tests/expectations/class_nested.rs
+++ b/tests/expectations/class_nested.rs
@@ -6,53 +6,54 @@
 
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct Struct_A {
+pub struct A {
     pub member_a: ::std::os::raw::c_int,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct Struct_A_B {
+pub struct A_B {
     pub member_b: ::std::os::raw::c_int,
 }
-impl ::std::clone::Clone for Struct_A_B {
+#[test]
+fn bindgen_test_layout_A_B() {
+    assert_eq!(::std::mem::size_of::<A_B>() , 4usize);
+    assert_eq!(::std::mem::align_of::<A_B>() , 4usize);
+}
+impl Clone for A_B {
     fn clone(&self) -> Self { *self }
 }
 #[test]
-fn bindgen_test_layout_Struct_A_B() {
-    assert_eq!(::std::mem::size_of::<Struct_A_B>() , 4usize);
-    assert_eq!(::std::mem::align_of::<Struct_A_B>() , 4usize);
+fn bindgen_test_layout_A() {
+    assert_eq!(::std::mem::size_of::<A>() , 4usize);
+    assert_eq!(::std::mem::align_of::<A>() , 4usize);
 }
-impl ::std::clone::Clone for Struct_A {
+impl Clone for A {
     fn clone(&self) -> Self { *self }
 }
-#[test]
-fn bindgen_test_layout_Struct_A() {
-    assert_eq!(::std::mem::size_of::<Struct_A>() , 4usize);
-    assert_eq!(::std::mem::align_of::<Struct_A>() , 4usize);
+extern "C" {
+    #[link_name = "var"]
+    pub static mut var: A_B;
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct Struct_D {
-    pub member: Struct_A_B,
-}
-impl ::std::clone::Clone for Struct_D {
-    fn clone(&self) -> Self { *self }
+pub struct D {
+    pub member: A_B,
 }
 #[test]
-fn bindgen_test_layout_Struct_D() {
-    assert_eq!(::std::mem::size_of::<Struct_D>() , 4usize);
-    assert_eq!(::std::mem::align_of::<Struct_D>() , 4usize);
+fn bindgen_test_layout_D() {
+    assert_eq!(::std::mem::size_of::<D>() , 4usize);
+    assert_eq!(::std::mem::align_of::<D>() , 4usize);
+}
+impl Clone for D {
+    fn clone(&self) -> Self { *self }
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct Struct_Templated<T> {
+pub struct Templated<T> {
     pub member: T,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct Struct_Templated_Templated_inner<T> {
+pub struct Templated_Templated_inner<T> {
     pub member_ptr: *mut T,
 }
-extern "C" {
-    pub static mut var: Struct_A_B;
-}