fix layout output

Author: anderslanglands

asttoc/src/cppmm_ast_write_rustsys.cpp

@@ -221,6 +221,21 @@ impl Default for {} {{
 }}
 )",
                   node_record->name, node_record->size / 8);
+
+        out.print(R"(
+impl {0} {{
+    pub fn layout() -> std::alloc::Layout {{
+        unsafe {{
+            std::alloc::Layout::from_size_align(
+                {1}_sizeof(),
+                {1}_alignof(),
+            ).unwrap()
+        }}
+    }}
+}}
+)",
+                  node_record->name, pystring::slice(node_record->name, 0, -2));
+
     } else { // BindType::ValueType
         out.print("#[repr(C, align({}))]\n", node_record->align / 8);
         out.print("#[derive(Clone)]\n");

test/dtor/ref/dtor-sys/src/std_string.rs

@@ -17,6 +17,17 @@ impl Default for std____cxx11__basic_string_char__t {
     }
 }
 
+impl std____cxx11__basic_string_char__t {
+    pub fn layout() -> std::alloc::Layout {
+        unsafe {
+            std::alloc::Layout::from_size_align(
+                std____cxx11__basic_string_char__sizeof(),
+                std____cxx11__basic_string_char__alignof(),
+            ).unwrap()
+        }
+    }
+}
+
 
 
 extern "C" {

test/exceptions/ref/exceptions-sys/src/c_ex.rs

@@ -17,6 +17,17 @@ impl Default for ex__Struct_t {
     }
 }
 
+impl ex__Struct_t {
+    pub fn layout() -> std::alloc::Layout {
+        unsafe {
+            std::alloc::Layout::from_size_align(
+                ex__Struct_sizeof(),
+                ex__Struct_alignof(),
+            ).unwrap()
+        }
+    }
+}
+
 
 
 extern "C" {

test/std/ref/std-sys/src/std_set.rs

@@ -21,6 +21,17 @@ impl Default for std__set_std__string__t {
     }
 }
 
+impl std__set_std__string__t {
+    pub fn layout() -> std::alloc::Layout {
+        unsafe {
+            std::alloc::Layout::from_size_align(
+                std__set_std__string__sizeof(),
+                std__set_std__string__alignof(),
+            ).unwrap()
+        }
+    }
+}
+
 #[repr(C, align(8))]
 #[derive(Clone)]
 pub struct std___Rb_tree_const_iterator_std____cxx11__basic_string_char___t {

test/std/ref/std-sys/src/std_string.rs

@@ -17,6 +17,17 @@ impl Default for std____cxx11__basic_string_char__t {
     }
 }
 
+impl std____cxx11__basic_string_char__t {
+    pub fn layout() -> std::alloc::Layout {
+        unsafe {
+            std::alloc::Layout::from_size_align(
+                std____cxx11__basic_string_char__sizeof(),
+                std____cxx11__basic_string_char__alignof(),
+            ).unwrap()
+        }
+    }
+}
+
 #[repr(C, align(8))]
 #[derive(Clone)]
 pub struct std__vector_std__string__t {
@@ -29,6 +40,17 @@ impl Default for std__vector_std__string__t {
     }
 }
 
+impl std__vector_std__string__t {
+    pub fn layout() -> std::alloc::Layout {
+        unsafe {
+            std::alloc::Layout::from_size_align(
+                std__vector_std__string__sizeof(),
+                std__vector_std__string__alignof(),
+            ).unwrap()
+        }
+    }
+}
+
 
 
 extern "C" {

test/std/ref/std-sys/src/test.rs

@@ -1,7 +1,12 @@
-// Empty dummy test file for automated testing. This will be replaced by a 
-// file copied in from the test suite
+use crate::*;
 
 #[test]
 fn it_works() {
-    assert!(true, "It works!");
-}
+    let lay = std_string_t::layout();
+    assert_eq!(lay.size(), std::mem::size_of::<std_string_t>());
+    assert_eq!(lay.align(), std::mem::align_of::<std_string_t>());
+
+    let lay = std_vector_string_t::layout();
+    assert_eq!(lay.size(), std::mem::size_of::<std_vector_string_t>());
+    assert_eq!(lay.align(), std::mem::align_of::<std_vector_string_t>());
+}

test/std/test.rs

@@ -0,0 +1,12 @@
+use crate::*;
+
+#[test]
+fn it_works() {
+    let lay = std_string_t::layout();
+    assert_eq!(lay.size(), std::mem::size_of::<std_string_t>());
+    assert_eq!(lay.align(), std::mem::align_of::<std_string_t>());
+
+    let lay = std_vector_string_t::layout();
+    assert_eq!(lay.size(), std::mem::size_of::<std_vector_string_t>());
+    assert_eq!(lay.align(), std::mem::align_of::<std_vector_string_t>());
+}