Skip to content

Commit 4f4e7ca

Browse files
authored
Merge pull request #4353 from rust-lang/rustup-2025-05-28
Automatic Rustup
2 parents 2761ddc + 0ce8be6 commit 4f4e7ca

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d76fe154029e03aeb64af721beafdcef856d576a
1+
04a67d5a0587ed98632f82c404ae20f9f0a51a1d

src/machine.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1775,7 +1775,7 @@ impl<'tcx> Machine<'tcx> for MiriMachine<'tcx> {
17751775
let is_generic = instance
17761776
.args
17771777
.into_iter()
1778-
.any(|kind| !matches!(kind.unpack(), ty::GenericArgKind::Lifetime(_)));
1778+
.any(|arg| !matches!(arg.kind(), ty::GenericArgKind::Lifetime(_)));
17791779
let can_be_inlined = matches!(
17801780
ecx.tcx.sess.opts.unstable_opts.cross_crate_inline_threshold,
17811781
InliningThreshold::Always

tests/fail/ptr_swap_nonoverlapping.stderr

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
thread 'main' panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
2+
thread 'main' panicked at tests/fail/ptr_swap_nonoverlapping.rs:LL:CC:
33
unsafe precondition(s) violated: ptr::swap_nonoverlapping requires that both pointer arguments are aligned and non-null and the specified memory ranges do not overlap
44

55
This indicates a bug in the program. This Undefined Behavior check is optional, and cannot be relied on for safety.
@@ -18,9 +18,6 @@ LL | ABORT()
1818
= note: inside closure at RUSTLIB/std/src/panicking.rs:LL:CC
1919
= note: inside `std::sys::backtrace::__rust_end_short_backtrace::<{closure@std::panicking::begin_panic_handler::{closure#0}}, !>` at RUSTLIB/std/src/sys/backtrace.rs:LL:CC
2020
= note: inside `std::panicking::begin_panic_handler` at RUSTLIB/std/src/panicking.rs:LL:CC
21-
= note: inside `core::panicking::panic_nounwind` at RUSTLIB/core/src/panicking.rs:LL:CC
22-
= note: inside `std::ptr::swap_nonoverlapping::precondition_check` at RUSTLIB/core/src/ub_checks.rs:LL:CC
23-
= note: inside `std::ptr::swap_nonoverlapping::<usize>` at RUSTLIB/core/src/ub_checks.rs:LL:CC
2421
note: inside `main`
2522
--> tests/fail/ptr_swap_nonoverlapping.rs:LL:CC
2623
|

0 commit comments

Comments
 (0)