Auto merge of #3630 - rust-lang:rustup-2024-05-25, r=saethlin

bors · bors · commit 4adf07000154 · 2024-05-25T12:46:16.000Z
Automatic Rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-78dd504f2fd87c0cfabff7d9174253411caf2f80
+21e6de7eb64c09102de3f100420a09edc1a2a8d7
diff --git a/tests/panic/mir-validation.stderr b/tests/panic/mir-validation.stderr
@@ -1,4 +1,4 @@
-thread 'rustc' panicked at compiler/rustc_const_eval/src/transform/validate.rs:LL:CC:
+thread 'rustc' panicked at compiler/rustc_mir_transform/src/validate.rs:LL:CC:
 broken MIR in Item(DefId) (after phase change to runtime-optimized) at bb0[1]:
 (*(_2.0: *mut i32)), has deref at the wrong place
 stack backtrace:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-thread 'rustc' panicked at compiler/rustc_const_eval/src/transform/validate.rs:LL:CC:`
	`1`	`+thread 'rustc' panicked at compiler/rustc_mir_transform/src/validate.rs:LL:CC:`
`2`	`2`	`broken MIR in Item(DefId) (after phase change to runtime-optimized) at bb0[1]:`
`3`	`3`	`((_2.0: mut i32)), has deref at the wrong place`
`4`	`4`	`stack backtrace:`