Skip to content

Commit 34d9e42

Browse files
committed
Update tests
1 parent b641c38 commit 34d9e42

2 files changed

Lines changed: 14 additions & 18 deletions

File tree

‎tests/unit/out/refcount/structured_binding_array.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ fn main_0() -> i32 {
2222
assert!(((*__decomp_0.borrow())[(2) as usize] == 3));
2323
assert!(((*arr.borrow())[(0) as usize] == 1));
2424
let __decomp_1: Ptr<i32> = (arr.as_pointer() as Ptr<i32>);
25-
(__decomp_1).offset((0) as isize).write(7);
25+
elem!((__decomp_1), 0).write(7);
2626
{
27-
let _ptr = (__decomp_1).offset((2) as isize);
28-
_ptr.write(_ptr.read() + ((__decomp_1).offset((1) as isize).read()))
27+
let _ptr = elem!((__decomp_1), 2);
28+
_ptr.write(_ptr.read() + (elem!((__decomp_1), 1).read()))
2929
};
3030
assert!(((*arr.borrow())[(0) as usize] == 7));
3131
assert!(((*arr.borrow())[(2) as usize] == 5));

‎tests/unit/out/refcount/structured_binding_move_ctor.rs‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ impl Clone for Movable {
6161
Movable::copy_from(__src.as_pointer())
6262
}
6363
}
64-
#[derive(Record, ByteRepr, VaArg, FnPtrArg, Default)]
64+
#[derive(DeepClone, Record, ByteRepr, VaArg, FnPtrArg, Default)]
6565
#[byte_size(48)]
6666
pub struct Holder {
6767
#[offset(0)]
@@ -71,14 +71,6 @@ pub struct Holder {
7171
#[byte_size(24)]
7272
pub ys: Value<Vec<i32>>,
7373
}
74-
impl Clone for Holder {
75-
fn clone(&self) -> Self {
76-
Self {
77-
xs: Rc::new(RefCell::new((*self.xs.borrow()).clone())),
78-
ys: Rc::new(RefCell::new((*self.ys.borrow()).clone())),
79-
}
80-
}
81-
}
8274
pub fn main() {
8375
__cpp2rust_init_globals();
8476
std::process::exit(main_0());
@@ -101,15 +93,19 @@ fn main_0() -> i32 {
10193
assert!(((*{ (*__decomp_3.borrow()).xs.clone() }.borrow()).len() == 3_usize));
10294
assert!(((*{ (*__decomp_3.borrow()).ys.clone() }.borrow()).len() == 2_usize));
10395
assert!(
104-
((({ (*__decomp_3.borrow()).xs.clone() }.as_pointer() as Ptr<i32>)
105-
.offset(2_usize)
106-
.read())
96+
((elem!(
97+
({ (*__decomp_3.borrow()).xs.as_pointer() } as Ptr<i32>),
98+
2_usize
99+
)
100+
.read())
107101
== 3)
108102
);
109103
assert!(
110-
((({ (*__decomp_3.borrow()).ys.clone() }.as_pointer() as Ptr<i32>)
111-
.offset(0_usize)
112-
.read())
104+
((elem!(
105+
({ (*__decomp_3.borrow()).ys.as_pointer() } as Ptr<i32>),
106+
0_usize
107+
)
108+
.read())
113109
== 4)
114110
);
115111
assert!((*{ (*h.borrow()).xs.clone() }.borrow()).is_empty());

0 commit comments

Comments
 (0)