Auto merge of rust-lang#2447 - RalfJung:rustup, r=RalfJung

bors · bors · commit 530abacbf762 · 2022-07-27T00:39:00.000Z
rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-a86705942c4cfaaee60f2e7308ca2bca703a710f
+c11207ec89b856164bba03b8ecfe07b0b234ed21
diff --git a/tests/fail/intrinsics/ptr_offset_from_unsigned_neg.rs b/tests/fail/intrinsics/ptr_offset_from_unsigned_neg.rs
@@ -1,5 +1,3 @@
-// Preparing for a rustc behavior change that'll happen soon: (FIXME remove this after the next submodule bump succeeded)
-//@normalize-stderr-test: "`(ptr_offset_from_unsigned)`" -> "$1"
 #![feature(ptr_sub_ptr)]
 
 fn main() {
diff --git a/tests/fail/intrinsics/ptr_offset_from_unsigned_neg.stderr b/tests/fail/intrinsics/ptr_offset_from_unsigned_neg.stderr
@@ -1,8 +1,8 @@
-error: Undefined Behavior: ptr_offset_from_unsigned called when first pointer has smaller offset than second: 0 < 4
+error: Undefined Behavior: `ptr_offset_from_unsigned` called when first pointer has smaller offset than second: 0 < 4
   --> $DIR/ptr_offset_from_unsigned_neg.rs:LL:CC
    |
 LL |     let _val = unsafe { ptr1.sub_ptr(ptr2) };
-   |                         ^^^^^^^^^^^^^^^^^^ ptr_offset_from_unsigned called when first pointer has smaller offset than second: 0 < 4
+   |                         ^^^^^^^^^^^^^^^^^^ `ptr_offset_from_unsigned` called when first pointer has smaller offset than second: 0 < 4
    |
    = 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
`@@ -1 +1 @@`
`1`		`-a86705942c4cfaaee60f2e7308ca2bca703a710f`
	`1`	`+c11207ec89b856164bba03b8ecfe07b0b234ed21`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// Preparing for a rustc behavior change that'll happen soon: (FIXME remove this after the next submodule bump succeeded)`
`2`		-//@normalize-stderr-test: "`(ptr_offset_from_unsigned)`" -> "$1"
`3`	`1`	`#![feature(ptr_sub_ptr)]`
`4`	`2`
`5`	`3`	`fn main() {`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`		`-error: Undefined Behavior: ptr_offset_from_unsigned called when first pointer has smaller offset than second: 0 < 4`
	`1`	+error: Undefined Behavior: `ptr_offset_from_unsigned` called when first pointer has smaller offset than second: 0 < 4
`2`	`2`	`--> $DIR/ptr_offset_from_unsigned_neg.rs:LL:CC`
`3`	`3`	`\|`
`4`	`4`	`LL \| let _val = unsafe { ptr1.sub_ptr(ptr2) };`
`5`		`- \| ^^^^^^^^^^^^^^^^^^ ptr_offset_from_unsigned called when first pointer has smaller offset than second: 0 < 4`
	`5`	+ \| ^^^^^^^^^^^^^^^^^^ `ptr_offset_from_unsigned` called when first pointer has smaller offset than second: 0 < 4
`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`