Merge from rustc

The Miri Cronjob Bot · The Miri Cronjob Bot · commit f20931119ff9 · 2025-03-02T05:10:56.000Z
diff --git a/tests/fail/erroneous_const.stderr b/tests/fail/erroneous_const.stderr
@@ -2,7 +2,7 @@ error[E0080]: evaluation of `PrintName::<i32>::VOID` failed
   --> tests/fail/erroneous_const.rs:LL:CC
    |
 LL |     const VOID: ! = panic!();
-   |                     ^^^^^^^^ the evaluated program panicked at 'explicit panic', tests/fail/erroneous_const.rs:LL:CC
+   |                     ^^^^^^^^ evaluation panicked: explicit panic
    |
    = note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
 

Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of `PrintName::<i32>::VOID` failed
`2`	`2`	`--> tests/fail/erroneous_const.rs:LL:CC`
`3`	`3`	`\|`
`4`	`4`	`LL \| const VOID: ! = panic!();`
`5`		`- \| ^^^^^^^^ the evaluated program panicked at 'explicit panic', tests/fail/erroneous_const.rs:LL:CC`
	`5`	`+ \| ^^^^^^^^ evaluation panicked: explicit panic`
`6`	`6`	`\|`
`7`	`7`	= note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
`8`	`8`