Skip to content

Commit 67c04af

Browse files
committed
Auto merge of #1788 - hyd-dev:rustup, r=RalfJung
`encountered a NULL reference` -> `encountered a null reference` It's changed from "NULL" to "null" (probably by rust-lang/rust#84842) in `rustc`, and causing some test failures: https://github.com/rust-lang/miri/runs/2498333632#step:8:640
2 parents cf9d77d + 47c5b6e commit 67c04af

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
59f551a2dcf57c0d3d96ac5ef60e000524210469
1+
0309953232d9957aef4c7c5a24fcb30735b2066b

tests/compile-fail/validity/cast_fn_ptr1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ fn main() {
77
let g: fn(*const i32) = unsafe { std::mem::transmute(f as fn(&i32)) };
88

99
g(0usize as *const i32)
10-
//~^ ERROR encountered a NULL reference
10+
//~^ ERROR encountered a null reference
1111
}

tests/compile-fail/validity/cast_fn_ptr2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ fn main() {
77
let g: fn() -> &'static i32 = unsafe { std::mem::transmute(f as fn() -> *const i32) };
88

99
let _x = g();
10-
//~^ ERROR encountered a NULL reference
10+
//~^ ERROR encountered a null reference
1111
}

0 commit comments

Comments
 (0)