Auto merge of #2535 - oli-obk:rustup, r=oli-obk

bors · bors · commit ef3f649e4960 · 2022-09-07T13:27:46.000Z
Rustup fix breakage in rust-lang/rust#101522
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-dec689432fac6720b2f18101ac28a21add98b1b8
+e7c7aa7288559f8e5ea7ce3543ff946b09783628
diff --git a/tests/fail/intrinsics/assume.rs b/tests/fail/intrinsics/assume.rs
@@ -5,6 +5,6 @@ fn main() {
     unsafe {
         std::intrinsics::assume(x < 10);
         std::intrinsics::assume(x > 1);
-        std::intrinsics::assume(x > 42); //~ ERROR: `assume` intrinsic called with `false`
+        std::intrinsics::assume(x > 42); //~ ERROR: `assume` called with `false`
     }
 }
diff --git a/tests/fail/intrinsics/assume.stderr b/tests/fail/intrinsics/assume.stderr
@@ -1,8 +1,8 @@
-error: Undefined Behavior: `assume` intrinsic called with `false`
+error: Undefined Behavior: `assume` called with `false`
   --> $DIR/assume.rs:LL:CC
    |
 LL |         std::intrinsics::assume(x > 42);
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `assume` intrinsic called with `false`
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `assume` called with `false`
    |
    = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
    = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@ fn main() {`
`5`	`5`	`unsafe {`
`6`	`6`	`std::intrinsics::assume(x < 10);`
`7`	`7`	`std::intrinsics::assume(x > 1);`
`8`		- std::intrinsics::assume(x > 42); //~ ERROR: `assume` intrinsic called with `false`
	`8`	+ std::intrinsics::assume(x > 42); //~ ERROR: `assume` called with `false`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`		-error: Undefined Behavior: `assume` intrinsic called with `false`
	`1`	+error: Undefined Behavior: `assume` called with `false`
`2`	`2`	`--> $DIR/assume.rs:LL:CC`
`3`	`3`	`\|`
`4`	`4`	`LL \| std::intrinsics::assume(x > 42);`
`5`		- \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `assume` intrinsic called with `false`
	`5`	+ \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `assume` called with `false`
`6`	`6`	`\|`
`7`	`7`	`= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior`
`8`	`8`	`= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information`