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

bors · bors · commit 4cf36f285084 · 2021-02-03T22:38:19.000Z
rustup Cc rust-lang/rust#81726
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-0e63af5da3400ace48a0345117980473fd21ad73
+120b2a704a60d4341286bd82f6e638c65ca169b6
diff --git a/tests/compile-fail/erroneous_const.rs b/tests/compile-fail/erroneous_const.rs
@@ -9,6 +9,7 @@
 struct PrintName<T>(T);
 impl<T> PrintName<T> {
     const VOID: ! = panic!(); //~WARN any use of this value will cause an error
+    //~^ WARN this was previously accepted
 }
 
 fn no_codegen<T>() {

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