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

rustup Cc rust-lang/rust#81726
rust-lang · Feb 3, 2021 · 4cf36f2 · 4cf36f2
2 parents 34e22a8 + d309804
commit 4cf36f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
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
		@@ -1 +1 @@
		0e63af5da3400ace48a0345117980473fd21ad73
		120b2a704a60d4341286bd82f6e638c65ca169b6