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

bors · bors · commit a6539934d9d9 · 2021-03-10T15:00:43.000Z
rustup

The error message is not entirely right now, but close enough... let's get CI to pass before we miss other breakage.
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-1d6b0f626aad4ee9f2eaec4d5582f45620ccab80
+a4d9624242df6bfe6c0a298867dd2bd527263424
diff --git a/tests/compile-fail/intrinsics/copy_overflow.rs b/tests/compile-fail/intrinsics/copy_overflow.rs
@@ -1,4 +1,4 @@
-// error-pattern: overflow computing total size of `copy`
+// error-pattern: overflow computing total size
 use std::mem;
 
 fn main() {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-// error-pattern: overflow computing total size of `copy`
	`1`	`+// error-pattern: overflow computing total size`
`2`	`2`	`use std::mem;`
`3`	`3`
`4`	`4`	`fn main() {`