Update existing tests

Author: lucic71

tests/ub/out/refcount/dangling-prvalue-as-lvalue.rs

@@ -17,7 +17,7 @@ fn main_0() -> i32 {
     let v: Value<Vec<i32>> = Rc::new(RefCell::new(vec![1, 2]));
     let b: Ptr<i32> = ({
         let _a: Ptr<i32> = (v.as_pointer() as Ptr<i32>);
-        Rc::new(foo_0)(_a)
+        foo_0(_a)
     });
     (*v.borrow_mut()).clear();
     return (b.read());

tests/ub/out/refcount/ub1.rs

@@ -16,6 +16,6 @@ pub fn main() {
     std::process::exit(main_0());
 }
 fn main_0() -> i32 {
-    let x: Ptr<i32> = ({ Rc::new(dangling_0)() });
+    let x: Ptr<i32> = ({ dangling_0() });
     return (x.read());
 }

tests/ub/out/unsafe/dangling-prvalue-as-lvalue.rs

@@ -19,7 +19,7 @@ unsafe fn main_0() -> i32 {
     let mut v: Vec<i32> = vec![1, 2];
     let b: *const i32 = (unsafe {
         let _a: *const i32 = &(*v.as_mut_ptr()) as *const i32;
-        Rc::new(|a0| unsafe { foo_0(a0) })(_a)
+        foo_0(_a)
     });
     v.clear();
     return (*b);

tests/ub/out/unsafe/ub1.rs

@@ -18,6 +18,6 @@ pub fn main() {
     }
 }
 unsafe fn main_0() -> i32 {
-    let x: *mut i32 = (unsafe { Rc::new(|| unsafe { dangling_0() })() });
+    let x: *mut i32 = (unsafe { dangling_0() });
     return (*x);
 }

tests/unit/out/refcount/complex_function.rs

@@ -133,11 +133,11 @@ fn main_0() -> i32 {
     let r1: Ptr<i32> = x1.as_pointer();
     let r2: Ptr<i32> = ({
         let _x: Ptr<i32> = x1.as_pointer();
-        Rc::new(bar_2)(_x)
+        bar_2(_x)
     });
     let r3: Ptr<i32> = ({
         let _x: Ptr<i32> = (r1).clone();
-        Rc::new(bar_2)(_x)
+        bar_2(_x)
     });
     let __rhs = (*x1.borrow());
     {
@@ -403,7 +403,7 @@ fn main_0() -> i32 {
             .deref())
             .v
             .as_pointer());
-            Rc::new(ptr_1)(_x)
+            ptr_1(_x)
         })
         .clone();
         let __tmp = __ptr.read() + 1;
@@ -436,7 +436,7 @@ fn main_0() -> i32 {
         .deref())
         .v
         .as_pointer());
-        Rc::new(ptr_1)(_x)
+        ptr_1(_x)
     });
     let ptr3: Value<Ptr<i32>> = Rc::new(RefCell::new(
         ({
@@ -450,7 +450,7 @@ fn main_0() -> i32 {
             .deref())
             .v
             .as_pointer());
-            Rc::new(ptr_1)(_x)
+            ptr_1(_x)
         }),
     ));
     let vptr: Value<i32> = Rc::new(RefCell::new(
@@ -481,7 +481,7 @@ fn main_0() -> i32 {
             .deref())
             .v
             .as_pointer();
-            Rc::new(bar_2)(_x)
+            bar_2(_x)
         }),
     ));
     ({
@@ -495,7 +495,7 @@ fn main_0() -> i32 {
         .deref())
         .v
         .as_pointer();
-        Rc::new(bar_2)(_x)
+        bar_2(_x)
     })
     .with_mut(|__v| __v.postfix_inc());
     return (((({

tests/unit/out/refcount/no_direct_callee.rs

@@ -10,9 +10,9 @@ use std::rc::{Rc, Weak};
 pub fn test1_0() -> bool {
     return false;
 }
-pub fn test_1(fn_: Rc<dyn Fn() -> bool>) -> i32 {
-    let fn_: Value<Rc<dyn Fn() -> bool>> = Rc::new(RefCell::new(fn_));
-    if !({ (*fn_.borrow())() }) {
+pub fn test_1(fn_: FnPtr<fn() -> bool>) -> i32 {
+    let fn_: Value<FnPtr<fn() -> bool>> = Rc::new(RefCell::new(fn_));
+    if !({ (*(*fn_.borrow()))() }) {
         return 1;
     }
     return 0;
@@ -22,7 +22,7 @@ pub fn main() {
 }
 fn main_0() -> i32 {
     return ({
-        let _fn: Rc<dyn Fn() -> bool> = Rc::new(test1_0);
+        let _fn: FnPtr<fn() -> bool> = fn_ptr!(test1_0, fn() -> bool);
         test_1(_fn)
     });
 }

tests/unit/out/refcount/printfs.rs

@@ -44,7 +44,7 @@ fn main_0() -> i32 {
                     .to_c_string_iterator()
                     .chain(std::iter::once(0))
                     .collect::<Vec<u8>>();
-                Rc::new(fn_0)(_v)
+                fn_0(_v)
             })
         ))
         .as_pointer() as Ptr<u8>)
@@ -53,7 +53,7 @@ fn main_0() -> i32 {
         "{}",
         (({
             let _v: Ptr<Vec<u8>> = s.as_pointer();
-            Rc::new(fn2_1)(_v)
+            fn2_1(_v)
         })
         .to_strong()
         .as_pointer() as Ptr<u8>)

tests/unit/out/refcount/prvalue-as-lvalue.rs

@@ -18,7 +18,7 @@ fn main_0() -> i32 {
     let pa: Value<Ptr<i32>> = Rc::new(RefCell::new((a.as_pointer())));
     let b: Ptr<i32> = ({
         let _a: Ptr<i32> = (*pa.borrow()).clone();
-        Rc::new(foo_0)(_a)
+        foo_0(_a)
     });
     return (b.read());
 }

tests/unit/out/refcount/ref_calls.rs

@@ -27,7 +27,7 @@ fn main_0() -> i32 {
     ));
     let z: Ptr<i32> = ({
         let _x: Ptr<i32> = x.as_pointer();
-        Rc::new(foo_1)(_x)
+        foo_1(_x)
     });
     return {
         let _lhs = {

tests/unit/out/unsafe/complex_function.rs

@@ -90,11 +90,11 @@ unsafe fn main_0() -> i32 {
     let r1: *mut i32 = &mut x1 as *mut i32;
     let r2: *mut i32 = (unsafe {
         let _x: *mut i32 = &mut x1 as *mut i32;
-        Rc::new(|a0| unsafe { bar_2(a0) })(_x)
+        bar_2(_x)
     });
     let r3: *mut i32 = (unsafe {
         let _x: *mut i32 = r1;
-        Rc::new(|a0| unsafe { bar_2(a0) })(_x)
+        bar_2(_x)
     });
     (*r2) += x1;
     (*r3) += (*r1);
@@ -230,12 +230,12 @@ unsafe fn main_0() -> i32 {
     let mut pref: *mut i32 = (unsafe {
         let _x: *mut i32 =
             &mut (*(unsafe { (*(unsafe { (*(unsafe { d.get() })).get() })).get() })).v as *mut i32;
-        Rc::new(|a0| unsafe { bar_2(a0) })(_x)
+        bar_2(_x)
     });
     (*(unsafe {
         let _x: *mut i32 =
             &mut (*(unsafe { (*(unsafe { (*(unsafe { d.get() })).get() })).get() })).v as *mut i32;
-        Rc::new(|a0| unsafe { bar_2(a0) })(_x)
+        bar_2(_x)
     }))
     .postfix_inc();
     return (((*(unsafe {