1 files changed, 17 insertions, 17 deletions
diff --git a/tests/expectations/mutable.rs b/tests/expectations/mutable.rs
index cf2c5937..0d0d6ea3 100644
--- a/tests/expectations/mutable.rs
+++ b/tests/expectations/mutable.rs
@@ -6,37 +6,37 @@
 
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct Struct_C {
+pub struct C {
     pub m_member: ::std::os::raw::c_int,
     pub m_other: ::std::os::raw::c_int,
 }
-impl ::std::clone::Clone for Struct_C {
-    fn clone(&self) -> Self { *self }
-}
 #[test]
-fn bindgen_test_layout_Struct_C() {
-    assert_eq!(::std::mem::size_of::<Struct_C>() , 8usize);
-    assert_eq!(::std::mem::align_of::<Struct_C>() , 4usize);
+fn bindgen_test_layout_C() {
+    assert_eq!(::std::mem::size_of::<C>() , 8usize);
+    assert_eq!(::std::mem::align_of::<C>() , 4usize);
+}
+impl Clone for C {
+    fn clone(&self) -> Self { *self }
 }
 #[repr(C)]
 #[derive(Debug)]
-pub struct Struct_NonCopiable {
-    pub m_member: ::std::cell::Cell<::std::os::raw::c_int>,
+pub struct NonCopiable {
+    pub m_member: ::std::os::raw::c_int,
 }
 #[test]
-fn bindgen_test_layout_Struct_NonCopiable() {
-    assert_eq!(::std::mem::size_of::<Struct_NonCopiable>() , 4usize);
-    assert_eq!(::std::mem::align_of::<Struct_NonCopiable>() , 4usize);
+fn bindgen_test_layout_NonCopiable() {
+    assert_eq!(::std::mem::size_of::<NonCopiable>() , 4usize);
+    assert_eq!(::std::mem::align_of::<NonCopiable>() , 4usize);
 }
 #[repr(C)]
 #[derive(Debug)]
-pub struct Struct_NonCopiableWithNonCopiableMutableMember {
-    pub m_member: ::std::cell::UnsafeCell<Struct_NonCopiable>,
+pub struct NonCopiableWithNonCopiableMutableMember {
+    pub m_member: NonCopiable,
 }
 #[test]
-fn bindgen_test_layout_Struct_NonCopiableWithNonCopiableMutableMember() {
-    assert_eq!(::std::mem::size_of::<Struct_NonCopiableWithNonCopiableMutableMember>()
+fn bindgen_test_layout_NonCopiableWithNonCopiableMutableMember() {
+    assert_eq!(::std::mem::size_of::<NonCopiableWithNonCopiableMutableMember>()
                , 4usize);
-    assert_eq!(::std::mem::align_of::<Struct_NonCopiableWithNonCopiableMutableMember>()
+    assert_eq!(::std::mem::align_of::<NonCopiableWithNonCopiableMutableMember>()
                , 4usize);
 }