Skip to content

Commit 8ffecbd

Browse files
committed
Auto merge of #115303 - matthiaskrgr:rollup-iohs8a5, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #109660 (Document that SystemTime does not count leap seconds) - #114238 (Fix implementation of `Duration::checked_div`) - #114512 (std/tests: disable ancillary tests on freebsd since the feature itsel…) - #114919 (style-guide: Add guidance for defining formatting for specific macros) - #115278 (tell people what to do when removing an error code) - #115280 (avoid triple-backtrace due to panic-during-cleanup) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 6659ca3 + 3464945 commit 8ffecbd

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

tests/fail/panic/double_panic.stderr

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ second
66
stack backtrace:
77
thread 'main' panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
88
panic in a destructor during cleanup
9-
stack backtrace:
109
thread caused non-unwinding panic. aborting.
1110
error: abnormal termination: the program aborted execution
1211
--> RUSTLIB/std/src/sys/PLATFORM/mod.rs:LL:CC
@@ -19,7 +18,7 @@ LL | ABORT();
1918
= note: inside closure at RUSTLIB/std/src/panicking.rs:LL:CC
2019
= 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
2120
= note: inside `std::panicking::begin_panic_handler` at RUSTLIB/std/src/panicking.rs:LL:CC
22-
= note: inside `core::panicking::panic_nounwind` at RUSTLIB/core/src/panicking.rs:LL:CC
21+
= note: inside `core::panicking::panic_nounwind_nobacktrace` at RUSTLIB/core/src/panicking.rs:LL:CC
2322
= note: inside `core::panicking::panic_in_cleanup` at RUSTLIB/core/src/panicking.rs:LL:CC
2423
note: inside `main`
2524
--> $DIR/double_panic.rs:LL:CC

0 commit comments

Comments
 (0)