revert miri wording change

Author: estebank

compiler/rustc_const_eval/src/interpret/stack.rs

@@ -216,12 +216,12 @@ impl<'tcx> fmt::Display for FrameInfo<'tcx> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         ty::tls::with(|tcx| {
             if tcx.def_key(self.instance.def_id()).disambiguated_data.data == DefPathData::Closure {
-                write!(f, "called from closure")
+                write!(f, "inside closure")
             } else {
                 // Note: this triggers a `must_produce_diag` state, which means that if we ever
                 // get here we must emit a diagnostic. We should never display a `FrameInfo` unless
                 // we actually want to emit a warning or error to the user.
-                write!(f, "called from `{}`", self.instance)
+                write!(f, "inside `{}`", self.instance)
             }
         })
     }

src/tools/miri/tests/fail/alloc/alloc_error_handler.stderr

@@ -6,13 +6,13 @@ LL |     ABORT();
    | ^ the program aborted execution
    |
    = note: BACKTRACE:
-   = note: called from `std::sys::pal::PLATFORM::abort_internal` at RUSTLIB/std/src/sys/pal/PLATFORM/mod.rs:LL:CC
-   = note: called from `std::process::abort` at RUSTLIB/std/src/process.rs:LL:CC
-   = note: called from `std::alloc::rust_oom` at RUSTLIB/std/src/alloc.rs:LL:CC
-   = note: called from `std::alloc::_::__rg_oom` at RUSTLIB/std/src/alloc.rs:LL:CC
-   = note: called from `std::alloc::handle_alloc_error::rt_error` at RUSTLIB/alloc/src/alloc.rs:LL:CC
-   = note: called from `std::alloc::handle_alloc_error` at RUSTLIB/alloc/src/alloc.rs:LL:CC
-note: inside `main`
+   = note: inside `std::sys::pal::PLATFORM::abort_internal` at RUSTLIB/std/src/sys/pal/PLATFORM/mod.rs:LL:CC
+   = note: inside `std::process::abort` at RUSTLIB/std/src/process.rs:LL:CC
+   = note: inside `std::alloc::rust_oom` at RUSTLIB/std/src/alloc.rs:LL:CC
+   = note: inside `std::alloc::_::__rg_oom` at RUSTLIB/std/src/alloc.rs:LL:CC
+   = note: inside `std::alloc::handle_alloc_error::rt_error` at RUSTLIB/alloc/src/alloc.rs:LL:CC
+   = note: inside `std::alloc::handle_alloc_error` at RUSTLIB/alloc/src/alloc.rs:LL:CC
+note: called from `main`
   --> tests/fail/alloc/alloc_error_handler.rs:LL:CC
    |
 LL |     handle_alloc_error(Layout::for_value(&0));

src/tools/miri/tests/fail/alloc/alloc_error_handler_custom.stderr

@@ -6,17 +6,17 @@ LL |     core::intrinsics::abort();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^ the program aborted execution
    |
    = note: BACKTRACE:
-   = note: called from `alloc_error_handler` at tests/fail/alloc/alloc_error_handler_custom.rs:LL:CC
-note: inside `_::__rg_oom`
+   = note: inside `alloc_error_handler` at tests/fail/alloc/alloc_error_handler_custom.rs:LL:CC
+note: called from `_::__rg_oom`
   --> tests/fail/alloc/alloc_error_handler_custom.rs:LL:CC
    |
 LL | #[alloc_error_handler]
    | ---------------------- in this procedural macro expansion
 LL | fn alloc_error_handler(layout: Layout) -> ! {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   = note: called from `alloc::alloc::handle_alloc_error::rt_error` at RUSTLIB/alloc/src/alloc.rs:LL:CC
-   = note: called from `alloc::alloc::handle_alloc_error` at RUSTLIB/alloc/src/alloc.rs:LL:CC
-note: inside `miri_start`
+   = note: inside `alloc::alloc::handle_alloc_error::rt_error` at RUSTLIB/alloc/src/alloc.rs:LL:CC
+   = note: inside `alloc::alloc::handle_alloc_error` at RUSTLIB/alloc/src/alloc.rs:LL:CC
+note: called from `miri_start`
   --> tests/fail/alloc/alloc_error_handler_custom.rs:LL:CC
    |
 LL |     handle_alloc_error(Layout::for_value(&0));

src/tools/miri/tests/fail/alloc/alloc_error_handler_no_std.stderr

@@ -8,11 +8,11 @@ LL |     core::intrinsics::abort();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^ the program aborted execution
    |
    = note: BACKTRACE:
-   = note: called from `panic_handler` at tests/fail/alloc/alloc_error_handler_no_std.rs:LL:CC
-   = note: called from `alloc::alloc::__alloc_error_handler::__rdl_oom` at RUSTLIB/alloc/src/alloc.rs:LL:CC
-   = note: called from `alloc::alloc::handle_alloc_error::rt_error` at RUSTLIB/alloc/src/alloc.rs:LL:CC
-   = note: called from `alloc::alloc::handle_alloc_error` at RUSTLIB/alloc/src/alloc.rs:LL:CC
-note: inside `miri_start`
+   = note: inside `panic_handler` at tests/fail/alloc/alloc_error_handler_no_std.rs:LL:CC
+   = note: inside `alloc::alloc::__alloc_error_handler::__rdl_oom` at RUSTLIB/alloc/src/alloc.rs:LL:CC
+   = note: inside `alloc::alloc::handle_alloc_error::rt_error` at RUSTLIB/alloc/src/alloc.rs:LL:CC
+   = note: inside `alloc::alloc::handle_alloc_error` at RUSTLIB/alloc/src/alloc.rs:LL:CC
+note: called from `miri_start`
   --> tests/fail/alloc/alloc_error_handler_no_std.rs:LL:CC
    |
 LL |     handle_alloc_error(Layout::for_value(&0));

src/tools/miri/tests/fail/alloc/deallocate-bad-alignment.stderr

@@ -7,7 +7,7 @@ LL |         dealloc(x, Layout::from_size_align_unchecked(1, 2));
    = 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: BACKTRACE:
-   = note: called from `main` at tests/fail/alloc/deallocate-bad-alignment.rs:LL:CC
+   = note: inside `main` at tests/fail/alloc/deallocate-bad-alignment.rs:LL:CC
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 

src/tools/miri/tests/fail/alloc/deallocate-bad-size.stderr

@@ -7,7 +7,7 @@ LL |         dealloc(x, Layout::from_size_align_unchecked(2, 1));
    = 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: BACKTRACE:
-   = note: called from `main` at tests/fail/alloc/deallocate-bad-size.rs:LL:CC
+   = note: inside `main` at tests/fail/alloc/deallocate-bad-size.rs:LL:CC
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 

src/tools/miri/tests/fail/alloc/deallocate-twice.stderr

@@ -17,7 +17,7 @@ help: ALLOC was deallocated here:
 LL |         dealloc(x, Layout::from_size_align_unchecked(1, 1));
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: BACKTRACE (of the first span):
-   = note: called from `main` at tests/fail/alloc/deallocate-twice.rs:LL:CC
+   = note: inside `main` at tests/fail/alloc/deallocate-twice.rs:LL:CC
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 

src/tools/miri/tests/fail/alloc/global_system_mixup.stderr

@@ -7,9 +7,9 @@ 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: BACKTRACE:
-   = note: called from `std::sys::alloc::PLATFORM::<impl std::alloc::GlobalAlloc for std::alloc::System>::dealloc` at RUSTLIB/std/src/sys/alloc/PLATFORM.rs:LL:CC
-   = note: called from `<std::alloc::System as std::alloc::Allocator>::deallocate` at RUSTLIB/std/src/alloc.rs:LL:CC
-note: inside `main`
+   = note: inside `std::sys::alloc::PLATFORM::<impl std::alloc::GlobalAlloc for std::alloc::System>::dealloc` at RUSTLIB/std/src/sys/alloc/PLATFORM.rs:LL:CC
+   = note: inside `<std::alloc::System as std::alloc::Allocator>::deallocate` at RUSTLIB/std/src/alloc.rs:LL:CC
+note: called from `main`
   --> tests/fail/alloc/global_system_mixup.rs:LL:CC
    |
 LL |     unsafe { System.deallocate(ptr, l) };

src/tools/miri/tests/fail/alloc/no_global_allocator.stderr

@@ -7,7 +7,7 @@ LL |         __rust_alloc(1, 1);
    = help: if this is a basic API commonly used on this target, please report an issue with Miri
    = help: however, note that Miri does not aim to support every FFI function out there; for instance, we will not support APIs for things such as GUIs, scripting languages, or databases
    = note: BACKTRACE:
-   = note: called from `miri_start` at tests/fail/alloc/no_global_allocator.rs:LL:CC
+   = note: inside `miri_start` at tests/fail/alloc/no_global_allocator.rs:LL:CC
 
 error: aborting due to 1 previous error
 

src/tools/miri/tests/fail/alloc/reallocate-bad-size.stderr

@@ -7,7 +7,7 @@ LL |         let _y = realloc(x, Layout::from_size_align_unchecked(2, 1), 1);
    = 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: BACKTRACE:
-   = note: called from `main` at tests/fail/alloc/reallocate-bad-size.rs:LL:CC
+   = note: inside `main` at tests/fail/alloc/reallocate-bad-size.rs:LL:CC
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 

src/tools/miri/tests/fail/alloc/reallocate-change-alloc.stderr

@@ -17,7 +17,7 @@ help: ALLOC was deallocated here:
 LL |         let _y = realloc(x, Layout::from_size_align_unchecked(1, 1), 1);
    |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: BACKTRACE (of the first span):
-   = note: called from `main` at tests/fail/alloc/reallocate-change-alloc.rs:LL:CC
+   = note: inside `main` at tests/fail/alloc/reallocate-change-alloc.rs:LL:CC
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 

src/tools/miri/tests/fail/alloc/reallocate-dangling.stderr

@@ -17,7 +17,7 @@ help: ALLOC was deallocated here:
 LL |         dealloc(x, Layout::from_size_align_unchecked(1, 1));
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: BACKTRACE (of the first span):
-   = note: called from `main` at tests/fail/alloc/reallocate-dangling.rs:LL:CC
+   = note: inside `main` at tests/fail/alloc/reallocate-dangling.rs:LL:CC
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 

src/tools/miri/tests/fail/alloc/stack_free.stderr

@@ -7,10 +7,10 @@ LL |                 self.1.deallocate(From::from(ptr.cast()), layout);
    = 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: BACKTRACE:
-   = note: called from `<std::boxed::Box<i32> as std::ops::Drop>::drop` at RUSTLIB/alloc/src/boxed.rs:LL:CC
-   = note: called from `std::ptr::drop_in_place::<std::boxed::Box<i32>> - shim(Some(std::boxed::Box<i32>))` at RUSTLIB/core/src/ptr/mod.rs:LL:CC
-   = note: called from `std::mem::drop::<std::boxed::Box<i32>>` at RUSTLIB/core/src/mem/mod.rs:LL:CC
-note: inside `main`
+   = note: inside `<std::boxed::Box<i32> as std::ops::Drop>::drop` at RUSTLIB/alloc/src/boxed.rs:LL:CC
+   = note: inside `std::ptr::drop_in_place::<std::boxed::Box<i32>> - shim(Some(std::boxed::Box<i32>))` at RUSTLIB/core/src/ptr/mod.rs:LL:CC
+   = note: inside `std::mem::drop::<std::boxed::Box<i32>>` at RUSTLIB/core/src/mem/mod.rs:LL:CC
+note: called from `main`
   --> tests/fail/alloc/stack_free.rs:LL:CC
    |
 LL |     drop(bad_box);

src/tools/miri/tests/fail/alloc/too_large.stderr

@@ -7,7 +7,7 @@ LL |         __rust_alloc(bytes, 1);
    = 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: BACKTRACE:
-   = note: called from `main` at tests/fail/alloc/too_large.rs:LL:CC
+   = note: inside `main` at tests/fail/alloc/too_large.rs:LL:CC
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 

src/tools/miri/tests/fail/alloc/unsupported_big_alignment.stderr

@@ -6,7 +6,7 @@ LL |         __rust_alloc(1, 1 << 30);
    |
    = help: this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support
    = note: BACKTRACE:
-   = note: called from `main` at tests/fail/alloc/unsupported_big_alignment.rs:LL:CC
+   = note: inside `main` at tests/fail/alloc/unsupported_big_alignment.rs:LL:CC
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 

src/tools/miri/tests/fail/alloc/unsupported_non_power_two_alignment.stderr

@@ -7,7 +7,7 @@ LL |         __rust_alloc(1, 3);
    = 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: BACKTRACE:
-   = note: called from `main` at tests/fail/alloc/unsupported_non_power_two_alignment.rs:LL:CC
+   = note: inside `main` at tests/fail/alloc/unsupported_non_power_two_alignment.rs:LL:CC
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 

src/tools/miri/tests/fail/both_borrows/alias_through_mutation.stack.stderr

@@ -20,7 +20,7 @@ help: <TAG> was later invalidated at offsets [0x0..0x4] by a write access
 LL |     *target = 13;
    |     ^^^^^^^^^^^^
    = note: BACKTRACE (of the first span):
-   = note: called from `main` at tests/fail/both_borrows/alias_through_mutation.rs:LL:CC
+   = note: inside `main` at tests/fail/both_borrows/alias_through_mutation.rs:LL:CC
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 

src/tools/miri/tests/fail/both_borrows/alias_through_mutation.tree.stderr

@@ -18,7 +18,7 @@ LL |     *target = 13;
    |     ^^^^^^^^^^^^
    = help: this transition corresponds to a loss of read permissions
    = note: BACKTRACE (of the first span):
-   = note: called from `main` at tests/fail/both_borrows/alias_through_mutation.rs:LL:CC
+   = note: inside `main` at tests/fail/both_borrows/alias_through_mutation.rs:LL:CC
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 

src/tools/miri/tests/fail/both_borrows/aliasing_mut1.stack.stderr

@@ -17,8 +17,8 @@ help: <TAG> is this argument
 LL | pub fn safe(x: &mut i32, y: &mut i32) {
    |             ^
    = note: BACKTRACE (of the first span):
-   = note: called from `safe` at tests/fail/both_borrows/aliasing_mut1.rs:LL:CC
-note: inside `main`
+   = note: inside `safe` at tests/fail/both_borrows/aliasing_mut1.rs:LL:CC
+note: called from `main`
   --> tests/fail/both_borrows/aliasing_mut1.rs:LL:CC
    |
 LL |     safe_raw(xraw, xraw);

src/tools/miri/tests/fail/both_borrows/aliasing_mut1.tree.stderr

@@ -18,8 +18,8 @@ LL | pub fn safe(x: &mut i32, y: &mut i32) {
    |                          ^
    = help: this transition corresponds to a temporary loss of write permissions until function exit
    = note: BACKTRACE (of the first span):
-   = note: called from `safe` at tests/fail/both_borrows/aliasing_mut1.rs:LL:CC
-note: inside `main`
+   = note: inside `safe` at tests/fail/both_borrows/aliasing_mut1.rs:LL:CC
+note: called from `main`
   --> tests/fail/both_borrows/aliasing_mut1.rs:LL:CC
    |
 LL |     safe_raw(xraw, xraw);

src/tools/miri/tests/fail/both_borrows/aliasing_mut2.stack.stderr

@@ -17,8 +17,8 @@ help: <TAG> is this argument
 LL | pub fn safe(x: &i32, y: &mut i32) {
    |             ^
    = note: BACKTRACE (of the first span):
-   = note: called from `safe` at tests/fail/both_borrows/aliasing_mut2.rs:LL:CC
-note: inside `main`
+   = note: inside `safe` at tests/fail/both_borrows/aliasing_mut2.rs:LL:CC
+note: called from `main`
   --> tests/fail/both_borrows/aliasing_mut2.rs:LL:CC
    |
 LL |     safe_raw(xshr, xraw);

src/tools/miri/tests/fail/both_borrows/aliasing_mut2.tree.stderr

@@ -18,8 +18,8 @@ LL |     let _v = *x;
    |              ^^
    = help: this transition corresponds to a temporary loss of write permissions until function exit
    = note: BACKTRACE (of the first span):
-   = note: called from `safe` at tests/fail/both_borrows/aliasing_mut2.rs:LL:CC
-note: inside `main`
+   = note: inside `safe` at tests/fail/both_borrows/aliasing_mut2.rs:LL:CC
+note: called from `main`
   --> tests/fail/both_borrows/aliasing_mut2.rs:LL:CC
    |
 LL |     safe_raw(xshr, xraw);

src/tools/miri/tests/fail/both_borrows/aliasing_mut3.stack.stderr

@@ -20,8 +20,8 @@ help: <TAG> was later invalidated at offsets [0x0..0x4] by a Unique function-ent
 LL |     safe_raw(xraw, xshr);
    |     ^^^^^^^^^^^^^^^^^^^^
    = note: BACKTRACE (of the first span):
-   = note: called from `safe` at tests/fail/both_borrows/aliasing_mut3.rs:LL:CC
-note: inside `main`
+   = note: inside `safe` at tests/fail/both_borrows/aliasing_mut3.rs:LL:CC
+note: called from `main`
   --> tests/fail/both_borrows/aliasing_mut3.rs:LL:CC
    |
 LL |     safe_raw(xraw, xshr);

src/tools/miri/tests/fail/both_borrows/aliasing_mut3.tree.stderr

@@ -18,8 +18,8 @@ LL | pub fn safe(x: &mut i32, y: &i32) {
    |                          ^
    = help: this transition corresponds to a temporary loss of write permissions until function exit
    = note: BACKTRACE (of the first span):
-   = note: called from `safe` at tests/fail/both_borrows/aliasing_mut3.rs:LL:CC
-note: inside `main`
+   = note: inside `safe` at tests/fail/both_borrows/aliasing_mut3.rs:LL:CC
+note: called from `main`
   --> tests/fail/both_borrows/aliasing_mut3.rs:LL:CC
    |
 LL |     safe_raw(xraw, xshr);

src/tools/miri/tests/fail/both_borrows/aliasing_mut4.stack.stderr

@@ -17,8 +17,8 @@ help: <TAG> is this argument
 LL | pub fn safe(x: &i32, y: &mut Cell<i32>) {
    |             ^
    = note: BACKTRACE (of the first span):
-   = note: called from `safe` at tests/fail/both_borrows/aliasing_mut4.rs:LL:CC
-note: inside `main`
+   = note: inside `safe` at tests/fail/both_borrows/aliasing_mut4.rs:LL:CC
+note: called from `main`
   --> tests/fail/both_borrows/aliasing_mut4.rs:LL:CC
    |
 LL |     safe_raw(xshr, xraw as *mut _);

src/tools/miri/tests/fail/both_borrows/aliasing_mut4.tree.stderr

@@ -19,15 +19,15 @@ help: the protected tag <TAG> was created here, in the initial state Frozen
 LL | pub fn safe(x: &i32, y: &mut Cell<i32>) {
    |             ^
    = note: BACKTRACE (of the first span):
-   = note: called from `std::mem::replace::<i32>` at RUSTLIB/core/src/mem/mod.rs:LL:CC
-   = note: called from `std::cell::Cell::<i32>::replace` at RUSTLIB/core/src/cell.rs:LL:CC
-   = note: called from `std::cell::Cell::<i32>::set` at RUSTLIB/core/src/cell.rs:LL:CC
-note: inside `safe`
+   = note: inside `std::mem::replace::<i32>` at RUSTLIB/core/src/mem/mod.rs:LL:CC
+   = note: inside `std::cell::Cell::<i32>::replace` at RUSTLIB/core/src/cell.rs:LL:CC
+   = note: inside `std::cell::Cell::<i32>::set` at RUSTLIB/core/src/cell.rs:LL:CC
+note: called from `safe`
   --> tests/fail/both_borrows/aliasing_mut4.rs:LL:CC
    |
 LL |     y.set(1);
    |     ^^^^^^^^
-note: inside `main`
+note: called from `main`
   --> tests/fail/both_borrows/aliasing_mut4.rs:LL:CC
    |
 LL |     safe_raw(xshr, xraw as *mut _);

src/tools/miri/tests/fail/both_borrows/box_exclusive_violation1.stack.stderr

@@ -20,13 +20,13 @@ help: <TAG> was later invalidated at offsets [0x0..0x4] by a write access
 LL |     *our = 5;
    |     ^^^^^^^^
    = note: BACKTRACE (of the first span):
-   = note: called from `unknown_code_2` at tests/fail/both_borrows/box_exclusive_violation1.rs:LL:CC
-note: inside `demo_box_advanced_unique`
+   = note: inside `unknown_code_2` at tests/fail/both_borrows/box_exclusive_violation1.rs:LL:CC
+note: called from `demo_box_advanced_unique`
   --> tests/fail/both_borrows/box_exclusive_violation1.rs:LL:CC
    |
 LL |     unknown_code_2();
    |     ^^^^^^^^^^^^^^^^
-note: inside `main`
+note: called from `main`
   --> tests/fail/both_borrows/box_exclusive_violation1.rs:LL:CC
    |
 LL |     demo_box_advanced_unique(Box::new(0));

src/tools/miri/tests/fail/both_borrows/box_exclusive_violation1.tree.stderr

@@ -18,13 +18,13 @@ LL |     *our = 5;
    |     ^^^^^^^^
    = help: this transition corresponds to a loss of read permissions
    = note: BACKTRACE (of the first span):
-   = note: called from `unknown_code_2` at tests/fail/both_borrows/box_exclusive_violation1.rs:LL:CC
-note: inside `demo_box_advanced_unique`
+   = note: inside `unknown_code_2` at tests/fail/both_borrows/box_exclusive_violation1.rs:LL:CC
+note: called from `demo_box_advanced_unique`
   --> tests/fail/both_borrows/box_exclusive_violation1.rs:LL:CC
    |
 LL |     unknown_code_2();
    |     ^^^^^^^^^^^^^^^^
-note: inside `main`
+note: called from `main`
   --> tests/fail/both_borrows/box_exclusive_violation1.rs:LL:CC
    |
 LL |     demo_box_advanced_unique(Box::new(0));

src/tools/miri/tests/fail/both_borrows/box_noalias_violation.stack.stderr

@@ -17,8 +17,8 @@ help: <TAG> is this argument
 LL | unsafe fn test(mut x: Box<i32>, y: *const i32) -> i32 {
    |                ^^^^^
    = note: BACKTRACE (of the first span):
-   = note: called from `test` at tests/fail/both_borrows/box_noalias_violation.rs:LL:CC
-note: inside `main`
+   = note: inside `test` at tests/fail/both_borrows/box_noalias_violation.rs:LL:CC
+note: called from `main`
   --> tests/fail/both_borrows/box_noalias_violation.rs:LL:CC
    |
 LL |         test(Box::from_raw(ptr), ptr);

src/tools/miri/tests/fail/both_borrows/box_noalias_violation.tree.stderr

@@ -25,8 +25,8 @@ LL |     *x = 5;
    |     ^^^^^^
    = help: this transition corresponds to the first write to a 2-phase borrowed mutable reference
    = note: BACKTRACE (of the first span):
-   = note: called from `test` at tests/fail/both_borrows/box_noalias_violation.rs:LL:CC
-note: inside `main`
+   = note: inside `test` at tests/fail/both_borrows/box_noalias_violation.rs:LL:CC
+note: called from `main`
   --> tests/fail/both_borrows/box_noalias_violation.rs:LL:CC
    |
 LL |         test(Box::from_raw(ptr), ptr);