Skip to content

Commit

Permalink
Rollup merge of #115280 - RalfJung:panic-cleanup-triple-backtrace, r=…
Browse files Browse the repository at this point in the history
…Amanieu

avoid triple-backtrace due to panic-during-cleanup

Supersedes rust-lang/rust#115020
Cc rust-lang/rust#114954
r? ``@Amanieu``
  • Loading branch information
matthiaskrgr authored Aug 28, 2023
2 parents 4976b5f + 5ea0257 commit 3464945
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions tests/fail/panic/double_panic.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ second
stack backtrace:
thread 'main' panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
panic in a destructor during cleanup
stack backtrace:
thread caused non-unwinding panic. aborting.
error: abnormal termination: the program aborted execution
--> RUSTLIB/std/src/sys/PLATFORM/mod.rs:LL:CC
Expand All @@ -19,7 +18,7 @@ LL | ABORT();
= note: inside closure at RUSTLIB/std/src/panicking.rs:LL:CC
= note: inside `std::sys_common::backtrace::__rust_end_short_backtrace::<[closure@std::panicking::begin_panic_handler::{closure#0}], !>` at RUSTLIB/std/src/sys_common/backtrace.rs:LL:CC
= note: inside `std::panicking::begin_panic_handler` at RUSTLIB/std/src/panicking.rs:LL:CC
= note: inside `core::panicking::panic_nounwind` at RUSTLIB/core/src/panicking.rs:LL:CC
= note: inside `core::panicking::panic_nounwind_nobacktrace` at RUSTLIB/core/src/panicking.rs:LL:CC
= note: inside `core::panicking::panic_in_cleanup` at RUSTLIB/core/src/panicking.rs:LL:CC
note: inside `main`
--> $DIR/double_panic.rs:LL:CC
Expand Down

0 comments on commit 3464945

Please sign in to comment.