Update tests

Author: lucic71

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

@@ -6,7 +6,7 @@ use std::io::prelude::*;
 use std::io::{Read, Seek, Write};
 use std::os::fd::AsFd;
 use std::rc::{Rc, Weak};
-#[derive(Default)]
+#[derive()]
 pub struct S_int_ {
     pub x: Value<i32>,
 }
@@ -19,6 +19,13 @@ impl Clone for S_int_ {
         Rc::try_unwrap(__this).ok().unwrap().into_inner()
     }
 }
+impl Default for S_int_ {
+    fn default() -> Self {
+        S_int_ {
+            x: Rc::new(RefCell::new(0)),
+        }
+    }
+}
 impl ByteRepr for S_int_ {
     fn byte_size() -> usize {
         4

tests/multi-file/template_method_late_instantiation/out/unsafe/template_method_late_instantiation.rs

@@ -7,7 +7,7 @@ use std::io::{Read, Seek, Write};
 use std::os::fd::{AsFd, FromRawFd, IntoRawFd};
 use std::rc::Rc;
 #[repr(C)]
-#[derive(Copy, Clone, Default)]
+#[derive(Copy, Clone)]
 pub struct S_int_ {
     pub x: i32,
 }
@@ -16,6 +16,11 @@ impl S_int_ {
         self.x = v;
     }
 }
+impl Default for S_int_ {
+    fn default() -> Self {
+        S_int_ { x: 0 }
+    }
+}
 pub fn main() {
     unsafe {
         __cpp2rust_init_globals();

tests/unit/out/refcount/10_struct.rs

@@ -66,7 +66,7 @@ impl ByteRepr for Graph {
         }
     }
 }
-#[derive(Default)]
+#[derive()]
 pub struct Partial {
     pub p: Value<Ptr<i32>>,
 }
@@ -89,6 +89,13 @@ impl Clone for Partial {
         Rc::try_unwrap(__this).ok().unwrap().into_inner()
     }
 }
+impl Default for Partial {
+    fn default() -> Self {
+        Partial {
+            p: Rc::new(RefCell::new(Ptr::<i32>::null())),
+        }
+    }
+}
 impl ByteRepr for Partial {
     fn byte_size() -> usize {
         8

tests/unit/out/refcount/array_of_noncopy_struct.rs

@@ -13,11 +13,12 @@ pub struct NonCopy {
 }
 impl Clone for NonCopy {
     fn clone(&self) -> Self {
-        let mut this = Self {
+        let __this: Value<NonCopy> = Rc::new(RefCell::new(Self {
             data: Rc::new(RefCell::new((*self.data.borrow()).clone())),
             tag: Rc::new(RefCell::new((*self.tag.borrow()))),
-        };
-        this
+        }));
+        let this: Ptr<NonCopy> = __this.as_pointer();
+        Rc::try_unwrap(__this).ok().unwrap().into_inner()
     }
 }
 impl Default for NonCopy {
@@ -44,6 +45,7 @@ impl ByteRepr for NonCopy {
     }
 }
 pub fn main() {
+    __cpp2rust_init_globals();
     std::process::exit(main_0());
 }
 fn main_0() -> i32 {
@@ -66,3 +68,4 @@ fn main_0() -> i32 {
     assert!(((*(*arr.borrow())[(2) as usize].data.borrow()).len() == 0_usize));
     return 0;
 }
+pub fn __cpp2rust_init_globals() {}

tests/unit/out/refcount/in_class_field_initializer.rs

@@ -13,11 +13,12 @@ pub struct Inner {
 }
 impl Clone for Inner {
     fn clone(&self) -> Self {
-        let mut this = Self {
+        let __this: Value<Inner> = Rc::new(RefCell::new(Self {
             x: Rc::new(RefCell::new((*self.x.borrow()))),
             y: Rc::new(RefCell::new((*self.y.borrow()))),
-        };
-        this
+        }));
+        let this: Ptr<Inner> = __this.as_pointer();
+        Rc::try_unwrap(__this).ok().unwrap().into_inner()
     }
 }
 impl Default for Inner {
@@ -52,13 +53,14 @@ pub struct S {
 }
 impl Clone for S {
     fn clone(&self) -> Self {
-        let mut this = Self {
+        let __this: Value<S> = Rc::new(RefCell::new(Self {
             a: Rc::new(RefCell::new((*self.a.borrow()))),
             b: Rc::new(RefCell::new((*self.b.borrow()))),
             c: Rc::new(RefCell::new((*self.c.borrow()).clone())),
             d: Rc::new(RefCell::new((*self.d.borrow()).clone())),
-        };
-        this
+        }));
+        let this: Ptr<S> = __this.as_pointer();
+        Rc::try_unwrap(__this).ok().unwrap().into_inner()
     }
 }
 impl Default for S {
@@ -102,20 +104,22 @@ impl Boxed_int_ {
     pub fn Boxed_int_(x: i32, t: i32) -> Self {
         let x: Value<i32> = Rc::new(RefCell::new(x));
         let t: Value<i32> = Rc::new(RefCell::new(t));
-        let mut this = Self {
+        let __this: Value<Boxed_int_> = Rc::new(RefCell::new(Self {
             v: Rc::new(RefCell::new((*x.borrow()))),
             tag: Rc::new(RefCell::new((*t.borrow()))),
-        };
-        this
+        }));
+        let this: Ptr<Boxed_int_> = __this.as_pointer();
+        Rc::try_unwrap(__this).ok().unwrap().into_inner()
     }
 }
 impl Clone for Boxed_int_ {
     fn clone(&self) -> Self {
-        let mut this = Self {
+        let __this: Value<Boxed_int_> = Rc::new(RefCell::new(Self {
             v: Rc::new(RefCell::new((*self.v.borrow()))),
             tag: Rc::new(RefCell::new((*self.tag.borrow()))),
-        };
-        this
+        }));
+        let this: Ptr<Boxed_int_> = __this.as_pointer();
+        Rc::try_unwrap(__this).ok().unwrap().into_inner()
     }
 }
 impl Default for Boxed_int_ {
@@ -142,6 +146,7 @@ impl ByteRepr for Boxed_int_ {
     }
 }
 pub fn main() {
+    __cpp2rust_init_globals();
     std::process::exit(main_0());
 }
 fn main_0() -> i32 {
@@ -157,3 +162,4 @@ fn main_0() -> i32 {
     assert!(((*(*boxed.borrow()).tag.borrow()) == 9));
     return 0;
 }
+pub fn __cpp2rust_init_globals() {}

tests/unit/out/unsafe/10_struct.rs

@@ -31,7 +31,7 @@ impl Graph {
     }
 }
 #[repr(C)]
-#[derive(Copy, Clone, Default)]
+#[derive(Copy, Clone)]
 pub struct Partial {
     pub p: *mut i32,
 }
@@ -41,6 +41,13 @@ impl Partial {
         this
     }
 }
+impl Default for Partial {
+    fn default() -> Self {
+        Partial {
+            p: std::ptr::null_mut(),
+        }
+    }
+}
 #[repr(C)]
 #[derive(Copy, Clone, Default)]
 pub struct Declared {}

tests/unit/out/unsafe/array_of_noncopy_struct.rs

@@ -22,6 +22,7 @@ impl Default for NonCopy {
 }
 pub fn main() {
     unsafe {
+        __cpp2rust_init_globals();
         std::process::exit(main_0() as i32);
     }
 }
@@ -36,3 +37,4 @@ unsafe fn main_0() -> i32 {
     assert!(((arr[(2) as usize].data.len()) == (0_usize)));
     return 0;
 }
+pub unsafe fn __cpp2rust_init_globals() {}

tests/unit/out/unsafe/in_class_field_initializer.rs

@@ -57,6 +57,7 @@ impl Default for Boxed_int_ {
 }
 pub fn main() {
     unsafe {
+        __cpp2rust_init_globals();
         std::process::exit(main_0() as i32);
     }
 }
@@ -73,3 +74,4 @@ unsafe fn main_0() -> i32 {
     assert!(((boxed.tag) == (9)));
     return 0;
 }
+pub unsafe fn __cpp2rust_init_globals() {}