diff --git a/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_mutex_deadlock.stderr b/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_mutex_deadlock.stderr index 468c0e63cc34..31a25b17546c 100644 --- a/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_mutex_deadlock.stderr +++ b/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_mutex_deadlock.stderr @@ -8,9 +8,9 @@ LL | let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) }; = note: stack backtrace: 0: std::sys::thread::PLATFORM::Thread::join at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC - 1: std::thread::lifecycle::JoinInner::join + 1: std::thread::lifecycle::JoinInner::<'_, ()>::join at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC - 2: std::thread::JoinHandle::join + 2: std::thread::JoinHandle::<()>::join at RUSTLIB/std/src/thread/join_handle.rs:LL:CC 3: main at tests/fail-dep/concurrency/libc_pthread_mutex_deadlock.rs:LL:CC diff --git a/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_mutex_free_while_queued.stderr b/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_mutex_free_while_queued.stderr index b120a447d8b7..ae37c89406bb 100644 --- a/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_mutex_free_while_queued.stderr +++ b/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_mutex_free_while_queued.stderr @@ -10,9 +10,9 @@ LL | self.1.deallocate(From::from(ptr.cast()), layout); = note: stack backtrace: 0: as std::ops::Drop>::drop at RUSTLIB/alloc/src/boxed.rs:LL:CC - 1: std::ptr::drop_glue)) + 1: std::ptr::drop_glue::> - shim(Some(std::boxed::Box)) at RUSTLIB/core/src/ptr/mod.rs:LL:CC - 2: std::mem::drop + 2: std::mem::drop::> at RUSTLIB/core/src/mem/mod.rs:LL:CC 3: main::{closure#0}::{closure#2} at tests/fail-dep/concurrency/libc_pthread_mutex_free_while_queued.rs:LL:CC diff --git a/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_rwlock_write_read_deadlock.stderr b/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_rwlock_write_read_deadlock.stderr index e00c297a9b29..1cfbbb46a1c3 100644 --- a/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_rwlock_write_read_deadlock.stderr +++ b/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_rwlock_write_read_deadlock.stderr @@ -8,9 +8,9 @@ LL | let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) }; = note: stack backtrace: 0: std::sys::thread::PLATFORM::Thread::join at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC - 1: std::thread::lifecycle::JoinInner::join + 1: std::thread::lifecycle::JoinInner::<'_, ()>::join at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC - 2: std::thread::JoinHandle::join + 2: std::thread::JoinHandle::<()>::join at RUSTLIB/std/src/thread/join_handle.rs:LL:CC 3: main at tests/fail-dep/concurrency/libc_pthread_rwlock_write_read_deadlock.rs:LL:CC diff --git a/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_rwlock_write_write_deadlock.stderr b/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_rwlock_write_write_deadlock.stderr index 21fa8dcbd18d..2354bdcdbe1d 100644 --- a/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_rwlock_write_write_deadlock.stderr +++ b/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_rwlock_write_write_deadlock.stderr @@ -8,9 +8,9 @@ LL | let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) }; = note: stack backtrace: 0: std::sys::thread::PLATFORM::Thread::join at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC - 1: std::thread::lifecycle::JoinInner::join + 1: std::thread::lifecycle::JoinInner::<'_, ()>::join at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC - 2: std::thread::JoinHandle::join + 2: std::thread::JoinHandle::<()>::join at RUSTLIB/std/src/thread/join_handle.rs:LL:CC 3: main at tests/fail-dep/concurrency/libc_pthread_rwlock_write_write_deadlock.rs:LL:CC diff --git a/src/tools/miri/tests/fail-dep/concurrency/windows_join_detached.stderr b/src/tools/miri/tests/fail-dep/concurrency/windows_join_detached.stderr index 73e79852d63a..77e3bb78ef10 100644 --- a/src/tools/miri/tests/fail-dep/concurrency/windows_join_detached.stderr +++ b/src/tools/miri/tests/fail-dep/concurrency/windows_join_detached.stderr @@ -10,9 +10,9 @@ LL | let rc = unsafe { c::WaitForSingleObject(self.handle.as_raw_handle( = note: stack backtrace: 0: std::sys::thread::PLATFORM::Thread::join at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC - 1: std::thread::lifecycle::JoinInner::join + 1: std::thread::lifecycle::JoinInner::<'_, ()>::join at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC - 2: std::thread::JoinHandle::join + 2: std::thread::JoinHandle::<()>::join at RUSTLIB/std/src/thread/join_handle.rs:LL:CC 3: main at tests/fail-dep/concurrency/windows_join_detached.rs:LL:CC diff --git a/src/tools/miri/tests/fail-dep/concurrency/windows_join_main.stderr b/src/tools/miri/tests/fail-dep/concurrency/windows_join_main.stderr index 2f3e41b405bc..a8015e18eb73 100644 --- a/src/tools/miri/tests/fail-dep/concurrency/windows_join_main.stderr +++ b/src/tools/miri/tests/fail-dep/concurrency/windows_join_main.stderr @@ -8,9 +8,9 @@ LL | let rc = unsafe { c::WaitForSingleObject(self.handle.as_raw_handle( = note: stack backtrace: 0: std::sys::thread::PLATFORM::Thread::join at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC - 1: std::thread::lifecycle::JoinInner::join + 1: std::thread::lifecycle::JoinInner::<'_, ()>::join at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC - 2: std::thread::JoinHandle::join + 2: std::thread::JoinHandle::<()>::join at RUSTLIB/std/src/thread/join_handle.rs:LL:CC 3: main at tests/fail-dep/concurrency/windows_join_main.rs:LL:CC diff --git a/src/tools/miri/tests/fail-dep/concurrency/windows_join_self.stderr b/src/tools/miri/tests/fail-dep/concurrency/windows_join_self.stderr index 8f28324363b3..16290624ca76 100644 --- a/src/tools/miri/tests/fail-dep/concurrency/windows_join_self.stderr +++ b/src/tools/miri/tests/fail-dep/concurrency/windows_join_self.stderr @@ -8,9 +8,9 @@ LL | let rc = unsafe { c::WaitForSingleObject(self.handle.as_raw_handle( = note: stack backtrace: 0: std::sys::thread::PLATFORM::Thread::join at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC - 1: std::thread::lifecycle::JoinInner::join + 1: std::thread::lifecycle::JoinInner::<'_, ()>::join at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC - 2: std::thread::JoinHandle::join + 2: std::thread::JoinHandle::<()>::join at RUSTLIB/std/src/thread/join_handle.rs:LL:CC 3: main at tests/fail-dep/concurrency/windows_join_self.rs:LL:CC diff --git a/src/tools/miri/tests/fail-dep/libc/eventfd_block_read_twice.stderr b/src/tools/miri/tests/fail-dep/libc/eventfd_block_read_twice.stderr index f5cfd35847af..62e8eb422006 100644 --- a/src/tools/miri/tests/fail-dep/libc/eventfd_block_read_twice.stderr +++ b/src/tools/miri/tests/fail-dep/libc/eventfd_block_read_twice.stderr @@ -8,9 +8,9 @@ LL | let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) }; = note: stack backtrace: 0: std::sys::thread::PLATFORM::Thread::join at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC - 1: std::thread::lifecycle::JoinInner::join + 1: std::thread::lifecycle::JoinInner::<'_, ()>::join at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC - 2: std::thread::JoinHandle::join + 2: std::thread::JoinHandle::<()>::join at RUSTLIB/std/src/thread/join_handle.rs:LL:CC 3: main at tests/fail-dep/libc/eventfd_block_read_twice.rs:LL:CC diff --git a/src/tools/miri/tests/fail-dep/libc/eventfd_block_write_twice.stderr b/src/tools/miri/tests/fail-dep/libc/eventfd_block_write_twice.stderr index 92c3fc47c4fd..e87eabad398a 100644 --- a/src/tools/miri/tests/fail-dep/libc/eventfd_block_write_twice.stderr +++ b/src/tools/miri/tests/fail-dep/libc/eventfd_block_write_twice.stderr @@ -8,9 +8,9 @@ LL | let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) }; = note: stack backtrace: 0: std::sys::thread::PLATFORM::Thread::join at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC - 1: std::thread::lifecycle::JoinInner::join + 1: std::thread::lifecycle::JoinInner::<'_, ()>::join at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC - 2: std::thread::JoinHandle::join + 2: std::thread::JoinHandle::<()>::join at RUSTLIB/std/src/thread/join_handle.rs:LL:CC 3: main at tests/fail-dep/libc/eventfd_block_write_twice.rs:LL:CC diff --git a/src/tools/miri/tests/fail-dep/libc/libc_epoll_block_two_thread.stderr b/src/tools/miri/tests/fail-dep/libc/libc_epoll_block_two_thread.stderr index af6578357a59..4f0f9daa3e0e 100644 --- a/src/tools/miri/tests/fail-dep/libc/libc_epoll_block_two_thread.stderr +++ b/src/tools/miri/tests/fail-dep/libc/libc_epoll_block_two_thread.stderr @@ -8,9 +8,9 @@ LL | let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) }; = note: stack backtrace: 0: std::sys::thread::PLATFORM::Thread::join at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC - 1: std::thread::lifecycle::JoinInner::join + 1: std::thread::lifecycle::JoinInner::<'_, ()>::join at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC - 2: std::thread::JoinHandle::join + 2: std::thread::JoinHandle::<()>::join at RUSTLIB/std/src/thread/join_handle.rs:LL:CC 3: main at tests/fail-dep/libc/libc_epoll_block_two_thread.rs:LL:CC diff --git a/src/tools/miri/tests/fail-dep/libc/socketpair-close-while-blocked.stderr b/src/tools/miri/tests/fail-dep/libc/socketpair-close-while-blocked.stderr index b40c35d6d266..886183be7413 100644 --- a/src/tools/miri/tests/fail-dep/libc/socketpair-close-while-blocked.stderr +++ b/src/tools/miri/tests/fail-dep/libc/socketpair-close-while-blocked.stderr @@ -8,9 +8,9 @@ LL | let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) }; = note: stack backtrace: 0: std::sys::thread::PLATFORM::Thread::join at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC - 1: std::thread::lifecycle::JoinInner::join + 1: std::thread::lifecycle::JoinInner::<'_, ()>::join at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC - 2: std::thread::JoinHandle::join + 2: std::thread::JoinHandle::<()>::join at RUSTLIB/std/src/thread/join_handle.rs:LL:CC 3: main at tests/fail-dep/libc/socketpair-close-while-blocked.rs:LL:CC diff --git a/src/tools/miri/tests/fail-dep/libc/socketpair_block_read_twice.stderr b/src/tools/miri/tests/fail-dep/libc/socketpair_block_read_twice.stderr index d649076374f5..9c047878d401 100644 --- a/src/tools/miri/tests/fail-dep/libc/socketpair_block_read_twice.stderr +++ b/src/tools/miri/tests/fail-dep/libc/socketpair_block_read_twice.stderr @@ -8,9 +8,9 @@ LL | let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) }; = note: stack backtrace: 0: std::sys::thread::PLATFORM::Thread::join at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC - 1: std::thread::lifecycle::JoinInner::join + 1: std::thread::lifecycle::JoinInner::<'_, ()>::join at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC - 2: std::thread::JoinHandle::join + 2: std::thread::JoinHandle::<()>::join at RUSTLIB/std/src/thread/join_handle.rs:LL:CC 3: main at tests/fail-dep/libc/socketpair_block_read_twice.rs:LL:CC diff --git a/src/tools/miri/tests/fail-dep/libc/socketpair_block_write_twice.stderr b/src/tools/miri/tests/fail-dep/libc/socketpair_block_write_twice.stderr index 66f3359a1292..b39addc3ce7b 100644 --- a/src/tools/miri/tests/fail-dep/libc/socketpair_block_write_twice.stderr +++ b/src/tools/miri/tests/fail-dep/libc/socketpair_block_write_twice.stderr @@ -8,9 +8,9 @@ LL | let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) }; = note: stack backtrace: 0: std::sys::thread::PLATFORM::Thread::join at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC - 1: std::thread::lifecycle::JoinInner::join + 1: std::thread::lifecycle::JoinInner::<'_, ()>::join at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC - 2: std::thread::JoinHandle::join + 2: std::thread::JoinHandle::<()>::join at RUSTLIB/std/src/thread/join_handle.rs:LL:CC 3: main at tests/fail-dep/libc/socketpair_block_write_twice.rs:LL:CC diff --git a/src/tools/miri/tests/fail/alloc/alloc_error_handler.stderr b/src/tools/miri/tests/fail/alloc/alloc_error_handler.stderr index ed9b7ad18b0f..e99c0fc99bd9 100644 --- a/src/tools/miri/tests/fail/alloc/alloc_error_handler.stderr +++ b/src/tools/miri/tests/fail/alloc/alloc_error_handler.stderr @@ -10,7 +10,7 @@ LL | crate::process::abort() = note: stack backtrace: 0: std::alloc::rust_oom::{closure#0} at RUSTLIB/std/src/alloc.rs:LL:CC - 1: std::sys::backtrace::__rust_end_short_backtrace + 1: std::sys::backtrace::__rust_end_short_backtrace::<{closure@std::alloc::rust_oom::{closure#0}}, !> at RUSTLIB/std/src/sys/backtrace.rs:LL:CC 2: std::alloc::rust_oom at RUSTLIB/std/src/alloc.rs:LL:CC diff --git a/src/tools/miri/tests/fail/alloc/global_system_mixup.stderr b/src/tools/miri/tests/fail/alloc/global_system_mixup.stderr index 4214e3e7675b..1e9d859b5cf8 100644 --- a/src/tools/miri/tests/fail/alloc/global_system_mixup.stderr +++ b/src/tools/miri/tests/fail/alloc/global_system_mixup.stderr @@ -7,7 +7,7 @@ LL | FREE(); = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information = note: stack backtrace: - 0: std::sys::alloc::PLATFORM::dealloc + 0: std::sys::alloc::PLATFORM::::dealloc at RUSTLIB/std/src/sys/alloc/PLATFORM.rs:LL:CC 1: ::deallocate at RUSTLIB/std/src/alloc.rs:LL:CC diff --git a/src/tools/miri/tests/fail/alloc/stack_free.stderr b/src/tools/miri/tests/fail/alloc/stack_free.stderr index 043c4a680f27..70fc61964df5 100644 --- a/src/tools/miri/tests/fail/alloc/stack_free.stderr +++ b/src/tools/miri/tests/fail/alloc/stack_free.stderr @@ -9,9 +9,9 @@ LL | self.1.deallocate(From::from(ptr.cast()), layout); = note: stack backtrace: 0: as std::ops::Drop>::drop at RUSTLIB/alloc/src/boxed.rs:LL:CC - 1: std::ptr::drop_glue)) + 1: std::ptr::drop_glue::> - shim(Some(std::boxed::Box)) at RUSTLIB/core/src/ptr/mod.rs:LL:CC - 2: std::mem::drop + 2: std::mem::drop::> at RUSTLIB/core/src/mem/mod.rs:LL:CC 3: main at tests/fail/alloc/stack_free.rs:LL:CC diff --git a/src/tools/miri/tests/fail/both_borrows/aliasing_mut4.tree.stderr b/src/tools/miri/tests/fail/both_borrows/aliasing_mut4.tree.stderr index 70a96197b00a..a033065613fc 100644 --- a/src/tools/miri/tests/fail/both_borrows/aliasing_mut4.tree.stderr +++ b/src/tools/miri/tests/fail/both_borrows/aliasing_mut4.tree.stderr @@ -20,11 +20,11 @@ help: the protected tag was created here, in the initial state Frozen LL | fn safe(x: &i32, y: &mut Cell) { | ^ = note: stack backtrace: - 0: std::mem::replace + 0: std::mem::replace:: at RUSTLIB/core/src/mem/mod.rs:LL:CC - 1: std::cell::Cell::replace + 1: std::cell::Cell::::replace at RUSTLIB/core/src/cell.rs:LL:CC - 2: std::cell::Cell::set + 2: std::cell::Cell::::set at RUSTLIB/core/src/cell.rs:LL:CC 3: safe at tests/fail/both_borrows/aliasing_mut4.rs:LL:CC diff --git a/src/tools/miri/tests/fail/both_borrows/buggy_split_at_mut.stack.stderr b/src/tools/miri/tests/fail/both_borrows/buggy_split_at_mut.stack.stderr index 7a34e7d4e991..b3de50d94f55 100644 --- a/src/tools/miri/tests/fail/both_borrows/buggy_split_at_mut.stack.stderr +++ b/src/tools/miri/tests/fail/both_borrows/buggy_split_at_mut.stack.stderr @@ -23,7 +23,7 @@ help: was later invalidated at offsets [0x0..0x10] by a Unique retag LL | from_raw_parts_mut(ptr.offset(mid as isize), len - mid), | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ = note: stack backtrace: - 0: safe::split_at_mut + 0: safe::split_at_mut:: at tests/fail/both_borrows/buggy_split_at_mut.rs:LL:CC 1: main at tests/fail/both_borrows/buggy_split_at_mut.rs:LL:CC diff --git a/src/tools/miri/tests/fail/both_borrows/drop_in_place_protector.stack.stderr b/src/tools/miri/tests/fail/both_borrows/drop_in_place_protector.stack.stderr index 17b704ce8038..586dcdf8515d 100644 --- a/src/tools/miri/tests/fail/both_borrows/drop_in_place_protector.stack.stderr +++ b/src/tools/miri/tests/fail/both_borrows/drop_in_place_protector.stack.stderr @@ -19,11 +19,11 @@ LL | core::ptr::drop_in_place(x); = note: stack backtrace: 0: ::drop at tests/fail/both_borrows/drop_in_place_protector.rs:LL:CC - 1: std::ptr::drop_glue - shim(Some(HasDrop)) + 1: std::ptr::drop_glue:: - shim(Some(HasDrop)) at RUSTLIB/core/src/ptr/mod.rs:LL:CC - 2: std::ptr::drop_glue - shim(Some((HasDrop, u8))) + 2: std::ptr::drop_glue::<(HasDrop, u8)> - shim(Some((HasDrop, u8))) at RUSTLIB/core/src/ptr/mod.rs:LL:CC - 3: std::ptr::drop_in_place + 3: std::ptr::drop_in_place::<(HasDrop, u8)> at RUSTLIB/core/src/ptr/mod.rs:LL:CC 4: main at tests/fail/both_borrows/drop_in_place_protector.rs:LL:CC diff --git a/src/tools/miri/tests/fail/both_borrows/drop_in_place_protector.tree.stderr b/src/tools/miri/tests/fail/both_borrows/drop_in_place_protector.tree.stderr index 61413c8551a8..867711bc6741 100644 --- a/src/tools/miri/tests/fail/both_borrows/drop_in_place_protector.tree.stderr +++ b/src/tools/miri/tests/fail/both_borrows/drop_in_place_protector.tree.stderr @@ -22,11 +22,11 @@ LL | core::ptr::drop_in_place(x); = note: stack backtrace: 0: ::drop at tests/fail/both_borrows/drop_in_place_protector.rs:LL:CC - 1: std::ptr::drop_glue - shim(Some(HasDrop)) + 1: std::ptr::drop_glue:: - shim(Some(HasDrop)) at RUSTLIB/core/src/ptr/mod.rs:LL:CC - 2: std::ptr::drop_glue - shim(Some((HasDrop, u8))) + 2: std::ptr::drop_glue::<(HasDrop, u8)> - shim(Some((HasDrop, u8))) at RUSTLIB/core/src/ptr/mod.rs:LL:CC - 3: std::ptr::drop_in_place + 3: std::ptr::drop_in_place::<(HasDrop, u8)> at RUSTLIB/core/src/ptr/mod.rs:LL:CC 4: main at tests/fail/both_borrows/drop_in_place_protector.rs:LL:CC diff --git a/src/tools/miri/tests/fail/both_borrows/newtype_pair_retagging.stack.stderr b/src/tools/miri/tests/fail/both_borrows/newtype_pair_retagging.stack.stderr index d7688680e7da..2f10e7df418f 100644 --- a/src/tools/miri/tests/fail/both_borrows/newtype_pair_retagging.stack.stderr +++ b/src/tools/miri/tests/fail/both_borrows/newtype_pair_retagging.stack.stderr @@ -17,13 +17,13 @@ help: is this argument LL | fn dealloc_while_running(_n: Newtype<'_>, dealloc: impl FnOnce()) { | ^^ = note: stack backtrace: - 0: std::boxed::Box::from_raw_in + 0: std::boxed::Box::::from_raw_in at RUSTLIB/alloc/src/boxed.rs:LL:CC - 1: std::boxed::Box::from_raw + 1: std::boxed::Box::::from_raw at RUSTLIB/alloc/src/boxed.rs:LL:CC 2: main::{closure#0} at tests/fail/both_borrows/newtype_pair_retagging.rs:LL:CC - 3: dealloc_while_running + 3: dealloc_while_running::<{closure@tests/fail/both_borrows/newtype_pair_retagging.rs:LL:CC}> at tests/fail/both_borrows/newtype_pair_retagging.rs:LL:CC 4: main at tests/fail/both_borrows/newtype_pair_retagging.rs:LL:CC diff --git a/src/tools/miri/tests/fail/both_borrows/newtype_pair_retagging.tree.stderr b/src/tools/miri/tests/fail/both_borrows/newtype_pair_retagging.tree.stderr index e84fa4281d13..58c43ebe4aee 100644 --- a/src/tools/miri/tests/fail/both_borrows/newtype_pair_retagging.tree.stderr +++ b/src/tools/miri/tests/fail/both_borrows/newtype_pair_retagging.tree.stderr @@ -28,13 +28,13 @@ LL | || drop(Box::from_raw(ptr)), = note: stack backtrace: 0: as std::ops::Drop>::drop at RUSTLIB/alloc/src/boxed.rs:LL:CC - 1: std::ptr::drop_glue)) + 1: std::ptr::drop_glue::> - shim(Some(std::boxed::Box)) at RUSTLIB/core/src/ptr/mod.rs:LL:CC - 2: std::mem::drop + 2: std::mem::drop::> at RUSTLIB/core/src/mem/mod.rs:LL:CC 3: main::{closure#0} at tests/fail/both_borrows/newtype_pair_retagging.rs:LL:CC - 4: dealloc_while_running + 4: dealloc_while_running::<{closure@tests/fail/both_borrows/newtype_pair_retagging.rs:LL:CC}> at tests/fail/both_borrows/newtype_pair_retagging.rs:LL:CC 5: main at tests/fail/both_borrows/newtype_pair_retagging.rs:LL:CC diff --git a/src/tools/miri/tests/fail/both_borrows/newtype_retagging.stack.stderr b/src/tools/miri/tests/fail/both_borrows/newtype_retagging.stack.stderr index b7b0f2812669..a173cf25e9e7 100644 --- a/src/tools/miri/tests/fail/both_borrows/newtype_retagging.stack.stderr +++ b/src/tools/miri/tests/fail/both_borrows/newtype_retagging.stack.stderr @@ -17,13 +17,13 @@ help: is this argument LL | fn dealloc_while_running(_n: Newtype<'_>, dealloc: impl FnOnce()) { | ^^ = note: stack backtrace: - 0: std::boxed::Box::from_raw_in + 0: std::boxed::Box::::from_raw_in at RUSTLIB/alloc/src/boxed.rs:LL:CC - 1: std::boxed::Box::from_raw + 1: std::boxed::Box::::from_raw at RUSTLIB/alloc/src/boxed.rs:LL:CC 2: main::{closure#0} at tests/fail/both_borrows/newtype_retagging.rs:LL:CC - 3: dealloc_while_running + 3: dealloc_while_running::<{closure@tests/fail/both_borrows/newtype_retagging.rs:LL:CC}> at tests/fail/both_borrows/newtype_retagging.rs:LL:CC 4: main at tests/fail/both_borrows/newtype_retagging.rs:LL:CC diff --git a/src/tools/miri/tests/fail/both_borrows/newtype_retagging.tree.stderr b/src/tools/miri/tests/fail/both_borrows/newtype_retagging.tree.stderr index 1151a44410cc..a5b66643144e 100644 --- a/src/tools/miri/tests/fail/both_borrows/newtype_retagging.tree.stderr +++ b/src/tools/miri/tests/fail/both_borrows/newtype_retagging.tree.stderr @@ -28,13 +28,13 @@ LL | || drop(Box::from_raw(ptr)), = note: stack backtrace: 0: as std::ops::Drop>::drop at RUSTLIB/alloc/src/boxed.rs:LL:CC - 1: std::ptr::drop_glue)) + 1: std::ptr::drop_glue::> - shim(Some(std::boxed::Box)) at RUSTLIB/core/src/ptr/mod.rs:LL:CC - 2: std::mem::drop + 2: std::mem::drop::> at RUSTLIB/core/src/mem/mod.rs:LL:CC 3: main::{closure#0} at tests/fail/both_borrows/newtype_retagging.rs:LL:CC - 4: dealloc_while_running + 4: dealloc_while_running::<{closure@tests/fail/both_borrows/newtype_retagging.rs:LL:CC}> at tests/fail/both_borrows/newtype_retagging.rs:LL:CC 5: main at tests/fail/both_borrows/newtype_retagging.rs:LL:CC diff --git a/src/tools/miri/tests/fail/coroutine-pinned-moved.stderr b/src/tools/miri/tests/fail/coroutine-pinned-moved.stderr index 0c57c6894a08..7998db2424b3 100644 --- a/src/tools/miri/tests/fail/coroutine-pinned-moved.stderr +++ b/src/tools/miri/tests/fail/coroutine-pinned-moved.stderr @@ -21,7 +21,7 @@ LL | }; // *deallocate* coroutine_iterator at tests/fail/coroutine-pinned-moved.rs:LL:CC 1: as std::iter::Iterator>::next at tests/fail/coroutine-pinned-moved.rs:LL:CC - 2: std::boxed::iter::next + 2: std::boxed::iter::>>::next at RUSTLIB/alloc/src/boxed/iter.rs:LL:CC 3: main at tests/fail/coroutine-pinned-moved.rs:LL:CC diff --git a/src/tools/miri/tests/fail/memleak_rc.stderr b/src/tools/miri/tests/fail/memleak_rc.stderr index 91097a99117f..2c22367f5246 100644 --- a/src/tools/miri/tests/fail/memleak_rc.stderr +++ b/src/tools/miri/tests/fail/memleak_rc.stderr @@ -5,7 +5,7 @@ LL | Box::leak(Box::new(RcInner { strong: Cell::new(1), weak: Ce | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = note: stack backtrace: - 0: std::rc::Rc::new + 0: std::rc::Rc::>>::new at RUSTLIB/alloc/src/rc.rs:LL:CC 1: main at tests/fail/memleak_rc.rs:LL:CC diff --git a/src/tools/miri/tests/fail/panic/bad_unwind.stderr b/src/tools/miri/tests/fail/panic/bad_unwind.stderr index d47f7b5b10c1..cde80858d0fd 100644 --- a/src/tools/miri/tests/fail/panic/bad_unwind.stderr +++ b/src/tools/miri/tests/fail/panic/bad_unwind.stderr @@ -14,11 +14,11 @@ LL | std::panic::catch_unwind(|| unwind()).unwrap_err(); = note: stack backtrace: 0: main::{closure#0} at tests/fail/panic/bad_unwind.rs:LL:CC - 1: std::panicking::catch_unwind::do_call + 1: std::panicking::catch_unwind::do_call::<{closure@tests/fail/panic/bad_unwind.rs:LL:CC}, ()> at RUSTLIB/std/src/panicking.rs:LL:CC - 2: std::panicking::catch_unwind + 2: std::panicking::catch_unwind::<(), {closure@tests/fail/panic/bad_unwind.rs:LL:CC}> at RUSTLIB/std/src/panicking.rs:LL:CC - 3: std::panic::catch_unwind + 3: std::panic::catch_unwind::<{closure@tests/fail/panic/bad_unwind.rs:LL:CC}, ()> at RUSTLIB/std/src/panic.rs:LL:CC 4: main at tests/fail/panic/bad_unwind.rs:LL:CC diff --git a/src/tools/miri/tests/fail/panic/panic_abort1.stderr b/src/tools/miri/tests/fail/panic/panic_abort1.stderr index 4135ceadc539..079eb4117b06 100644 --- a/src/tools/miri/tests/fail/panic/panic_abort1.stderr +++ b/src/tools/miri/tests/fail/panic/panic_abort1.stderr @@ -20,7 +20,7 @@ LL | crate::process::abort(); at RUSTLIB/std/src/panicking.rs:LL:CC 4: std::panicking::panic_handler::{closure#0} at RUSTLIB/std/src/panicking.rs:LL:CC - 5: std::sys::backtrace::__rust_end_short_backtrace + 5: std::sys::backtrace::__rust_end_short_backtrace::<{closure@std::panicking::panic_handler::{closure#0}}, !> at RUSTLIB/std/src/sys/backtrace.rs:LL:CC 6: std::panicking::panic_handler at RUSTLIB/std/src/panicking.rs:LL:CC diff --git a/src/tools/miri/tests/fail/panic/panic_abort2.stderr b/src/tools/miri/tests/fail/panic/panic_abort2.stderr index 5b485604037c..5437fa077a0a 100644 --- a/src/tools/miri/tests/fail/panic/panic_abort2.stderr +++ b/src/tools/miri/tests/fail/panic/panic_abort2.stderr @@ -20,7 +20,7 @@ LL | crate::process::abort(); at RUSTLIB/std/src/panicking.rs:LL:CC 4: std::panicking::panic_handler::{closure#0} at RUSTLIB/std/src/panicking.rs:LL:CC - 5: std::sys::backtrace::__rust_end_short_backtrace + 5: std::sys::backtrace::__rust_end_short_backtrace::<{closure@std::panicking::panic_handler::{closure#0}}, !> at RUSTLIB/std/src/sys/backtrace.rs:LL:CC 6: std::panicking::panic_handler at RUSTLIB/std/src/panicking.rs:LL:CC diff --git a/src/tools/miri/tests/fail/panic/panic_abort3.stderr b/src/tools/miri/tests/fail/panic/panic_abort3.stderr index e4179f93f931..022515ebecfd 100644 --- a/src/tools/miri/tests/fail/panic/panic_abort3.stderr +++ b/src/tools/miri/tests/fail/panic/panic_abort3.stderr @@ -20,7 +20,7 @@ LL | crate::process::abort(); at RUSTLIB/std/src/panicking.rs:LL:CC 4: std::panicking::panic_handler::{closure#0} at RUSTLIB/std/src/panicking.rs:LL:CC - 5: std::sys::backtrace::__rust_end_short_backtrace + 5: std::sys::backtrace::__rust_end_short_backtrace::<{closure@std::panicking::panic_handler::{closure#0}}, !> at RUSTLIB/std/src/sys/backtrace.rs:LL:CC 6: std::panicking::panic_handler at RUSTLIB/std/src/panicking.rs:LL:CC diff --git a/src/tools/miri/tests/fail/panic/panic_abort4.stderr b/src/tools/miri/tests/fail/panic/panic_abort4.stderr index d2e50b87068f..a39037d52855 100644 --- a/src/tools/miri/tests/fail/panic/panic_abort4.stderr +++ b/src/tools/miri/tests/fail/panic/panic_abort4.stderr @@ -20,7 +20,7 @@ LL | crate::process::abort(); at RUSTLIB/std/src/panicking.rs:LL:CC 4: std::panicking::panic_handler::{closure#0} at RUSTLIB/std/src/panicking.rs:LL:CC - 5: std::sys::backtrace::__rust_end_short_backtrace + 5: std::sys::backtrace::__rust_end_short_backtrace::<{closure@std::panicking::panic_handler::{closure#0}}, !> at RUSTLIB/std/src/sys/backtrace.rs:LL:CC 6: std::panicking::panic_handler at RUSTLIB/std/src/panicking.rs:LL:CC diff --git a/src/tools/miri/tests/fail/shims/fs/isolated_file.stderr b/src/tools/miri/tests/fail/shims/fs/isolated_file.stderr index 09501f98a9aa..5012e4c7ca8d 100644 --- a/src/tools/miri/tests/fail/shims/fs/isolated_file.stderr +++ b/src/tools/miri/tests/fail/shims/fs/isolated_file.stderr @@ -9,25 +9,25 @@ LL | let fd = cvt_r(|| unsafe { open64(path.as_ptr(), flags, opts.mode a = note: stack backtrace: 0: std::sys::fs::PLATFORM::File::open_c::{closure#0} at RUSTLIB/std/src/sys/fs/PLATFORM.rs:LL:CC - 1: std::sys::pal::PLATFORM::cvt_r + 1: std::sys::pal::PLATFORM::cvt_r:: at RUSTLIB/std/src/sys/pal/PLATFORM/mod.rs:LL:CC 2: std::sys::fs::PLATFORM::File::open_c at RUSTLIB/std/src/sys/fs/PLATFORM.rs:LL:CC 3: std::sys::fs::PLATFORM::File::open::{closure#0} at RUSTLIB/std/src/sys/fs/PLATFORM.rs:LL:CC - 4: std::sys::helpers::small_c_string::run_with_cstr_stack + 4: std::sys::helpers::small_c_string::run_with_cstr_stack:: at RUSTLIB/std/src/sys/helpers/small_c_string.rs:LL:CC - 5: std::sys::helpers::small_c_string::run_with_cstr + 5: std::sys::helpers::small_c_string::run_with_cstr:: at RUSTLIB/std/src/sys/helpers/small_c_string.rs:LL:CC - 6: std::sys::helpers::small_c_string::run_path_with_cstr + 6: std::sys::helpers::small_c_string::run_path_with_cstr:: at RUSTLIB/std/src/sys/helpers/small_c_string.rs:LL:CC 7: std::sys::fs::PLATFORM::File::open at RUSTLIB/std/src/sys/fs/PLATFORM.rs:LL:CC 8: std::fs::OpenOptions::_open at RUSTLIB/std/src/fs.rs:LL:CC - 9: std::fs::OpenOptions::open + 9: std::fs::OpenOptions::open::<&std::path::Path> at RUSTLIB/std/src/fs.rs:LL:CC - 10: std::fs::File::open + 10: std::fs::File::open::<&str> at RUSTLIB/std/src/fs.rs:LL:CC 11: main at tests/fail/shims/fs/isolated_file.rs:LL:CC diff --git a/src/tools/miri/tests/fail/stacked_borrows/deallocate_against_protector1.stderr b/src/tools/miri/tests/fail/stacked_borrows/deallocate_against_protector1.stderr index 1d9bfe544068..9f0df14ee4dd 100644 --- a/src/tools/miri/tests/fail/stacked_borrows/deallocate_against_protector1.stderr +++ b/src/tools/miri/tests/fail/stacked_borrows/deallocate_against_protector1.stderr @@ -9,9 +9,9 @@ LL | self.1.deallocate(From::from(ptr.cast()), layout); = note: stack backtrace: 0: as std::ops::Drop>::drop at RUSTLIB/alloc/src/boxed.rs:LL:CC - 1: std::ptr::drop_glue)) + 1: std::ptr::drop_glue::> - shim(Some(std::boxed::Box)) at RUSTLIB/core/src/ptr/mod.rs:LL:CC - 2: std::mem::drop + 2: std::mem::drop::> at RUSTLIB/core/src/mem/mod.rs:LL:CC 3: main::{closure#0} at tests/fail/stacked_borrows/deallocate_against_protector1.rs:LL:CC diff --git a/src/tools/miri/tests/fail/stacked_borrows/drop_in_place_retag.stderr b/src/tools/miri/tests/fail/stacked_borrows/drop_in_place_retag.stderr index 96e31615c20e..c9a3c93916fd 100644 --- a/src/tools/miri/tests/fail/stacked_borrows/drop_in_place_retag.stderr +++ b/src/tools/miri/tests/fail/stacked_borrows/drop_in_place_retag.stderr @@ -12,7 +12,7 @@ help: was created by a SharedReadOnly retag at offsets [0x0..0x1] LL | let x = core::ptr::addr_of!(x); | ^^^^^^^^^^^^^^^^^^^^^^ = note: stack backtrace: - 0: std::ptr::drop_in_place + 0: std::ptr::drop_in_place:: at RUSTLIB/core/src/ptr/mod.rs:LL:CC 1: main at tests/fail/stacked_borrows/drop_in_place_retag.rs:LL:CC diff --git a/src/tools/miri/tests/fail/tail_calls/cc-mismatch.stderr b/src/tools/miri/tests/fail/tail_calls/cc-mismatch.stderr index c7e471f570c8..a9440caa3e3b 100644 --- a/src/tools/miri/tests/fail/tail_calls/cc-mismatch.stderr +++ b/src/tools/miri/tests/fail/tail_calls/cc-mismatch.stderr @@ -9,29 +9,29 @@ LL | extern "rust-call" fn call_once(self, args: Args) -> Self::Output; = note: stack backtrace: 0: >::call_once - shim(fn()) at RUSTLIB/core/src/ops/function.rs:LL:CC - 1: std::sys::backtrace::__rust_begin_short_backtrace + 1: std::sys::backtrace::__rust_begin_short_backtrace:: at RUSTLIB/std/src/sys/backtrace.rs:LL:CC - 2: std::rt::lang_start::{closure#0} + 2: std::rt::lang_start::<()>::{closure#0} at RUSTLIB/std/src/rt.rs:LL:CC - 3: std::ops::function::impls::call_once + 3: std::ops::function::impls:: for &dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe>::call_once at RUSTLIB/core/src/ops/function.rs:LL:CC - 4: std::panicking::catch_unwind::do_call + 4: std::panicking::catch_unwind::do_call::<&dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe, i32> at RUSTLIB/std/src/panicking.rs:LL:CC - 5: std::panicking::catch_unwind + 5: std::panicking::catch_unwind:: i32 + std::marker::Sync + std::panic::RefUnwindSafe> at RUSTLIB/std/src/panicking.rs:LL:CC - 6: std::panic::catch_unwind + 6: std::panic::catch_unwind::<&dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe, i32> at RUSTLIB/std/src/panic.rs:LL:CC 7: std::rt::lang_start_internal::{closure#0} at RUSTLIB/std/src/rt.rs:LL:CC - 8: std::panicking::catch_unwind::do_call + 8: std::panicking::catch_unwind::do_call::<{closure@std::rt::lang_start_internal::{closure#0}}, isize> at RUSTLIB/std/src/panicking.rs:LL:CC - 9: std::panicking::catch_unwind + 9: std::panicking::catch_unwind:: at RUSTLIB/std/src/panicking.rs:LL:CC - 10: std::panic::catch_unwind + 10: std::panic::catch_unwind::<{closure@std::rt::lang_start_internal::{closure#0}}, isize> at RUSTLIB/std/src/panic.rs:LL:CC 11: std::rt::lang_start_internal at RUSTLIB/std/src/rt.rs:LL:CC - 12: std::rt::lang_start + 12: std::rt::lang_start::<()> at RUSTLIB/std/src/rt.rs:LL:CC error: aborting due to 1 previous error diff --git a/src/tools/miri/tests/fail/tls_macro_leak.stderr b/src/tools/miri/tests/fail/tls_macro_leak.stderr index 3f8240f44547..135dde879b9e 100644 --- a/src/tools/miri/tests/fail/tls_macro_leak.stderr +++ b/src/tools/miri/tests/fail/tls_macro_leak.stderr @@ -7,9 +7,9 @@ LL | cell.set(Some(Box::leak(Box::new(123)))); = note: stack backtrace: 0: main::{closure#0}::{closure#0} at tests/fail/tls_macro_leak.rs:LL:CC - 1: std::thread::LocalKey::>>::try_with + 1: std::thread::LocalKey::>>::try_with::<{closure@tests/fail/tls_macro_leak.rs:LL:CC}, ()> at RUSTLIB/std/src/thread/local.rs:LL:CC - 2: std::thread::LocalKey::>>::with + 2: std::thread::LocalKey::>>::with::<{closure@tests/fail/tls_macro_leak.rs:LL:CC}, ()> at RUSTLIB/std/src/thread/local.rs:LL:CC 3: main::{closure#0} at tests/fail/tls_macro_leak.rs:LL:CC diff --git a/src/tools/miri/tests/fail/tree_borrows/implicit_writes/ptr_write.stderr b/src/tools/miri/tests/fail/tree_borrows/implicit_writes/ptr_write.stderr index e88e13104815..baec37b17f02 100644 --- a/src/tools/miri/tests/fail/tree_borrows/implicit_writes/ptr_write.stderr +++ b/src/tools/miri/tests/fail/tree_borrows/implicit_writes/ptr_write.stderr @@ -20,7 +20,7 @@ help: the protected tag was created here, in the initial state Reserved LL | fn dereference(x: T, y: *mut u8) -> T { | ^ = note: stack backtrace: - 0: dereference + 0: dereference::<&mut u8> at tests/fail/tree_borrows/implicit_writes/ptr_write.rs:LL:CC 1: main at tests/fail/tree_borrows/implicit_writes/ptr_write.rs:LL:CC diff --git a/src/tools/miri/tests/fail/tree_borrows/implicit_writes/ptr_write_box.stderr b/src/tools/miri/tests/fail/tree_borrows/implicit_writes/ptr_write_box.stderr index 9951fd56ada0..9e0bc972dce4 100644 --- a/src/tools/miri/tests/fail/tree_borrows/implicit_writes/ptr_write_box.stderr +++ b/src/tools/miri/tests/fail/tree_borrows/implicit_writes/ptr_write_box.stderr @@ -20,7 +20,7 @@ help: the protected tag was created here, in the initial state Reserved LL | fn dereference(x: T, y: *mut u8) -> T { | ^ = note: stack backtrace: - 0: dereference + 0: dereference::> at tests/fail/tree_borrows/implicit_writes/ptr_write_box.rs:LL:CC 1: main at tests/fail/tree_borrows/implicit_writes/ptr_write_box.rs:LL:CC diff --git a/src/tools/miri/tests/fail/tree_borrows/implicit_writes/ptr_write_unsafe_cell.stderr b/src/tools/miri/tests/fail/tree_borrows/implicit_writes/ptr_write_unsafe_cell.stderr index 87cf0c8ba2de..bb65e846ebe3 100644 --- a/src/tools/miri/tests/fail/tree_borrows/implicit_writes/ptr_write_unsafe_cell.stderr +++ b/src/tools/miri/tests/fail/tree_borrows/implicit_writes/ptr_write_unsafe_cell.stderr @@ -20,7 +20,7 @@ help: the protected tag was created here, in the initial state Reserved LL | fn dereference(x: T, y: *mut u8) -> T { | ^ = note: stack backtrace: - 0: dereference + 0: dereference::<&mut std::cell::UnsafeCell> at tests/fail/tree_borrows/implicit_writes/ptr_write_unsafe_cell.rs:LL:CC 1: main at tests/fail/tree_borrows/implicit_writes/ptr_write_unsafe_cell.rs:LL:CC diff --git a/src/tools/miri/tests/fail/tree_borrows/strongly-protected.stderr b/src/tools/miri/tests/fail/tree_borrows/strongly-protected.stderr index d2a11659460e..9af0414ce606 100644 --- a/src/tools/miri/tests/fail/tree_borrows/strongly-protected.stderr +++ b/src/tools/miri/tests/fail/tree_borrows/strongly-protected.stderr @@ -21,9 +21,9 @@ LL | fn inner(x: &mut i32, f: fn(*mut i32)) { = note: stack backtrace: 0: as std::ops::Drop>::drop at RUSTLIB/alloc/src/boxed.rs:LL:CC - 1: std::ptr::drop_glue)) + 1: std::ptr::drop_glue::> - shim(Some(std::boxed::Box)) at RUSTLIB/core/src/ptr/mod.rs:LL:CC - 2: std::mem::drop + 2: std::mem::drop::> at RUSTLIB/core/src/mem/mod.rs:LL:CC 3: main::{closure#0} at tests/fail/tree_borrows/strongly-protected.rs:LL:CC diff --git a/src/tools/miri/tests/fail/tree_borrows/wildcard/strongly_protected_wildcard.stderr b/src/tools/miri/tests/fail/tree_borrows/wildcard/strongly_protected_wildcard.stderr index c192c2d00d08..e6c68dd3de92 100644 --- a/src/tools/miri/tests/fail/tree_borrows/wildcard/strongly_protected_wildcard.stderr +++ b/src/tools/miri/tests/fail/tree_borrows/wildcard/strongly_protected_wildcard.stderr @@ -21,9 +21,9 @@ LL | fn inner(x: &mut i32, f: fn(usize)) { = note: stack backtrace: 0: as std::ops::Drop>::drop at RUSTLIB/alloc/src/boxed.rs:LL:CC - 1: std::ptr::drop_glue)) + 1: std::ptr::drop_glue::> - shim(Some(std::boxed::Box)) at RUSTLIB/core/src/ptr/mod.rs:LL:CC - 2: std::mem::drop + 2: std::mem::drop::> at RUSTLIB/core/src/mem/mod.rs:LL:CC 3: main::{closure#0} at tests/fail/tree_borrows/wildcard/strongly_protected_wildcard.rs:LL:CC diff --git a/src/tools/miri/tests/fail/unaligned_pointers/drop_in_place.stderr b/src/tools/miri/tests/fail/unaligned_pointers/drop_in_place.stderr index 603d582cde80..52096d5c7ecd 100644 --- a/src/tools/miri/tests/fail/unaligned_pointers/drop_in_place.stderr +++ b/src/tools/miri/tests/fail/unaligned_pointers/drop_in_place.stderr @@ -7,7 +7,7 @@ LL | unsafe { drop_glue(&mut *to_drop) } = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information = note: stack backtrace: - 0: std::ptr::drop_in_place + 0: std::ptr::drop_in_place:: at RUSTLIB/core/src/ptr/mod.rs:LL:CC 1: main at tests/fail/unaligned_pointers/drop_in_place.rs:LL:CC diff --git a/src/tools/miri/tests/fail/unaligned_pointers/reference_to_packed.stderr b/src/tools/miri/tests/fail/unaligned_pointers/reference_to_packed.stderr index d8252e51ae84..28ed982a0864 100644 --- a/src/tools/miri/tests/fail/unaligned_pointers/reference_to_packed.stderr +++ b/src/tools/miri/tests/fail/unaligned_pointers/reference_to_packed.stderr @@ -7,7 +7,7 @@ LL | mem::transmute(x) = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information = note: stack backtrace: - 0: raw_to_ref + 0: raw_to_ref::<'_, i32> at tests/fail/unaligned_pointers/reference_to_packed.rs:LL:CC 1: main at tests/fail/unaligned_pointers/reference_to_packed.rs:LL:CC diff --git a/src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic.stderr b/src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic.stderr index e0caff6a21a9..26d5ffa62812 100644 --- a/src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic.stderr +++ b/src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic.stderr @@ -9,7 +9,7 @@ LL | let mut order = unsafe { compare_bytes(left, right, len) as isize } = note: stack backtrace: 0: ::compare at RUSTLIB/core/src/slice/cmp.rs:LL:CC - 1: core::slice::cmp::cmp + 1: core::slice::cmp::::cmp at RUSTLIB/core/src/slice/cmp.rs:LL:CC 2: main at tests/fail/uninit/uninit_alloc_diagnostic.rs:LL:CC diff --git a/src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic_with_provenance.stderr b/src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic_with_provenance.stderr index 28609ddec6a1..4e532293410e 100644 --- a/src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic_with_provenance.stderr +++ b/src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic_with_provenance.stderr @@ -9,7 +9,7 @@ LL | let mut order = unsafe { compare_bytes(left, right, len) as isize } = note: stack backtrace: 0: ::compare at RUSTLIB/core/src/slice/cmp.rs:LL:CC - 1: core::slice::cmp::cmp + 1: core::slice::cmp::::cmp at RUSTLIB/core/src/slice/cmp.rs:LL:CC 2: main at tests/fail/uninit/uninit_alloc_diagnostic_with_provenance.rs:LL:CC diff --git a/src/tools/miri/tests/genmc/fail/atomics/atomic_ptr_double_free.stderr b/src/tools/miri/tests/genmc/fail/atomics/atomic_ptr_double_free.stderr index 2ba64ac032a8..9eb9183611bc 100644 --- a/src/tools/miri/tests/genmc/fail/atomics/atomic_ptr_double_free.stderr +++ b/src/tools/miri/tests/genmc/fail/atomics/atomic_ptr_double_free.stderr @@ -25,7 +25,7 @@ LL | dealloc(ptr as *mut u8, Layout::new::()) at tests/genmc/fail/atomics/atomic_ptr_double_free.rs:LL:CC 2: as std::ops::FnOnce<()>>::call_once at RUSTLIB/alloc/src/boxed.rs:LL:CC - 3: genmc::spawn_pthread_closure::thread_func + 3: genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/atomics/atomic_ptr_double_free.rs:LL:CC}> at tests/genmc/fail/atomics/../../../utils/genmc.rs:LL:CC note: the last function in that backtrace got called indirectly due to this code --> tests/genmc/fail/atomics/../../../utils/genmc.rs:LL:CC diff --git a/src/tools/miri/tests/genmc/fail/data_race/atomic_ptr_alloc_race.dealloc.stderr b/src/tools/miri/tests/genmc/fail/data_race/atomic_ptr_alloc_race.dealloc.stderr index aa51e1213d0c..c7f8cba09f6e 100644 --- a/src/tools/miri/tests/genmc/fail/data_race/atomic_ptr_alloc_race.dealloc.stderr +++ b/src/tools/miri/tests/genmc/fail/data_race/atomic_ptr_alloc_race.dealloc.stderr @@ -13,7 +13,7 @@ LL | dealloc(b as *mut u8, Layout::new::()); at tests/genmc/fail/data_race/atomic_ptr_alloc_race.rs:LL:CC 1: as std::ops::FnOnce<()>>::call_once at RUSTLIB/alloc/src/boxed.rs:LL:CC - 2: genmc::spawn_pthread_closure::thread_func + 2: genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/data_race/atomic_ptr_alloc_race.rs:LL:CC}> at tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC note: the last function in that backtrace got called indirectly due to this code --> tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC diff --git a/src/tools/miri/tests/genmc/fail/data_race/atomic_ptr_alloc_race.write.stderr b/src/tools/miri/tests/genmc/fail/data_race/atomic_ptr_alloc_race.write.stderr index 77e9817a55c7..da50ff861234 100644 --- a/src/tools/miri/tests/genmc/fail/data_race/atomic_ptr_alloc_race.write.stderr +++ b/src/tools/miri/tests/genmc/fail/data_race/atomic_ptr_alloc_race.write.stderr @@ -13,7 +13,7 @@ LL | *b = 42; at tests/genmc/fail/data_race/atomic_ptr_alloc_race.rs:LL:CC 1: as std::ops::FnOnce<()>>::call_once at RUSTLIB/alloc/src/boxed.rs:LL:CC - 2: genmc::spawn_pthread_closure::thread_func + 2: genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/data_race/atomic_ptr_alloc_race.rs:LL:CC}> at tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC note: the last function in that backtrace got called indirectly due to this code --> tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC diff --git a/src/tools/miri/tests/genmc/fail/data_race/atomic_ptr_dealloc_write_race.stderr b/src/tools/miri/tests/genmc/fail/data_race/atomic_ptr_dealloc_write_race.stderr index 47df94404efa..de3b554d4ac1 100644 --- a/src/tools/miri/tests/genmc/fail/data_race/atomic_ptr_dealloc_write_race.stderr +++ b/src/tools/miri/tests/genmc/fail/data_race/atomic_ptr_dealloc_write_race.stderr @@ -23,7 +23,7 @@ LL | }), at tests/genmc/fail/data_race/atomic_ptr_dealloc_write_race.rs:LL:CC 1: as std::ops::FnOnce<()>>::call_once at RUSTLIB/alloc/src/boxed.rs:LL:CC - 2: genmc::spawn_pthread_closure::thread_func + 2: genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/data_race/atomic_ptr_dealloc_write_race.rs:LL:CC}> at tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC note: the last function in that backtrace got called indirectly due to this code --> tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC diff --git a/src/tools/miri/tests/genmc/fail/data_race/atomic_ptr_write_dealloc_race.stderr b/src/tools/miri/tests/genmc/fail/data_race/atomic_ptr_write_dealloc_race.stderr index e2c87b2d25e1..248009cb1ed0 100644 --- a/src/tools/miri/tests/genmc/fail/data_race/atomic_ptr_write_dealloc_race.stderr +++ b/src/tools/miri/tests/genmc/fail/data_race/atomic_ptr_write_dealloc_race.stderr @@ -13,7 +13,7 @@ LL | }), at tests/genmc/fail/data_race/atomic_ptr_write_dealloc_race.rs:LL:CC 1: as std::ops::FnOnce<()>>::call_once at RUSTLIB/alloc/src/boxed.rs:LL:CC - 2: genmc::spawn_pthread_closure::thread_func + 2: genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/data_race/atomic_ptr_write_dealloc_race.rs:LL:CC}> at tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC note: the last function in that backtrace got called indirectly due to this code --> tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC diff --git a/src/tools/miri/tests/genmc/fail/data_race/mpu2_rels_rlx.stderr b/src/tools/miri/tests/genmc/fail/data_race/mpu2_rels_rlx.stderr index a3a15a71ce15..1ccbf7683f20 100644 --- a/src/tools/miri/tests/genmc/fail/data_race/mpu2_rels_rlx.stderr +++ b/src/tools/miri/tests/genmc/fail/data_race/mpu2_rels_rlx.stderr @@ -13,7 +13,7 @@ LL | X = 2; at tests/genmc/fail/data_race/mpu2_rels_rlx.rs:LL:CC 1: as std::ops::FnOnce<()>>::call_once at RUSTLIB/alloc/src/boxed.rs:LL:CC - 2: genmc::spawn_pthread_closure::thread_func + 2: genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/data_race/mpu2_rels_rlx.rs:LL:CC}> at tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC note: the last function in that backtrace got called indirectly due to this code --> tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC diff --git a/src/tools/miri/tests/genmc/fail/data_race/weak_orderings.rel_rlx.stderr b/src/tools/miri/tests/genmc/fail/data_race/weak_orderings.rel_rlx.stderr index 1220c0c09cbe..e589153e1e81 100644 --- a/src/tools/miri/tests/genmc/fail/data_race/weak_orderings.rel_rlx.stderr +++ b/src/tools/miri/tests/genmc/fail/data_race/weak_orderings.rel_rlx.stderr @@ -13,7 +13,7 @@ LL | X = 2; at tests/genmc/fail/data_race/weak_orderings.rs:LL:CC 1: as std::ops::FnOnce<()>>::call_once at RUSTLIB/alloc/src/boxed.rs:LL:CC - 2: genmc::spawn_pthread_closure::thread_func + 2: genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/data_race/weak_orderings.rs:LL:CC}> at tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC note: the last function in that backtrace got called indirectly due to this code --> tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC diff --git a/src/tools/miri/tests/genmc/fail/data_race/weak_orderings.rlx_acq.stderr b/src/tools/miri/tests/genmc/fail/data_race/weak_orderings.rlx_acq.stderr index 1220c0c09cbe..e589153e1e81 100644 --- a/src/tools/miri/tests/genmc/fail/data_race/weak_orderings.rlx_acq.stderr +++ b/src/tools/miri/tests/genmc/fail/data_race/weak_orderings.rlx_acq.stderr @@ -13,7 +13,7 @@ LL | X = 2; at tests/genmc/fail/data_race/weak_orderings.rs:LL:CC 1: as std::ops::FnOnce<()>>::call_once at RUSTLIB/alloc/src/boxed.rs:LL:CC - 2: genmc::spawn_pthread_closure::thread_func + 2: genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/data_race/weak_orderings.rs:LL:CC}> at tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC note: the last function in that backtrace got called indirectly due to this code --> tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC diff --git a/src/tools/miri/tests/genmc/fail/data_race/weak_orderings.rlx_rlx.stderr b/src/tools/miri/tests/genmc/fail/data_race/weak_orderings.rlx_rlx.stderr index 1220c0c09cbe..e589153e1e81 100644 --- a/src/tools/miri/tests/genmc/fail/data_race/weak_orderings.rlx_rlx.stderr +++ b/src/tools/miri/tests/genmc/fail/data_race/weak_orderings.rlx_rlx.stderr @@ -13,7 +13,7 @@ LL | X = 2; at tests/genmc/fail/data_race/weak_orderings.rs:LL:CC 1: as std::ops::FnOnce<()>>::call_once at RUSTLIB/alloc/src/boxed.rs:LL:CC - 2: genmc::spawn_pthread_closure::thread_func + 2: genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/data_race/weak_orderings.rs:LL:CC}> at tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC note: the last function in that backtrace got called indirectly due to this code --> tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC diff --git a/src/tools/miri/tests/genmc/fail/shims/mutex_diff_thread_unlock.stderr b/src/tools/miri/tests/genmc/fail/shims/mutex_diff_thread_unlock.stderr index 3ce5618fca93..9171c07eebcd 100644 --- a/src/tools/miri/tests/genmc/fail/shims/mutex_diff_thread_unlock.stderr +++ b/src/tools/miri/tests/genmc/fail/shims/mutex_diff_thread_unlock.stderr @@ -11,11 +11,11 @@ LL | self.lock.inner.unlock(); = note: stack backtrace: 0: as std::ops::Drop>::drop at RUSTLIB/std/src/sync/poison/mutex.rs:LL:CC - 1: std::ptr::drop_glue)) + 1: std::ptr::drop_glue::> - shim(Some(std::sync::MutexGuard<'_, u64>)) at RUSTLIB/core/src/ptr/mod.rs:LL:CC - 2: std::ptr::drop_glue)) + 2: std::ptr::drop_glue::>> - shim(Some(EvilSend>)) at RUSTLIB/core/src/ptr/mod.rs:LL:CC - 3: std::mem::drop + 3: std::mem::drop::>> at RUSTLIB/core/src/mem/mod.rs:LL:CC 4: miri_start::{closure#0} at tests/genmc/fail/shims/mutex_diff_thread_unlock.rs:LL:CC diff --git a/src/tools/miri/tests/genmc/fail/shims/mutex_double_unlock.stderr b/src/tools/miri/tests/genmc/fail/shims/mutex_double_unlock.stderr index 6d3fc92c531f..e75eed834cb7 100644 --- a/src/tools/miri/tests/genmc/fail/shims/mutex_double_unlock.stderr +++ b/src/tools/miri/tests/genmc/fail/shims/mutex_double_unlock.stderr @@ -10,9 +10,9 @@ LL | self.lock.inner.unlock(); = note: stack backtrace: 0: as std::ops::Drop>::drop at RUSTLIB/std/src/sync/poison/mutex.rs:LL:CC - 1: std::ptr::drop_glue)) + 1: std::ptr::drop_glue::> - shim(Some(std::sync::MutexGuard<'_, u64>)) at RUSTLIB/core/src/ptr/mod.rs:LL:CC - 2: std::mem::drop + 2: std::mem::drop::> at RUSTLIB/core/src/mem/mod.rs:LL:CC 3: miri_start at tests/genmc/fail/shims/mutex_double_unlock.rs:LL:CC diff --git a/src/tools/miri/tests/genmc/fail/simple/alloc_large.multiple.stderr b/src/tools/miri/tests/genmc/fail/simple/alloc_large.multiple.stderr index 5ddcce1fa30c..f9d217acf42e 100644 --- a/src/tools/miri/tests/genmc/fail/simple/alloc_large.multiple.stderr +++ b/src/tools/miri/tests/genmc/fail/simple/alloc_large.multiple.stderr @@ -11,11 +11,11 @@ LL | AllocInit::Uninitialized => alloc.allocate(layout), at RUSTLIB/alloc/src/raw_vec/mod.rs:LL:CC 1: alloc::raw_vec::RawVecInner::with_capacity_in at RUSTLIB/alloc/src/raw_vec/mod.rs:LL:CC - 2: alloc::raw_vec::RawVec::with_capacity_in + 2: alloc::raw_vec::RawVec::::with_capacity_in at RUSTLIB/alloc/src/raw_vec/mod.rs:LL:CC - 3: std::vec::Vec::with_capacity_in + 3: std::vec::Vec::::with_capacity_in at RUSTLIB/alloc/src/vec/mod.rs:LL:CC - 4: std::vec::Vec::with_capacity + 4: std::vec::Vec::::with_capacity at RUSTLIB/alloc/src/vec/mod.rs:LL:CC 5: miri_start at tests/genmc/fail/simple/alloc_large.rs:LL:CC diff --git a/src/tools/miri/tests/genmc/fail/simple/alloc_large.single.stderr b/src/tools/miri/tests/genmc/fail/simple/alloc_large.single.stderr index 5ddcce1fa30c..f9d217acf42e 100644 --- a/src/tools/miri/tests/genmc/fail/simple/alloc_large.single.stderr +++ b/src/tools/miri/tests/genmc/fail/simple/alloc_large.single.stderr @@ -11,11 +11,11 @@ LL | AllocInit::Uninitialized => alloc.allocate(layout), at RUSTLIB/alloc/src/raw_vec/mod.rs:LL:CC 1: alloc::raw_vec::RawVecInner::with_capacity_in at RUSTLIB/alloc/src/raw_vec/mod.rs:LL:CC - 2: alloc::raw_vec::RawVec::with_capacity_in + 2: alloc::raw_vec::RawVec::::with_capacity_in at RUSTLIB/alloc/src/raw_vec/mod.rs:LL:CC - 3: std::vec::Vec::with_capacity_in + 3: std::vec::Vec::::with_capacity_in at RUSTLIB/alloc/src/vec/mod.rs:LL:CC - 4: std::vec::Vec::with_capacity + 4: std::vec::Vec::::with_capacity at RUSTLIB/alloc/src/vec/mod.rs:LL:CC 5: miri_start at tests/genmc/fail/simple/alloc_large.rs:LL:CC diff --git a/src/tools/miri/tests/genmc/pass/atomics/cas_failure_ord_racy_key_init.stderr b/src/tools/miri/tests/genmc/pass/atomics/cas_failure_ord_racy_key_init.stderr index 24bde07924d1..720879217679 100644 --- a/src/tools/miri/tests/genmc/pass/atomics/cas_failure_ord_racy_key_init.stderr +++ b/src/tools/miri/tests/genmc/pass/atomics/cas_failure_ord_racy_key_init.stderr @@ -13,7 +13,7 @@ LL | match KEY.compare_exchange(KEY_SENTVAL, key, Release, Acquire) { at tests/genmc/pass/atomics/cas_failure_ord_racy_key_init.rs:LL:CC 2: as std::ops::FnOnce<()>>::call_once at RUSTLIB/alloc/src/boxed.rs:LL:CC - 3: genmc::spawn_pthread_closure::thread_func + 3: genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/pass/atomics/cas_failure_ord_racy_key_init.rs:LL:CC}> at tests/genmc/pass/atomics/../../../utils/genmc.rs:LL:CC note: the last function in that backtrace got called indirectly due to this code --> tests/genmc/pass/atomics/../../../utils/genmc.rs:LL:CC diff --git a/src/tools/miri/tests/pass-dep/libc/libc-socket-no-blocking.windows_host.stderr b/src/tools/miri/tests/pass-dep/libc/libc-socket-no-blocking.windows_host.stderr index 8173c121067a..006e911499a8 100644 --- a/src/tools/miri/tests/pass-dep/libc/libc-socket-no-blocking.windows_host.stderr +++ b/src/tools/miri/tests/pass-dep/libc/libc-socket-no-blocking.windows_host.stderr @@ -10,9 +10,9 @@ LL | libc::getsockname(client_sockfd, storage, len) = note: stack backtrace: 0: test_getsockname_ipv4_connect_nonblock::{closure#0} at tests/pass-dep/libc/libc-socket-no-blocking.rs:LL:CC - 1: libc_utils::net::sockname + 1: libc_utils::net::sockname::<{closure@tests/pass-dep/libc/libc-socket-no-blocking.rs:LL:CC}> at tests/pass-dep/libc/../../utils/libc.rs:LL:CC - 2: libc_utils::net::sockname_ipv4 + 2: libc_utils::net::sockname_ipv4::<{closure@tests/pass-dep/libc/libc-socket-no-blocking.rs:LL:CC}> at tests/pass-dep/libc/../../utils/libc.rs:LL:CC 3: test_getsockname_ipv4_connect_nonblock at tests/pass-dep/libc/libc-socket-no-blocking.rs:LL:CC diff --git a/src/tools/miri/tests/pass/alloc-access-tracking.stderr b/src/tools/miri/tests/pass/alloc-access-tracking.stderr index 0e25be460cbb..bcc1d987330a 100644 --- a/src/tools/miri/tests/pass/alloc-access-tracking.stderr +++ b/src/tools/miri/tests/pass/alloc-access-tracking.stderr @@ -25,7 +25,7 @@ LL | self.1.deallocate(From::from(ptr.cast()), layout); = note: stack backtrace: 0: > as std::ops::Drop>::drop at RUSTLIB/alloc/src/boxed.rs:LL:CC - 1: std::ptr::drop_glue)) + 1: std::ptr::drop_glue::>> - shim(Some(std::boxed::Box>)) at RUSTLIB/core/src/ptr/mod.rs:LL:CC 2: main at tests/pass/alloc-access-tracking.rs:LL:CC diff --git a/src/tools/miri/tests/pass/backtrace/backtrace-global-alloc.stderr b/src/tools/miri/tests/pass/backtrace/backtrace-global-alloc.stderr index b4ef3f76c20f..bf443274a958 100644 --- a/src/tools/miri/tests/pass/backtrace/backtrace-global-alloc.stderr +++ b/src/tools/miri/tests/pass/backtrace/backtrace-global-alloc.stderr @@ -2,27 +2,27 @@ at tests/pass/backtrace/backtrace-global-alloc.rs:LL:CC 1: >::call_once - shim(fn()) at RUSTLIB/core/src/ops/function.rs:LL:CC - 2: std::sys::backtrace::__rust_begin_short_backtrace + 2: std::sys::backtrace::__rust_begin_short_backtrace:: at RUSTLIB/std/src/sys/backtrace.rs:LL:CC - 3: std::rt::lang_start::{closure#0} + 3: std::rt::lang_start::<()>::{closure#0} at RUSTLIB/std/src/rt.rs:LL:CC - 4: std::ops::function::impls::call_once + 4: std::ops::function::impls:: for &dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe>::call_once at RUSTLIB/core/src/ops/function.rs:LL:CC - 5: std::panicking::catch_unwind::do_call + 5: std::panicking::catch_unwind::do_call::<&dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe, i32> at RUSTLIB/std/src/panicking.rs:LL:CC - 6: std::panicking::catch_unwind + 6: std::panicking::catch_unwind:: i32 + std::marker::Sync + std::panic::RefUnwindSafe> at RUSTLIB/std/src/panicking.rs:LL:CC - 7: std::panic::catch_unwind + 7: std::panic::catch_unwind::<&dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe, i32> at RUSTLIB/std/src/panic.rs:LL:CC 8: std::rt::lang_start_internal::{closure#0} at RUSTLIB/std/src/rt.rs:LL:CC - 9: std::panicking::catch_unwind::do_call + 9: std::panicking::catch_unwind::do_call::<{closure@std::rt::lang_start_internal::{closure#0}}, isize> at RUSTLIB/std/src/panicking.rs:LL:CC - 10: std::panicking::catch_unwind + 10: std::panicking::catch_unwind:: at RUSTLIB/std/src/panicking.rs:LL:CC - 11: std::panic::catch_unwind + 11: std::panic::catch_unwind::<{closure@std::rt::lang_start_internal::{closure#0}}, isize> at RUSTLIB/std/src/panic.rs:LL:CC 12: std::rt::lang_start_internal at RUSTLIB/std/src/rt.rs:LL:CC - 13: std::rt::lang_start + 13: std::rt::lang_start::<()> at RUSTLIB/std/src/rt.rs:LL:CC diff --git a/src/tools/miri/tests/pass/backtrace/backtrace-std.stderr b/src/tools/miri/tests/pass/backtrace/backtrace-std.stderr index 706eacc70fd8..ee0c65fa6eb6 100644 --- a/src/tools/miri/tests/pass/backtrace/backtrace-std.stderr +++ b/src/tools/miri/tests/pass/backtrace/backtrace-std.stderr @@ -2,7 +2,7 @@ at tests/pass/backtrace/backtrace-std.rs:LL:CC 1: func_c at tests/pass/backtrace/backtrace-std.rs:LL:CC - 2: func_b + 2: func_b:: at tests/pass/backtrace/backtrace-std.rs:LL:CC 3: func_a at tests/pass/backtrace/backtrace-std.rs:LL:CC @@ -10,27 +10,27 @@ at tests/pass/backtrace/backtrace-std.rs:LL:CC 5: >::call_once - shim(fn()) at RUSTLIB/core/src/ops/function.rs:LL:CC - 6: std::sys::backtrace::__rust_begin_short_backtrace + 6: std::sys::backtrace::__rust_begin_short_backtrace:: at RUSTLIB/std/src/sys/backtrace.rs:LL:CC - 7: std::rt::lang_start::{closure#0} + 7: std::rt::lang_start::<()>::{closure#0} at RUSTLIB/std/src/rt.rs:LL:CC - 8: std::ops::function::impls::call_once + 8: std::ops::function::impls:: for &dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe>::call_once at RUSTLIB/core/src/ops/function.rs:LL:CC - 9: std::panicking::catch_unwind::do_call + 9: std::panicking::catch_unwind::do_call::<&dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe, i32> at RUSTLIB/std/src/panicking.rs:LL:CC - 10: std::panicking::catch_unwind + 10: std::panicking::catch_unwind:: i32 + std::marker::Sync + std::panic::RefUnwindSafe> at RUSTLIB/std/src/panicking.rs:LL:CC - 11: std::panic::catch_unwind + 11: std::panic::catch_unwind::<&dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe, i32> at RUSTLIB/std/src/panic.rs:LL:CC 12: std::rt::lang_start_internal::{closure#0} at RUSTLIB/std/src/rt.rs:LL:CC - 13: std::panicking::catch_unwind::do_call + 13: std::panicking::catch_unwind::do_call::<{closure@std::rt::lang_start_internal::{closure#0}}, isize> at RUSTLIB/std/src/panicking.rs:LL:CC - 14: std::panicking::catch_unwind + 14: std::panicking::catch_unwind:: at RUSTLIB/std/src/panicking.rs:LL:CC - 15: std::panic::catch_unwind + 15: std::panic::catch_unwind::<{closure@std::rt::lang_start_internal::{closure#0}}, isize> at RUSTLIB/std/src/panic.rs:LL:CC 16: std::rt::lang_start_internal at RUSTLIB/std/src/rt.rs:LL:CC - 17: std::rt::lang_start + 17: std::rt::lang_start::<()> at RUSTLIB/std/src/rt.rs:LL:CC diff --git a/src/tools/miri/tests/pass/open_a_file_in_proc.stderr b/src/tools/miri/tests/pass/open_a_file_in_proc.stderr index 0ba31ed5adac..c80b11ecb37b 100644 --- a/src/tools/miri/tests/pass/open_a_file_in_proc.stderr +++ b/src/tools/miri/tests/pass/open_a_file_in_proc.stderr @@ -7,25 +7,25 @@ LL | let fd = cvt_r(|| unsafe { open64(path.as_ptr(), flags, opts.mode a = note: stack backtrace: 0: std::sys::fs::PLATFORM::File::open_c::{closure#0} at RUSTLIB/std/src/sys/fs/PLATFORM.rs:LL:CC - 1: std::sys::pal::PLATFORM::cvt_r + 1: std::sys::pal::PLATFORM::cvt_r:: at RUSTLIB/std/src/sys/pal/PLATFORM/mod.rs:LL:CC 2: std::sys::fs::PLATFORM::File::open_c at RUSTLIB/std/src/sys/fs/PLATFORM.rs:LL:CC 3: std::sys::fs::PLATFORM::File::open::{closure#0} at RUSTLIB/std/src/sys/fs/PLATFORM.rs:LL:CC - 4: std::sys::helpers::small_c_string::run_with_cstr_stack + 4: std::sys::helpers::small_c_string::run_with_cstr_stack:: at RUSTLIB/std/src/sys/helpers/small_c_string.rs:LL:CC - 5: std::sys::helpers::small_c_string::run_with_cstr + 5: std::sys::helpers::small_c_string::run_with_cstr:: at RUSTLIB/std/src/sys/helpers/small_c_string.rs:LL:CC - 6: std::sys::helpers::small_c_string::run_path_with_cstr + 6: std::sys::helpers::small_c_string::run_path_with_cstr:: at RUSTLIB/std/src/sys/helpers/small_c_string.rs:LL:CC 7: std::sys::fs::PLATFORM::File::open at RUSTLIB/std/src/sys/fs/PLATFORM.rs:LL:CC 8: std::fs::OpenOptions::_open at RUSTLIB/std/src/fs.rs:LL:CC - 9: std::fs::OpenOptions::open + 9: std::fs::OpenOptions::open::<&std::path::Path> at RUSTLIB/std/src/fs.rs:LL:CC - 10: std::fs::File::open + 10: std::fs::File::open::<&str> at RUSTLIB/std/src/fs.rs:LL:CC 11: main at tests/pass/open_a_file_in_proc.rs:LL:CC diff --git a/src/tools/miri/tests/ui.rs b/src/tools/miri/tests/ui.rs index 10064bc2bbb3..23125d116cf1 100644 --- a/src/tools/miri/tests/ui.rs +++ b/src/tools/miri/tests/ui.rs @@ -267,8 +267,6 @@ fn $name() -> &'static [(Match, &'static [u8])] { "<[0-9]+=" => " "$1", - // erase generics in backtraces - "([0-9]+: .*)::<.*>" => "$1", // erase long hexadecimals r"0x[0-9a-fA-F]+[0-9a-fA-F]{2,2}" => "$$HEX", // erase specific alignments