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

bors · bors · commit 24c5eaf8bc4f · 2022-07-02T12:38:40.000Z
rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-ca1e68b3229e710c3948a361ee770d846a88e6da
+46b8c23f3eb5e4d0e0aa27eb3f20d5b8fc3ed51f
diff --git a/tests/fail/erroneous_const2.stderr b/tests/fail/erroneous_const2.stderr
@@ -2,9 +2,7 @@ error: any use of this value will cause an error
   --> $DIR/erroneous_const2.rs:LL:CC
    |
 LL | const FOO: u32 = [X - Y, Y - X][(X < Y) as usize];
-   | ------------------^^^^^---------------------------
-   |                   |
-   |                   attempt to compute `5_u32 - 6_u32`, which would overflow
+   | --------------    ^^^^^ attempt to compute `5_u32 - 6_u32`, which would overflow
    |
    = note: `#[deny(const_err)]` on by default
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,7 @@ error: any use of this value will cause an error`
`2`	`2`	`--> $DIR/erroneous_const2.rs:LL:CC`
`3`	`3`	`\|`
`4`	`4`	`LL \| const FOO: u32 = [X - Y, Y - X][(X < Y) as usize];`
`5`		`- \| ------------------^^^^^---------------------------`
`6`		`- \| \|`
`7`		- \| attempt to compute `5_u32 - 6_u32`, which would overflow
	`5`	+ \| -------------- ^^^^^ attempt to compute `5_u32 - 6_u32`, which would overflow
`8`	`6`	`\|`
`9`	`7`	= note: `#[deny(const_err)]` on by default
`10`	`8`	`= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!`