Skip to content

Commit 12155be

Browse files
committed
Update tesst
1 parent a031ed1 commit 12155be

44 files changed

Lines changed: 274 additions & 253 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ impl Default for S {
4747
pub fn sum_0(s: Ptr<S>) -> i32 {
4848
return ({
4949
({ ((*s.with(|__s| __s.v.clone()).borrow()).len() as i32) } + {
50-
(elem!((array_field_ptr!(s, n) as Ptr<i32>), 0).read())
50+
(elem!((array_field_ptr!(s, n) as Ptr::<i32>), 0).read())
5151
})
52-
} + { (elem!((array_field_ptr!(s, n) as Ptr<i32>), 1).read()) });
52+
} + { (elem!((array_field_ptr!(s, n) as Ptr::<i32>), 1).read()) });
5353
}
5454
pub fn main() {
5555
__cpp2rust_init_globals();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ fn main_0() -> i32 {
4646
'loop_: while (((i < 3) as i32) != 0) {
4747
assert!(
4848
((((elem!(
49-
(array_field_ptr!(s_0.with(|v| v.as_pointer()), tail) as Ptr<i32>),
49+
(array_field_ptr!(s_0.with(|v| v.as_pointer()), tail) as Ptr::<i32>),
5050
i
5151
)
5252
.read())
@@ -59,7 +59,7 @@ fn main_0() -> i32 {
5959
'loop_: while (((i < 4) as i32) != 0) {
6060
assert!(
6161
(((((elem!(
62-
(array_field_ptr!(s_0.with(|v| v.as_pointer()), buf) as Ptr<i8>),
62+
(array_field_ptr!(s_0.with(|v| v.as_pointer()), buf) as Ptr::<i8>),
6363
i
6464
)
6565
.read()) as i32)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ fn main_0() -> i32 {
143143
let mut p: Ptr<Value<Box<[i32]>>> = (rows.as_pointer() as Ptr<Value<Box<[i32]>>>);
144144
p.prefix_inc();
145145
assert!(
146-
({ ((p).read().as_pointer() as Ptr<i32>).clone() } == {
146+
({ ((p).read().as_pointer() as Ptr::<i32>).clone() } == {
147147
((((rows.as_pointer() as Ptr<Value<Box<[i32]>>>)
148148
.offset(1)
149149
.read()
@@ -158,7 +158,7 @@ fn main_0() -> i32 {
158158
let mut q: Ptr<Value<Box<[i32]>>> = (rows.as_pointer() as Ptr<Value<Box<[i32]>>>);
159159
assert!((({ sum_2(q.offset((1) as isize).read().as_pointer(),) }) == 15));
160160
assert!(
161-
({ (q.offset((1) as isize).read().as_pointer() as Ptr<i32>) } == {
161+
({ (q.offset((1) as isize).read().as_pointer() as Ptr::<i32>) } == {
162162
((((rows.as_pointer() as Ptr<Value<Box<[i32]>>>)
163163
.offset(1)
164164
.read()

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ fn main_0() -> i32 {
1919
(p).clone()
2020
};
2121
assert!(
22-
((({ (q).clone() } == { (buf.as_pointer() as Ptr<i8>).offset((1) as isize) }) as i32) != 0)
22+
((({ (q).clone() } == { (buf.as_pointer() as Ptr::<i8>).offset((1) as isize) }) as i32)
23+
!= 0)
2324
);
2425
let mut out: i8 = 0_i8;
2526
'switch: {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ fn main_0() -> i32 {
3737
let __rhs = ({ advance_1() });
3838
elem!((*q.borrow()), 1).write(__rhs);
3939
assert!(
40-
({ (*q.borrow()).clone() } == { (a.as_pointer() as Ptr<i32>).offset((1) as isize) })
40+
({ (*q.borrow()).clone() } == { (a.as_pointer() as Ptr::<i32>).offset((1) as isize) })
4141
&& ((*a.borrow())[(2) as usize] == 10)
4242
);
4343
let __rhs = ({ advance_1() });
4444
{
4545
elem!((*q.borrow()), 1).with_mut(|__v| *__v = *__v + __rhs)
4646
};
4747
assert!(
48-
({ (*q.borrow()).clone() } == { (a.as_pointer() as Ptr<i32>).offset((2) as isize) })
48+
({ (*q.borrow()).clone() } == { (a.as_pointer() as Ptr::<i32>).offset((2) as isize) })
4949
&& ((*a.borrow())[(3) as usize] == 14)
5050
);
5151
let mut pq: Ptr<Ptr<i32>> = (q.as_pointer());
@@ -54,18 +54,18 @@ fn main_0() -> i32 {
5454
elem!((pq.read()), 1).with_mut(|__v| *__v = *__v + __rhs)
5555
};
5656
assert!(
57-
({ (*q.borrow()).clone() } == { (a.as_pointer() as Ptr<i32>).offset((3) as isize) })
57+
({ (*q.borrow()).clone() } == { (a.as_pointer() as Ptr::<i32>).offset((3) as isize) })
5858
&& ((*a.borrow())[(4) as usize] == 15)
5959
);
6060
let __rhs = ({ advance_1() });
6161
elem!((pq.read()), 1).write(__rhs);
6262
assert!(
63-
({ (*q.borrow()).clone() } == { (a.as_pointer() as Ptr<i32>).offset((4) as isize) })
63+
({ (*q.borrow()).clone() } == { (a.as_pointer() as Ptr::<i32>).offset((4) as isize) })
6464
&& ((*a.borrow())[(5) as usize] == 10)
6565
);
6666
({ by_ref_2(q.as_pointer()) });
6767
assert!(
68-
({ (*q.borrow()).clone() } == { (a.as_pointer() as Ptr<i32>).offset((5) as isize) })
68+
({ (*q.borrow()).clone() } == { (a.as_pointer() as Ptr::<i32>).offset((5) as isize) })
6969
&& ((*a.borrow())[(6) as usize] == 17)
7070
);
7171
let s: Value<S> = Rc::new(RefCell::new(S {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,10 @@ fn main_0() -> i32 {
4848
println!("{}", (s.len() - 1));
4949
println!(
5050
"{} {}",
51-
(buf.as_pointer() as Ptr<i8>).to_c_string_iterator().count(),
52-
(buf.as_pointer() as Ptr<i8>).with_c_str(|__lookup| {
51+
(buf.as_pointer() as Ptr::<i8>)
52+
.to_c_string_iterator()
53+
.count(),
54+
(buf.as_pointer() as Ptr::<i8>).with_c_str(|__lookup| {
5355
s.iter()
5456
.take(s.len().saturating_sub(1))
5557
.rposition(|&x| __lookup.contains(&x))

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ fn main_0() -> i32 {
2929
('\0' as i8),
3030
])));
3131
assert!(
32-
((({ deref_0((a.as_pointer() as Ptr<i32>),) })
33-
+ ({ strlen_1((s.as_pointer() as Ptr<i8>),) }))
32+
((({ deref_0((a.as_pointer() as Ptr::<i32>),) })
33+
+ ({ strlen_1((s.as_pointer() as Ptr::<i8>),) }))
3434
== 4)
3535
);
3636
return 0;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ fn main_0() -> i32 {
3030
);
3131
println!(
3232
"{}",
33-
(({ is_negative_1((lit.as_pointer() as Ptr<i8>),) }) as i32)
33+
(({ is_negative_1((lit.as_pointer() as Ptr::<i8>),) }) as i32)
3434
);
3535
let mut u8s: Ptr<i8> = Ptr::<i8>::from_string_literal(b"\xc3\xa9");
3636
println!(

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,15 @@ fn main_0() -> i32 {
107107
assert!(((f1.y.read()) == 4));
108108
assert!(({ (f1.z).clone() } == { (x1.as_pointer()) }));
109109
assert!(((f1.z.read()) == 4));
110-
elem!((f2.a.as_pointer() as Ptr<i32>), 0).with_mut(|__v| __v.prefix_inc());
111-
elem!((f2.a.as_pointer() as Ptr<i32>), 1).with_mut(|__v| __v.prefix_inc());
112-
elem!((f2.a.as_pointer() as Ptr<i32>), 2).with_mut(|__v| __v.prefix_inc());
113-
assert!(((elem!((f2.a.as_pointer() as Ptr<i32>), 0).read()) == 1));
114-
assert!(((elem!((f2.a.as_pointer() as Ptr<i32>), 1).read()) == 2));
115-
assert!(((elem!((f2.a.as_pointer() as Ptr<i32>), 2).read()) == 3));
116-
assert!(((elem!((f1.a.as_pointer() as Ptr<i32>), 0).read()) == 0));
117-
assert!(((elem!((f1.a.as_pointer() as Ptr<i32>), 1).read()) == 1));
118-
assert!(((elem!((f1.a.as_pointer() as Ptr<i32>), 2).read()) == 2));
110+
elem!((f2.a.as_pointer() as Ptr::<i32>), 0).with_mut(|__v| __v.prefix_inc());
111+
elem!((f2.a.as_pointer() as Ptr::<i32>), 1).with_mut(|__v| __v.prefix_inc());
112+
elem!((f2.a.as_pointer() as Ptr::<i32>), 2).with_mut(|__v| __v.prefix_inc());
113+
assert!(((elem!((f2.a.as_pointer() as Ptr::<i32>), 0).read()) == 1));
114+
assert!(((elem!((f2.a.as_pointer() as Ptr::<i32>), 1).read()) == 2));
115+
assert!(((elem!((f2.a.as_pointer() as Ptr::<i32>), 2).read()) == 3));
116+
assert!(((elem!((f1.a.as_pointer() as Ptr::<i32>), 0).read()) == 0));
117+
assert!(((elem!((f1.a.as_pointer() as Ptr::<i32>), 1).read()) == 1));
118+
assert!(((elem!((f1.a.as_pointer() as Ptr::<i32>), 2).read()) == 2));
119119
f2.bar.w = 20;
120120
assert!((f2.bar.w == 20));
121121
assert!((f1.bar.w == 10));

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ fn main_0() -> i32 {
5555
let mut runtime_context: bool = ({ in_constant_context_6() });
5656
assert!(!(runtime_context));
5757
let arr: Value<Box<[i32]>> = Rc::new(RefCell::new(Box::new([7, 8])));
58-
assert!((({ first_1((arr.as_pointer() as Ptr<i32>),) }) == 7));
59-
assert!((({ first_1((arr.as_pointer() as Ptr<i32>).offset((1) as isize),) }) == 8));
58+
assert!((({ first_1((arr.as_pointer() as Ptr::<i32>),) }) == 7));
59+
assert!((({ first_1((arr.as_pointer() as Ptr::<i32>).offset((1) as isize),) }) == 8));
6060
assert!((({ scaled_2(3,) }) == 3));
6161
assert!((({ scaled_2(-3_i32,) }) == 6));
6262
assert!((({ half_3(5_f64,) }) == 2.5_f64));

0 commit comments

Comments
 (0)