Skip to content

Commit fe60759

Browse files
committed
Auto merge of #843 - RalfJung:rustup, r=RalfJung
fix compile-fail tests for latest rustc
2 parents 4d76526 + 95e6e67 commit fe60759

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-
97b1128589fdaa786a7cf65c5a6ff7ed37a1d2f3
1+
d36b7f69448f7390fa9dfde75d58b914365acdab
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use std::mem;
22

33
fn main() {
4-
let _x: &i32 = unsafe { mem::transmute(16usize) }; //~ ERROR integer pointer in non-ZST reference
4+
let _x: &i32 = unsafe { mem::transmute(16usize) }; //~ ERROR dangling reference (created from integer)
55
}

tests/compile-fail/validity/dangling_ref2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ use std::mem;
33
fn main() {
44
let val = 14;
55
let ptr = (&val as *const i32).wrapping_offset(1);
6-
let _x: &i32 = unsafe { mem::transmute(ptr) }; //~ ERROR encountered dangling (not entirely in bounds) reference
6+
let _x: &i32 = unsafe { mem::transmute(ptr) }; //~ ERROR dangling reference (not entirely in bounds)
77
}

0 commit comments

Comments
 (0)