fix test

Author: nunoplopes

tests/unit/inline_container_fields.cpp

@@ -1,6 +1,5 @@
 #include <array>
 #include <cassert>
-#include <string>
 #include <vector>
 
 // Arrays and vectors in fields are stored inline in their structs, including
@@ -16,7 +15,6 @@ struct State {
   int count;
   int grid[2][3];
   std::array<int, 3> arr;
-  std::string name;
   std::vector<Elem> elems;
   std::vector<std::vector<int>> rows;
 };
@@ -46,7 +44,7 @@ int main() {
   State s{};
   fill(&s);
   assert(s.grid[1][2] == 5 && sum(s.grid[1], 3) == 12);
-  assert(s.arr[1] == 7 && s.name.empty());
+  assert(s.arr[1] == 7);
 
   // Pointers into containers in elements of a vector field, kept and used
   // while other fields of the struct change.
@@ -71,7 +69,7 @@ int main() {
   t.grid[0][0] = 100;
   t.rows[0][0] = 100;
   assert(s.elems[2].hist[0] == 0 && s.grid[0][0] == 0 && s.rows[0][0] == 1);
-  assert(t.elems[2].coeffs[1] == 7 && t.name.empty());
+  assert(t.elems[2].coeffs[1] == 7);
 
   // Elements of array and vector fields reached through pointers.
   State *p = &t;

tests/unit/out/refcount/inline_container_fields.rs

@@ -30,7 +30,7 @@ impl Default for Elem {
     }
 }
 #[derive(Clone, Record, ByteRepr, VaArg, FnPtrArg)]
-#[byte_size(120)]
+#[byte_size(88)]
 pub struct State {
     #[offset(0)]
     pub count: i32,
@@ -41,12 +41,9 @@ pub struct State {
     #[byte_size(12)]
     pub arr: Vec<i32>,
     #[offset(40)]
-    #[byte_size(32)]
-    pub name: Vec<i8>,
-    #[offset(72)]
     #[byte_size(24)]
     pub elems: Vec<Elem>,
-    #[offset(96)]
+    #[offset(64)]
     #[byte_size(24)]
     pub rows: Vec<Vec<i32>>,
 }
@@ -59,7 +56,6 @@ impl Default for State {
                     .map(|_| (0..3).map(|_| 0_i32).collect::<Box<[i32]>>())
                     .collect::<Box<[Box<[i32]>]>>(),
                 arr: std::array::from_fn::<_, 3, _>(|_| Default::default()).to_vec(),
-                name: vec![0],
                 elems: Default::default(),
                 rows: Default::default(),
             }
@@ -126,9 +122,7 @@ fn main_0() -> i32 {
                 )
             }) == 12)
     );
-    assert!(
-        ((vec_elem!(s.as_pointer(), arr, 1_usize).read()) == 7) && ((*s.borrow()).name.len() <= 1)
-    );
+    assert!(((vec_elem!(s.as_pointer(), arr, 1_usize).read()) == 7));
     let mut e: Ptr<Elem> =
         ((field_ref!(s.as_pointer(), elems).as_pointer() as Ptr<Elem>).offset(2_usize));
     let mut h: Ptr<i32> = (array_field_ptr!(e, hist) as Ptr<i32>);
@@ -197,7 +191,6 @@ fn main_0() -> i32 {
         )
         .read()) as i32)
             == 7)
-            && ((*t.borrow()).name.len() <= 1)
     );
     let mut p: Ptr<State> = (t.as_pointer());
     let __rhs = ({ (*p.upgrade().deref()).grid[(1) as usize][(1) as usize] } + {

tests/unit/out/unsafe/inline_container_fields.rs

@@ -19,7 +19,6 @@ pub struct State {
     pub count: i32,
     pub grid: [[i32; 3]; 2],
     pub arr: Vec<i32>,
-    pub name: Vec<libc::c_char>,
     pub elems: Vec<Elem>,
     pub rows: Vec<Vec<i32>>,
 }
@@ -30,7 +29,6 @@ impl Default for State {
                 count: 0_i32,
                 grid: [[0_i32; 3]; 2],
                 arr: std::array::from_fn::<_, 3, _>(|_| Default::default()).to_vec(),
-                name: vec![0],
                 elems: Default::default(),
                 rows: Default::default(),
             }
@@ -91,7 +89,7 @@ unsafe fn main_0() -> i32 {
         ((s.grid[(1) as usize][(2) as usize]) == (5))
             && ((unsafe { sum_0((s.grid[(1) as usize].as_mut_ptr()).cast_const(), 3,) }) == (12))
     );
-    assert!(((s.arr[(1_usize)]) == (7)) && (s.name.len() <= 1));
+    assert!(((s.arr[(1_usize)]) == (7)));
     let mut e: *mut Elem = (&mut s.elems[(2_usize)] as *mut Elem);
     let mut h: *mut i32 = (*e).hist.as_mut_ptr();
     let mut c: *mut i16 = (&mut (&mut (*e)).coeffs[(1_usize)] as *mut i16);
@@ -125,7 +123,7 @@ unsafe fn main_0() -> i32 {
             && ((s.grid[(0) as usize][(0) as usize]) == (0)))
             && ((s.rows[(0_usize)][(0_usize)]) == (1))
     );
-    assert!(((t.elems[(2_usize)].coeffs[(1_usize)] as i32) == (7)) && (t.name.len() <= 1));
+    assert!(((t.elems[(2_usize)].coeffs[(1_usize)] as i32) == (7)));
     let mut p: *mut State = (&mut t as *mut State);
     (&mut (*p)).elems[(0_usize)].hist[(3) as usize] =
         (((*p).grid[(1) as usize][(1) as usize]) + ((&mut (*p)).arr[(1_usize)]));