Auto merge of #1117 - rust-lang:rustup, r=RalfJung

bors · bors · commit a7809bfb0e3e · 2019-12-21T11:26:07.000Z
Rustup to rustc 1.42.0-nightly (9ff30a781 2019-12-21)
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-a605441e049f0b6d5f7715b94b8ac4662fd7fcf6
+9ff30a7810c586819a78188c173a7b74adbb9730
diff --git a/tests/compile-fail/stacked_borrows/illegal_write6.rs b/tests/compile-fail/stacked_borrows/illegal_write6.rs
@@ -7,6 +7,6 @@ fn main() {
 fn foo(a: &mut u32, y: *mut u32) -> u32 {
     *a = 1;
     let _b = &*a;
-    unsafe { *y = 2; } //~ ERROR: borrow stack
+    unsafe { *y = 2; } //~ ERROR: not granting access to tag
     return *a;
 }

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@ fn main() {`
`7`	`7`	`fn foo(a: &mut u32, y: *mut u32) -> u32 {`
`8`	`8`	`*a = 1;`
`9`	`9`	`let _b = &*a;`
`10`		`- unsafe { *y = 2; } //~ ERROR: borrow stack`
	`10`	`+ unsafe { *y = 2; } //~ ERROR: not granting access to tag`
`11`	`11`	`return *a;`
`12`	`12`	`}`