Skip to content

Commit 33cc55f

Browse files
committed
Auto merge of #122497 - matthiaskrgr:rollup-pg9ux4r, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - #119029 (Avoid closing invalid handles) - #122238 (Document some builtin impls in the next solver) - #122247 (rustdoc-search: depth limit `T<U>` -> `U` unboxing) - #122287 (add test ensuring simd codegen checks don't run when a static assertion failed) - #122368 (chore: remove repetitive words) - #122397 (Various cleanups around the const eval query providers) - #122406 (Fix WF for `AsyncFnKindHelper` in new trait solver) - #122477 (Change some attribute to only_local) - #122482 (Ungate the `UNKNOWN_OR_MALFORMED_DIAGNOSTIC_ATTRIBUTES` lint) - #122490 (Update build instructions for OpenHarmony) Failed merges: - #122471 (preserve span when evaluating mir::ConstOperand) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 2bf8dae + e5f4ab9 commit 33cc55f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/diagnostics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ impl<'mir, 'tcx> MiriMachine<'mir, 'tcx> {
528528
use NonHaltingDiagnostic::*;
529529

530530
let stacktrace =
531-
MiriInterpCx::generate_stacktrace_from_stack(self.threads.active_thread_stack());
531+
Frame::generate_stacktrace_from_stack(self.threads.active_thread_stack());
532532
let (stacktrace, _was_pruned) = prune_stacktrace(stacktrace, self);
533533

534534
let (title, diag_level) = match &e {

0 commit comments

Comments
 (0)