Skip to content

Commit df621da

Browse files
committedFeb 5, 2025
revert miri wording change
1 parent 233b82c commit df621da

File tree

476 files changed

+765
-765
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

476 files changed

+765
-765
lines changed
 

‎compiler/rustc_const_eval/src/interpret/stack.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,12 @@ impl<'tcx> fmt::Display for FrameInfo<'tcx> {
216216
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
217217
ty::tls::with(|tcx| {
218218
if tcx.def_key(self.instance.def_id()).disambiguated_data.data == DefPathData::Closure {
219-
write!(f, "called from closure")
219+
write!(f, "inside closure")
220220
} else {
221221
// Note: this triggers a `must_produce_diag` state, which means that if we ever
222222
// get here we must emit a diagnostic. We should never display a `FrameInfo` unless
223223
// we actually want to emit a warning or error to the user.
224-
write!(f, "called from `{}`", self.instance)
224+
write!(f, "inside `{}`", self.instance)
225225
}
226226
})
227227
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ LL | ABORT();
66
| ^ the program aborted execution
77
|
88
= note: BACKTRACE:
9-
= note: called from `std::sys::pal::PLATFORM::abort_internal` at RUSTLIB/std/src/sys/pal/PLATFORM/mod.rs:LL:CC
10-
= note: called from `std::process::abort` at RUSTLIB/std/src/process.rs:LL:CC
11-
= note: called from `std::alloc::rust_oom` at RUSTLIB/std/src/alloc.rs:LL:CC
12-
= note: called from `std::alloc::_::__rg_oom` at RUSTLIB/std/src/alloc.rs:LL:CC
13-
= note: called from `std::alloc::handle_alloc_error::rt_error` at RUSTLIB/alloc/src/alloc.rs:LL:CC
14-
= note: called from `std::alloc::handle_alloc_error` at RUSTLIB/alloc/src/alloc.rs:LL:CC
15-
note: inside `main`
9+
= note: inside `std::sys::pal::PLATFORM::abort_internal` at RUSTLIB/std/src/sys/pal/PLATFORM/mod.rs:LL:CC
10+
= note: inside `std::process::abort` at RUSTLIB/std/src/process.rs:LL:CC
11+
= note: inside `std::alloc::rust_oom` at RUSTLIB/std/src/alloc.rs:LL:CC
12+
= note: inside `std::alloc::_::__rg_oom` at RUSTLIB/std/src/alloc.rs:LL:CC
13+
= note: inside `std::alloc::handle_alloc_error::rt_error` at RUSTLIB/alloc/src/alloc.rs:LL:CC
14+
= note: inside `std::alloc::handle_alloc_error` at RUSTLIB/alloc/src/alloc.rs:LL:CC
15+
note: called from `main`
1616
--> tests/fail/alloc/alloc_error_handler.rs:LL:CC
1717
|
1818
LL | handle_alloc_error(Layout::for_value(&0));

0 commit comments

Comments
 (0)