Skip to content

Commit 31f40b0

Browse files
authored
Merge pull request rust-lang#4216 from rust-lang/rustup-2025-03-02
Automatic Rustup
2 parents 06ed347 + a8fb222 commit 31f40b0

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

cargo-miri/src/phases.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ pub fn phase_rustc(mut args: impl Iterator<Item = String>, phase: RustcPhase) {
467467
if let Some(i) = val.iter().position(|&s| s == "link") {
468468
emit_link_hack = true;
469469
val.remove(i);
470-
if !val.iter().any(|&s| s == "metadata") {
470+
if !val.contains(&"metadata") {
471471
val.push("metadata");
472472
}
473473
}

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cb06d12710575a0d7ff71d6fe108f3bcff4f9195
1+
1c3b035542775e9a5decc93167d351b062942d32

src/eval.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,6 @@ pub fn create_ecx<'tcx>(
434434
/// Evaluates the entry function specified by `entry_id`.
435435
/// Returns `Some(return_code)` if program execution completed.
436436
/// Returns `None` if an evaluation error occurred.
437-
#[expect(clippy::needless_lifetimes)]
438437
pub fn eval_entry<'tcx>(
439438
tcx: TyCtxt<'tcx>,
440439
entry_id: DefId,

tests/fail/erroneous_const.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of `PrintName::<i32>::VOID` failed
22
--> tests/fail/erroneous_const.rs:LL:CC
33
|
44
LL | const VOID: ! = panic!();
5-
| ^^^^^^^^ the evaluated program panicked at 'explicit panic', tests/fail/erroneous_const.rs:LL:CC
5+
| ^^^^^^^^ evaluation panicked: explicit panic
66
|
77
= 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)
88

0 commit comments

Comments
 (0)