fix test

Author: nunoplopes

tests/unit/container_element_receiver.cpp

@@ -7,7 +7,6 @@
 struct Holder {
   std::vector<int> &ref;
   std::vector<int> vec;
-  std::string str;
 };
 
 std::vector<int> &pick(std::vector<int> &a, std::vector<int> &b, bool first) {
@@ -24,7 +23,7 @@ int sum(const std::vector<int> &v) {
 
 int main() {
   std::vector<int> v = {1, 2, 3};
-  Holder h{v, {4, 5}, "abc"};
+  Holder h{v, {4, 5}};
 
   // Through a reference field, a field, and a pointer.
   assert(*h.ref.data() == 1);
@@ -34,7 +33,6 @@ int main() {
   assert(h.vec.back() == 5);
   std::vector<int> *p = &h.vec;
   assert(*p->data() == 4);
-  assert(strlen(h.str.c_str()) == 3);
 
   // Through a call that returns a reference, and a map element.
   pick(v, h.vec, false).front() = 7;

tests/unit/out/refcount/container_element_receiver.rs

@@ -6,29 +6,15 @@ use std::io::prelude::*;
 use std::io::{Read, Seek, Write};
 use std::os::fd::AsFd;
 use std::rc::{Rc, Weak};
-#[derive(Clone, Record, ByteRepr, VaArg, FnPtrArg)]
-#[byte_size(64)]
+#[derive(Clone, Record, ByteRepr, VaArg, FnPtrArg, Default)]
+#[byte_size(32)]
 pub struct Holder {
     #[offset(0)]
     #[byte_size(8)]
     pub ref_: Ptr<Vec<i32>>,
     #[offset(8)]
     #[byte_size(24)]
     pub vec_: Vec<i32>,
-    #[offset(32)]
-    #[byte_size(32)]
-    pub str: Vec<i8>,
-}
-impl Default for Holder {
-    fn default() -> Self {
-        {
-            Holder {
-                ref_: <Ptr<Vec<i32>>>::default(),
-                vec_: Default::default(),
-                str: vec![0],
-            }
-        }
-    }
 }
 pub fn pick_0(a: Ptr<Vec<i32>>, b: Ptr<Vec<i32>>, mut first: bool) -> Ptr<Vec<i32>> {
     return if first { (a).clone() } else { (b).clone() };
@@ -61,11 +47,6 @@ fn main_0() -> i32 {
     let h: Value<Holder> = Rc::new(RefCell::new(Holder {
         ref_: v.as_pointer(),
         vec_: Vec::from([4, 5]),
-        str: {
-            let mut __bytes = Ptr::<i8>::from_string_literal(b"abc").to_c_bytes();
-            __bytes.push(0);
-            __bytes
-        },
     }));
     assert!((({ (*h.borrow()).ref_.clone() }.decay().read()) == 1));
     { (*h.borrow()).ref_.clone() }.decay().write(9);
@@ -74,13 +55,6 @@ fn main_0() -> i32 {
     assert!(((field_ref!(h.as_pointer(), vec_).decay().to_last().read()) == 5));
     let mut p: Ptr<Vec<i32>> = (field_ref!(h.as_pointer(), vec_).as_pointer());
     assert!(((p.decay().read()) == 4));
-    assert!(
-        (field_ref!(h.as_pointer(), str)
-            .decay()
-            .to_c_string_iterator()
-            .count()
-            == 3_usize)
-    );
     ({
         pick_0(
             v.as_pointer(),

tests/unit/out/unsafe/container_element_receiver.rs

@@ -7,22 +7,10 @@ use std::io::{Read, Seek, Write};
 use std::os::fd::{AsFd, FromRawFd, IntoRawFd};
 use std::rc::Rc;
 #[repr(C)]
-#[derive(Clone, VaArg, FnPtrArg)]
+#[derive(Clone, VaArg, FnPtrArg, Default)]
 pub struct Holder {
     pub ref_: *mut Vec<i32>,
     pub vec_: Vec<i32>,
-    pub str: Vec<libc::c_char>,
-}
-impl Default for Holder {
-    fn default() -> Self {
-        unsafe {
-            Holder {
-                ref_: <*mut Vec<i32>>::default(),
-                vec_: Default::default(),
-                str: vec![0],
-            }
-        }
-    }
 }
 pub unsafe fn pick_0(a: *mut Vec<i32>, b: *mut Vec<i32>, mut first: bool) -> *mut Vec<i32> {
     return if first { (a) } else { (b) };
@@ -55,11 +43,6 @@ unsafe fn main_0() -> i32 {
     let mut h: Holder = Holder {
         ref_: &mut v,
         vec_: Vec::from([4, 5]),
-        str: {
-            let s = c"abc".as_ptr();
-            std::slice::from_raw_parts(s, (0..).take_while(|&i| *s.add(i) != 0).count() + 1)
-                .to_vec()
-        },
     };
     assert!(((*(*h.ref_).as_mut_ptr()) == (1)));
     (*((*h.ref_).first_mut().unwrap())) = 9;
@@ -68,7 +51,6 @@ unsafe fn main_0() -> i32 {
     assert!(((*((h.vec_).last_mut().unwrap())) == (5)));
     let mut p: *mut Vec<i32> = (&mut h.vec_ as *mut Vec<i32>);
     assert!(((*(*p).as_mut_ptr()) == (4)));
-    assert!(((libc::strlen(h.str.as_ptr())) == (3_usize)));
     (*((*(unsafe { pick_0(&mut v, &mut h.vec_, false) }))
         .first_mut()
         .unwrap())) = 7;