Fix rules

Author: lucic71

rules/pair/tgt_refcount.rs

@@ -69,18 +69,18 @@ fn f16<T1, T2>(a0: (Value<T1>, Value<T2>)) -> Value<T1> {
     a0.0
 }
 
-fn f17<T1, T2>(a0: (Value<T1>, Value<T2>)) -> Value<T1> {
-    a0.0
+fn f17<T1, T2>(a0: (Value<T1>, Value<T2>)) -> Ptr<T1> {
+    a0.0.as_pointer()
 }
 
-fn f18<T1, T2>(a0: (Value<T1>, Value<T2>)) -> Value<T2> {
-    a0.1
+fn f18<T1, T2>(a0: (Value<T1>, Value<T2>)) -> Ptr<T2> {
+    a0.1.as_pointer()
 }
 
-fn f19<T1, T2>(a0: (Value<T1>, Value<T2>)) -> Value<T1> {
-    a0.0
+fn f19<T1, T2>(a0: (Value<T1>, Value<T2>)) -> Ptr<T1> {
+    a0.0.as_pointer()
 }
 
-fn f20<T1, T2>(a0: (Value<T1>, Value<T2>)) -> Value<T2> {
-    a0.1
+fn f20<T1, T2>(a0: (Value<T1>, Value<T2>)) -> Ptr<T2> {
+    a0.1.as_pointer()
 }

rules/pair/tgt_unsafe.rs

@@ -38,18 +38,18 @@ unsafe fn f16<T1, T2>(a0: (T1, T2)) -> T1 {
     a0.0
 }
 
-unsafe fn f17<T1, T2>(a0: (T1, T2)) -> T1 {
-    a0.0
+unsafe fn f17<T1, T2>(a0: &mut (T1, T2)) -> *mut T1 {
+    &mut a0.0
 }
 
-unsafe fn f18<T1, T2>(a0: (T1, T2)) -> T2 {
-    a0.1
+unsafe fn f18<T1, T2>(a0: &mut (T1, T2)) -> *mut T2 {
+    &mut a0.1
 }
 
-unsafe fn f19<T1, T2>(a0: (T1, T2)) -> T1 {
-    a0.0
+unsafe fn f19<T1, T2>(a0: &(T1, T2)) -> *const T1 {
+    &a0.0
 }
 
-unsafe fn f20<T1, T2>(a0: (T1, T2)) -> T2 {
-    a0.1
+unsafe fn f20<T1, T2>(a0: &(T1, T2)) -> *const T2 {
+    &a0.1
 }

tests/unit/out/refcount/pair_get.rs

@@ -7,10 +7,10 @@ use std::io::{Read, Seek, Write};
 use std::os::fd::AsFd;
 use std::rc::{Rc, Weak};
 pub fn second_of_0(p: Ptr<(Value<f64>, Value<i32>)>) -> i32 {
-    return ((*p.upgrade().deref()).1.read());
+    return ((*p.upgrade().deref()).1.as_pointer().read());
 }
 pub fn first_of_1(p: Ptr<(Value<f64>, Value<i32>)>) -> f64 {
-    return ((*p.upgrade().deref()).0.read());
+    return ((*p.upgrade().deref()).0.as_pointer().read());
 }
 pub fn main() {
     __cpp2rust_init_globals();
@@ -21,8 +21,8 @@ fn main_0() -> i32 {
         Rc::new(RefCell::new(1.5_f64.try_into().expect("failed conversion"))),
         Rc::new(RefCell::new(2.try_into().expect("failed conversion"))),
     )));
-    assert!((((*p.borrow()).0.read()) == 1.5_f64));
-    assert!((((*p.borrow()).1.read()) == 2));
+    assert!((((*p.borrow()).0.as_pointer().read()) == 1.5_f64));
+    assert!((((*p.borrow()).1.as_pointer().read()) == 2));
     assert!((({ first_of_1(p.as_pointer(),) }) == 1.5_f64));
     assert!((({ second_of_0(p.as_pointer(),) }) == 2));
     return 0;

tests/unit/out/unsafe/pair_get.rs

@@ -7,10 +7,10 @@ use std::io::{Read, Seek, Write};
 use std::os::fd::{AsFd, FromRawFd, IntoRawFd};
 use std::rc::Rc;
 pub unsafe fn second_of_0(p: *const (f64, i32)) -> i32 {
-    return (*(*p).1);
+    return (*&(*p).1);
 }
 pub unsafe fn first_of_1(p: *const (f64, i32)) -> f64 {
-    return (*(*p).0);
+    return (*&(*p).0);
 }
 pub fn main() {
     unsafe {
@@ -20,8 +20,8 @@ pub fn main() {
 }
 unsafe fn main_0() -> i32 {
     let mut p: (f64, i32) = (1.5_f64.into(), 2.into());
-    assert!(((*p.0) == (1.5_f64)));
-    assert!(((*p.1) == (2)));
+    assert!(((*&mut p.0) == (1.5_f64)));
+    assert!(((*&mut p.1) == (2)));
     assert!(((unsafe { first_of_1(&p,) }) == (1.5_f64)));
     assert!(((unsafe { second_of_0(&p,) }) == (2)));
     return 0;