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

bors · bors · commit 5b7f1f919b9d · 2021-06-17T18:53:16.000Z
rustup Cc rust-lang/rust#86409
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-d74b36ea2f814b720c39d7b60aecaefe512a056b
+4d3ce2e7dac840d6ac7d658a5506eb31492fb3ef
diff --git a/tests/compile-fail/erroneous_const.rs b/tests/compile-fail/erroneous_const.rs
@@ -8,7 +8,7 @@
 
 struct PrintName<T>(T);
 impl<T> PrintName<T> {
-    const VOID: ! = panic!(); //~ERROR any use of this value will cause an error
+    const VOID: ! = panic!(); //~ERROR evaluation of `PrintName::<i32>::VOID` failed
 }
 
 fn no_codegen<T>() {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`struct PrintName<T>(T);`
`10`	`10`	`impl<T> PrintName<T> {`
`11`		`- const VOID: ! = panic!(); //~ERROR any use of this value will cause an error`
	`11`	+ const VOID: ! = panic!(); //~ERROR evaluation of `PrintName::<i32>::VOID` failed
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`fn no_codegen<T>() {`