fix

Author: nunoplopes

rules/vector/tgt_unsafe.rs

@@ -80,7 +80,8 @@ unsafe fn f13<T1>(a0: &mut Vec<T1>) -> *mut T1 {
     a0.as_mut_ptr()
 }
 unsafe fn f14<T1: Default>(a0: &mut Vec<T1>, a1: &mut T1) {
-    a0.push(std::mem::take(&mut *a1))
+    let __a1 = std::mem::take(&mut *a1);
+    a0.push(__a1)
 }
 unsafe fn f15<T1: Default>(a0: &mut Vec<T1>, a1: usize) {
     let __a0 = a1 as usize;

tests/multi-file/defaulted_move_cross_tu/out/refcount/defaulted_move_cross_tu.rs

@@ -47,25 +47,11 @@ impl Default for S {
         }
     }
 }
-<<<<<<< HEAD
-impl ByteRepr for S {}
-=======
 impl ByteRepr for S {
     fn byte_size() -> usize {
         32
     }
-    fn to_bytes(&self, buf: &mut [u8]) {
-        (*self.v.borrow()).to_bytes(&mut buf[0..24]);
-        (*self.n.borrow()).to_bytes(&mut buf[24..32]);
-    }
-    fn from_bytes(buf: &[u8]) -> Self {
-        Self {
-            v: Rc::new(RefCell::new(<Vec<i32>>::from_bytes(&buf[0..24]))),
-            n: Rc::new(RefCell::new(<Box<[i32]>>::from_bytes(&buf[24..32]))),
-        }
-    }
 }
->>>>>>> 3ed38b58 (Remove Value<> boxing from struct fields)
 pub fn sum_0(s: Ptr<S>) -> i32 {
     return {
         let _lhs = {

tests/multi-file/out_of_line_methods_cross_tu/out/refcount/out_of_line_methods_cross_tu.rs

@@ -12,32 +12,11 @@ pub struct S {
     pub v: i32,
 }
 impl S {}
-<<<<<<< HEAD
-impl Clone for S {
-    fn clone(&self) -> Self {
-        let __this: Value<S> = Rc::new(RefCell::new(Self {
-            v: Rc::new(RefCell::new((*self.v.borrow()))),
-        }));
-        let this: Ptr<S> = __this.as_pointer();
-        Rc::try_unwrap(__this).ok().unwrap().into_inner()
-    }
-}
-impl ByteRepr for S {}
-=======
 impl ByteRepr for S {
     fn byte_size() -> usize {
         4
     }
-    fn to_bytes(&self, buf: &mut [u8]) {
-        self.v.to_bytes(&mut buf[0..4]);
-    }
-    fn from_bytes(buf: &[u8]) -> Self {
-        Self {
-            v: <i32>::from_bytes(&buf[0..4]),
-        }
-    }
 }
->>>>>>> 3ed38b58 (Remove Value<> boxing from struct fields)
 pub trait Base {
     fn apply(&mut self, x: i32) -> i32;
 }
@@ -56,23 +35,11 @@ impl Clone for Derived {
         Rc::try_unwrap(__this).ok().unwrap().into_inner()
     }
 }
-<<<<<<< HEAD
-impl ByteRepr for Derived {}
-=======
 impl ByteRepr for Derived {
     fn byte_size() -> usize {
         16
     }
-    fn to_bytes(&self, buf: &mut [u8]) {
-        self.factor.to_bytes(&mut buf[8..12]);
-    }
-    fn from_bytes(buf: &[u8]) -> Self {
-        Self {
-            factor: <i32>::from_bytes(&buf[8..12]),
-        }
-    }
 }
->>>>>>> 3ed38b58 (Remove Value<> boxing from struct fields)
 pub fn main() {
     __cpp2rust_init_globals();
     std::process::exit(main_0());

tests/unit/container_field_addr.cpp

@@ -1,4 +1,3 @@
-// panic: refcount
 #include <cassert>
 #include <map>
 #include <string>

tests/unit/field_pointers_malloced_struct.cpp

@@ -1,4 +1,3 @@
-// panic: refcount
 #include <cassert>
 #include <cstdlib>
 

tests/unit/first_field_ptr_covers_struct.c

@@ -1,4 +1,3 @@
-// panic: refcount
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>

tests/unit/first_member_downcast.c

@@ -1,4 +1,3 @@
-// panic: refcount
 #include <assert.h>
 #include <stdlib.h>
 

tests/unit/memset_struct_tail.c

@@ -1,4 +1,3 @@
-// panic: refcount
 #include <assert.h>
 #include <stddef.h>
 #include <stdlib.h>

tests/unit/out/refcount/array_of_noncopy_struct.rs

@@ -29,25 +29,11 @@ impl Default for NonCopy {
         }
     }
 }
-<<<<<<< HEAD
-impl ByteRepr for NonCopy {}
-=======
 impl ByteRepr for NonCopy {
     fn byte_size() -> usize {
         32
     }
-    fn to_bytes(&self, buf: &mut [u8]) {
-        (*self.data.borrow()).to_bytes(&mut buf[0..24]);
-        self.tag.to_bytes(&mut buf[24..28]);
-    }
-    fn from_bytes(buf: &[u8]) -> Self {
-        Self {
-            data: Rc::new(RefCell::new(<Vec<i32>>::from_bytes(&buf[0..24]))),
-            tag: <i32>::from_bytes(&buf[24..28]),
-        }
-    }
 }
->>>>>>> 3ed38b58 (Remove Value<> boxing from struct fields)
 pub fn main() {
     __cpp2rust_init_globals();
     std::process::exit(main_0());
@@ -59,7 +45,10 @@ fn main_0() -> i32 {
             .collect::<Box<[NonCopy]>>(),
     ));
     (*arr.borrow_mut())[(0) as usize].tag = 7;
-    (*{ (*arr.borrow())[(1) as usize].data.clone() }.borrow_mut()).push(42);
+    {
+        let __a1 = 42;
+        (*{ (*arr.borrow())[(1) as usize].data.clone() }.borrow_mut()).push(__a1)
+    };
     assert!(({ (*arr.borrow())[(0) as usize].tag } == 7));
     assert!(((*{ (*arr.borrow())[(1) as usize].data.clone() }.borrow()).len() == 1_usize));
     assert!(

tests/unit/out/refcount/auto.rs

@@ -15,8 +15,14 @@ fn main_0() -> i32 {
     let x2: Value<i16> = Rc::new(RefCell::new(2_i16));
     let x3: Value<u32> = Rc::new(RefCell::new(4_u32));
     let v: Value<Vec<i32>> = Rc::new(RefCell::new(Vec::new()));
-    (*v.borrow_mut()).push(1);
-    (*v.borrow_mut()).push(2);
+    {
+        let __a1 = 1;
+        (*v.borrow_mut()).push(__a1)
+    };
+    {
+        let __a1 = 2;
+        (*v.borrow_mut()).push(__a1)
+    };
     let sum: Value<i32> = Rc::new(RefCell::new(0));
     'loop_: for mut elem in v.as_pointer() as Ptr<i32> {
         let elem: Value<i32> = Rc::new(RefCell::new(elem.read()));