Skip to content

Commit 379f84d

Browse files
committed
Update tests
1 parent 6098d43 commit 379f84d

4 files changed

Lines changed: 17 additions & 17 deletions

File tree

‎tests/unit/out/unsafe/map-reallocation.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ unsafe fn main_0() -> i32 {
2222
.1) = sentinel;
2323
let mut it: UnsafeMapIterator<i32, i32> =
2424
UnsafeMapIterator::find_key(&m as *const BTreeMap<i32, Box<(i32, i32)>>, &sentinel);
25-
let mut p: *mut i32 = (&mut *&raw mut (*it.deref()).1 as *mut i32);
25+
let mut p: *mut i32 = (&mut (*&raw mut (*it.deref()).1) as *mut i32);
2626
assert!(
2727
((*&raw mut (*it.deref()).1) == (sentinel))
2828
&& (!(c"iterator does not have correct value before insert".as_ptr()).is_null())
@@ -60,7 +60,7 @@ unsafe fn main_0() -> i32 {
6060
((*p) == (sentinel))
6161
&& (!(c"pointer does not have correct value after insert".as_ptr()).is_null())
6262
);
63-
*&raw mut (*it.deref()).1 = 57005;
63+
(*&raw mut (*it.deref()).1) = 57005;
6464
assert!(
6565
((*&mut m
6666
.entry(sentinel.clone())

‎tests/unit/out/unsafe/map.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,27 +140,27 @@ unsafe fn main_0() -> i32 {
140140
let mut x1: u32 = if it == end {
141141
0_u32
142142
} else {
143-
*&raw mut (*it.deref()).1
143+
(*&raw mut (*it.deref()).1)
144144
};
145145
assert!(((x1) == (4_u32)));
146146
let mut x2: u32 = if const_it == end.clone() {
147147
0_u32
148148
} else {
149-
*&raw mut (*const_it.deref()).1
149+
(*&raw mut (*const_it.deref()).1)
150150
};
151151
assert!(((x2) == (0_u32)));
152152
let mut x3: u32 = if it == UnsafeMapIterator::end(&m as *const BTreeMap<i16, Box<(i16, u32)>>) {
153153
0_u32
154154
} else {
155-
*&raw mut (*it.deref()).1
155+
(*&raw mut (*it.deref()).1)
156156
};
157157
assert!(((x3) == (4_u32)));
158158
let mut x4: u32 = if const_it
159159
== UnsafeMapIterator::end(&m as *const BTreeMap<i16, Box<(i16, u32)>>).clone()
160160
{
161161
0_u32
162162
} else {
163-
*&raw mut (*const_it.deref()).1
163+
(*&raw mut (*const_it.deref()).1)
164164
};
165165
assert!(((x4) == (0_u32)));
166166
(*&mut m
@@ -169,7 +169,7 @@ unsafe fn main_0() -> i32 {
169169
.1) = 5_u32;
170170
let mut it4: UnsafeMapIterator<i16, u32> =
171171
UnsafeMapIterator::find_key(&m as *const BTreeMap<i16, Box<(i16, u32)>>, &4_i16);
172-
let mut p: *mut u32 = (&mut *&raw mut (*it4.deref()).1 as *mut u32);
172+
let mut p: *mut u32 = (&mut (*&raw mut (*it4.deref()).1) as *mut u32);
173173
let mut x5: u32 = (*p);
174174
assert!(
175175
((*&mut m

‎tests/unit/out/unsafe/redundant_copy_in_conversion.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use std::rc::Rc;
99
pub unsafe fn sink_0(mut it: UnsafeMapIterator<i32, i32>) -> i32 {
1010
let mut cit: UnsafeMapIterator<i32, i32> = it.clone();
1111
return if cit == it.clone() {
12-
*&raw mut (*it.deref()).1
12+
(*&raw mut (*it.deref()).1)
1313
} else {
1414
0
1515
};

‎tests/unit/out/unsafe/sys_stat.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,24 @@ pub unsafe fn test_fstat_1() {
3737
pub unsafe fn test_st_mtime_access_2() {
3838
let mut st: ::libc::stat = unsafe { std::mem::zeroed() };
3939
let mut sp: *mut ::libc::stat = (&mut st as *mut ::libc::stat);
40-
*&raw mut (*&mut st).st_mtime = 5_i64;
40+
(*&raw mut (*&mut st).st_mtime) = 5_i64;
4141
assert!(((((*&raw mut (*&mut st).st_mtime) == (5_i64)) as i32) != 0));
42-
*&raw mut (*sp).st_mtime = 6_i64;
42+
(*&raw mut (*sp).st_mtime) = 6_i64;
4343
assert!(((((*&raw mut (*sp).st_mtime) == (6_i64)) as i32) != 0));
44-
*&raw mut (*&mut st).st_mtime += 2_i64;
44+
(*&raw mut (*&mut st).st_mtime) += 2_i64;
4545
assert!(((((*&raw mut (*&mut st).st_mtime) == (8_i64)) as i32) != 0));
46-
*&raw mut (*sp).st_mtime -= 1_i64;
46+
(*&raw mut (*sp).st_mtime) -= 1_i64;
4747
assert!(((((*&raw mut (*sp).st_mtime) == (7_i64)) as i32) != 0));
48-
*&raw mut (*&mut st).st_mtime.postfix_inc();
49-
*&raw mut (*sp).st_mtime.prefix_inc();
48+
(*&raw mut (*&mut st).st_mtime).postfix_inc();
49+
(*&raw mut (*sp).st_mtime).prefix_inc();
5050
assert!(((((*&raw mut (*&mut st).st_mtime) == (9_i64)) as i32) != 0));
51-
let mut mtime: *mut i64 = (&mut *&raw mut (*&mut st).st_mtime as *mut i64);
51+
let mut mtime: *mut i64 = (&mut (*&raw mut (*&mut st).st_mtime) as *mut i64);
5252
(*mtime) = 10_i64;
5353
assert!(((((*&raw mut (*&mut st).st_mtime) == (10_i64)) as i32) != 0));
54-
let mut mtime_via_ptr: *mut i64 = (&mut *&raw mut (*sp).st_mtime as *mut i64);
54+
let mut mtime_via_ptr: *mut i64 = (&mut (*&raw mut (*sp).st_mtime) as *mut i64);
5555
(*mtime_via_ptr) = 11_i64;
5656
assert!(((((*mtime) == (11_i64)) as i32) != 0));
57-
let mut copy: i64 = *&raw mut (*sp).st_mtime;
57+
let mut copy: i64 = (*&raw mut (*sp).st_mtime);
5858
assert!(((((copy) == (11_i64)) as i32) != 0));
5959
}
6060
pub fn main() {

0 commit comments

Comments
 (0)