Skip to content

Commit fbf98c5

Browse files
authored
Fix remaining Rust 2024 static-mut assertions in default_in_statics test output
1 parent ac5ef58 commit fbf98c5

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

tests/unit/out/unsafe/default_in_statics.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ pub unsafe fn check_local_static_5() {
126126
static mut local_fn_7: Option<unsafe fn(i32) -> i32> = unsafe { None };;
127127
static mut local_p_8: *mut i32 = unsafe { std::ptr::null_mut() };;
128128
assert!((local_outer_6.p1).is_null());
129-
assert!((local_outer_6.fn_).is_none());
129+
assert!(unsafe { (&raw const local_outer_6).as_ref().unwrap().fn_.is_none() });
130130
assert!(unsafe { (&raw const local_fn_7).as_ref().unwrap().is_none() });
131131
assert!((local_p_8).is_null());
132132
}
@@ -141,7 +141,7 @@ unsafe fn main_0() -> i32 {
141141
assert!((static_outer_1.p2).is_null());
142142
assert!((static_outer_1.cp).is_null());
143143
assert!((static_outer_1.pp).is_null());
144-
assert!((static_outer_1.fn_).is_none());
144+
assert!(unsafe { (&raw const static_outer_1).as_ref().unwrap().fn_.is_none() });
145145
let mut i: i32 = 0;
146146
'loop_: while ((i) < (3)) {
147147
assert!((static_outer_1.arr[(i) as usize]).is_null());
@@ -154,14 +154,14 @@ unsafe fn main_0() -> i32 {
154154
i.prefix_inc();
155155
}
156156
assert!((static_foo_3.s2).is_null());
157-
assert!((static_foo_3.fn1).is_none());
158-
assert!((static_foo_3.fn2).is_none());
157+
assert!(unsafe { (&raw const static_foo_3).as_ref().unwrap().fn1.is_none() });
158+
assert!(unsafe { (&raw const static_foo_3).as_ref().unwrap().fn2.is_none() });
159159
assert!(((static_foo_3.n) == (42)));
160160
let mut i: i32 = 0;
161161
'loop_: while ((i) < (2)) {
162162
assert!((static_foo_array_4[(i) as usize].s2).is_null());
163-
assert!((static_foo_array_4[(i) as usize].fn1).is_none());
164-
assert!((static_foo_array_4[(i) as usize].fn2).is_none());
163+
assert!(unsafe { (&raw const static_foo_array_4).as_ref().unwrap()[(i) as usize].fn1.is_none() });
164+
assert!(unsafe { (&raw const static_foo_array_4).as_ref().unwrap()[(i) as usize].fn2.is_none() });
165165
i.prefix_inc();
166166
}
167167
(unsafe { check_local_static_5() });

0 commit comments

Comments
 (0)