Auto merge of #1400 - RalfJung:rustup, r=RalfJung

bors · bors · commit 7f3366288d12 · 2020-05-07T21:59:57.000Z
rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-97f3eeec8216d7155c24674b9be55e7c672bcae3
+a08c47310c7d49cbdc5d7afb38408ba519967ecd
diff --git a/tests/compile-fail/validity/dangling_ref1.rs b/tests/compile-fail/validity/dangling_ref1.rs
@@ -3,5 +3,5 @@
 use std::mem;
 
 fn main() {
-    let _x: &i32 = unsafe { mem::transmute(16usize) }; //~ ERROR encountered a dangling reference (address 16 is unallocated)
+    let _x: &i32 = unsafe { mem::transmute(16usize) }; //~ ERROR encountered a dangling reference (address 0x10 is unallocated)
 }

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`	`use std::mem;`
`4`	`4`
`5`	`5`	`fn main() {`
`6`		`- let _x: &i32 = unsafe { mem::transmute(16usize) }; //~ ERROR encountered a dangling reference (address 16 is unallocated)`
	`6`	`+ let _x: &i32 = unsafe { mem::transmute(16usize) }; //~ ERROR encountered a dangling reference (address 0x10 is unallocated)`
`7`	`7`	`}`