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
This commit is contained in:
bors 2021-05-04 08:27:00 +00:00
commit 67c04afc25
3 changed files with 3 additions and 3 deletions

View File

@ -1 +1 @@
59f551a2dcf57c0d3d96ac5ef60e000524210469
0309953232d9957aef4c7c5a24fcb30735b2066b

View File

@ -7,5 +7,5 @@ fn main() {
let g: fn(*const i32) = unsafe { std::mem::transmute(f as fn(&i32)) };
g(0usize as *const i32)
//~^ ERROR encountered a NULL reference
//~^ ERROR encountered a null reference
}

View File

@ -7,5 +7,5 @@ fn main() {
let g: fn() -> &'static i32 = unsafe { std::mem::transmute(f as fn() -> *const i32) };
let _x = g();
//~^ ERROR encountered a NULL reference
//~^ ERROR encountered a null reference
}