Skip to content

Commit a73306f

Browse files
committed
Update tests
1 parent 779e33a commit a73306f

2 files changed

Lines changed: 40 additions & 52 deletions

File tree

tests/unit/out/refcount/void_cast.rs

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::os::fd::AsFd;
88
use std::rc::{Rc, Weak};
99
pub fn unused_param_0(x: i32) {
1010
let x: Value<i32> = Rc::new(RefCell::new(x));
11-
let _ = (*x.borrow_mut()).clone();
11+
(*x.borrow_mut());
1212
}
1313
thread_local!(
1414
pub static side_effect_counter: Value<i32> = Rc::new(RefCell::new(0));
@@ -39,64 +39,58 @@ fn main_0() -> i32 {
3939
unused_param_0(_x)
4040
});
4141
let y: Value<i32> = Rc::new(RefCell::new(5));
42-
let _ = (*y.borrow_mut()).clone();
42+
(*y.borrow_mut());
4343
let z: Value<i32> = Rc::new(RefCell::new({
44-
let _ = (*y.borrow_mut()).clone();
44+
(*y.borrow_mut());
4545
7
4646
}));
4747
assert!(((*z.borrow()) == 7));
4848
let counter: Value<i32> = Rc::new(RefCell::new(0));
4949
let w: Value<i32> = Rc::new(RefCell::new({
50-
let _ = (*counter.borrow_mut()).clone();
50+
(*counter.borrow_mut());
5151
(*counter.borrow_mut()) = 3;
5252
(*counter.borrow())
5353
}));
5454
assert!(((*w.borrow()) == 3));
5555
assert!(((*counter.borrow()) == 3));
56-
let _ = ({ bump_and_return_1() });
56+
({ bump_and_return_1() });
5757
assert!(((*side_effect_counter.with(Value::clone).borrow()) == 1));
5858
let v: Value<i32> = Rc::new(RefCell::new({
59-
let _ = ({ bump_and_return_1() });
59+
({ bump_and_return_1() });
6060
99
6161
}));
6262
assert!(((*side_effect_counter.with(Value::clone).borrow()) == 2));
6363
assert!(((*v.borrow()) == 99));
64-
let _ = 0;
65-
let _ = (0);
66-
let _ = (*y.borrow_mut()).clone();
67-
{
68-
let _ = 0;
69-
};
70-
{
71-
let _ = (*y.borrow_mut()).clone();
72-
};
64+
0;
65+
(0);
66+
(*y.borrow_mut());
67+
(0);
68+
(*y.borrow_mut());
7369
let err: Value<i32> = Rc::new(RefCell::new(0));
74-
{
75-
let _ = ((*err.borrow_mut()) = 42).clone();
76-
};
70+
((*err.borrow_mut()) = 42);
7771
assert!(((*err.borrow()) == 42));
7872
let chosen: Value<i32> = Rc::new(RefCell::new({
79-
let _ = ((*err.borrow_mut()) = 7).clone();
73+
((*err.borrow_mut()) = 7);
8074
123
8175
}));
8276
assert!(((*err.borrow()) == 7));
8377
assert!(((*chosen.borrow()) == 123));
84-
let _ = bump_and_return_1.clone();
78+
bump_and_return_1;
8579
assert!(((*side_effect_counter.with(Value::clone).borrow()) == 2));
86-
let _ = (FnPtr::<fn() -> i32>::new(bump_and_return_1));
80+
(FnPtr::<fn() -> i32>::new(bump_and_return_1));
8781
assert!(((*side_effect_counter.with(Value::clone).borrow()) == 2));
88-
let _ = ((FnPtr::<fn() -> i32>::new(bump_and_return_1)).cast::<fn() -> i32>(None));
82+
((FnPtr::<fn() -> i32>::new(bump_and_return_1)).cast::<fn() -> i32>(None));
8983
assert!(((*side_effect_counter.with(Value::clone).borrow()) == 2));
9084
let storage: Value<i32> = Rc::new(RefCell::new(11));
9185
let p: Value<Ptr<i32>> = Rc::new(RefCell::new((storage.as_pointer())));
92-
let _ = ((*p.borrow()).read()).clone();
86+
((*p.borrow()).read());
9387
let arr: Value<Box<[i32]>> = Rc::new(RefCell::new(Box::new([1, 2, 3])));
94-
let _ = ((*arr.borrow_mut())[(1) as usize]).clone();
88+
((*arr.borrow_mut())[(1) as usize]);
9589
let h: Value<Holder> = Rc::new(RefCell::new(Holder {
9690
field: Rc::new(RefCell::new(17)),
9791
}));
98-
let _ = (*(*h.borrow()).field.borrow_mut()).clone();
92+
(*(*h.borrow()).field.borrow_mut());
9993
let hp: Value<Ptr<Holder>> = Rc::new(RefCell::new((h.as_pointer())));
100-
let _ = (*(*(*hp.borrow()).upgrade().deref()).field.borrow_mut()).clone();
94+
(*(*(*hp.borrow()).upgrade().deref()).field.borrow_mut());
10195
return 0;
10296
}

tests/unit/out/unsafe/void_cast.rs

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use std::io::{Read, Seek, Write};
77
use std::os::fd::{AsFd, FromRawFd, IntoRawFd};
88
use std::rc::Rc;
99
pub unsafe fn unused_param_0(mut x: i32) {
10-
let _ = x.clone();
10+
x;
1111
}
1212
pub static mut side_effect_counter: i32 = 0;
1313
pub unsafe fn bump_and_return_1() -> i32 {
@@ -30,64 +30,58 @@ unsafe fn main_0() -> i32 {
3030
unused_param_0(_x)
3131
});
3232
let mut y: i32 = 5;
33-
let _ = y.clone();
33+
y;
3434
let mut z: i32 = {
35-
let _ = y.clone();
35+
y;
3636
7
3737
};
3838
assert!(((z) == (7)));
3939
let mut counter: i32 = 0;
4040
let mut w: i32 = {
41-
let _ = counter.clone();
41+
counter;
4242
counter = 3;
4343
counter
4444
};
4545
assert!(((w) == (3)));
4646
assert!(((counter) == (3)));
47-
let _ = (unsafe { bump_and_return_1() });
47+
(unsafe { bump_and_return_1() });
4848
assert!(((side_effect_counter) == (1)));
4949
let mut v: i32 = {
50-
let _ = (unsafe { bump_and_return_1() });
50+
(unsafe { bump_and_return_1() });
5151
99
5252
};
5353
assert!(((side_effect_counter) == (2)));
5454
assert!(((v) == (99)));
55-
let _ = 0;
56-
let _ = (0);
57-
let _ = (y).clone();
58-
{
59-
let _ = 0;
60-
};
61-
{
62-
let _ = (y).clone();
63-
};
55+
0;
56+
(0);
57+
(y);
58+
(0);
59+
(y);
6460
let mut err: i32 = 0;
65-
{
66-
let _ = (err = 42).clone();
67-
};
61+
(err = 42);
6862
assert!(((err) == (42)));
6963
let mut chosen: i32 = {
70-
let _ = (err = 7).clone();
64+
(err = 7);
7165
123
7266
};
7367
assert!(((err) == (7)));
7468
assert!(((chosen) == (123)));
75-
let _ = bump_and_return_1.clone();
69+
bump_and_return_1;
7670
assert!(((side_effect_counter) == (2)));
77-
let _ = (Some(bump_and_return_1));
71+
(Some(bump_and_return_1));
7872
assert!(((side_effect_counter) == (2)));
79-
let _ = (std::mem::transmute::<Option<unsafe fn() -> i32>, Option<unsafe fn() -> i32>>(
73+
(std::mem::transmute::<Option<unsafe fn() -> i32>, Option<unsafe fn() -> i32>>(
8074
(Some(bump_and_return_1)),
8175
));
8276
assert!(((side_effect_counter) == (2)));
8377
let mut storage: i32 = 11;
8478
let mut p: *mut i32 = (&mut storage as *mut i32);
85-
let _ = (*p).clone();
79+
(*p);
8680
let mut arr: [i32; 3] = [1, 2, 3];
87-
let _ = (arr[(1) as usize]).clone();
81+
(arr[(1) as usize]);
8882
let mut h: Holder = Holder { field: 17 };
89-
let _ = (h.field).clone();
83+
(h.field);
9084
let mut hp: *mut Holder = (&mut h as *mut Holder);
91-
let _ = ((*hp).field).clone();
85+
((*hp).field);
9286
return 0;
9387
}

0 commit comments

Comments
 (0)