diff options
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/panicking.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/library/std/src/panicking.rs b/library/std/src/panicking.rs index 1039835bbbd..49c2f81403a 100644 --- a/library/std/src/panicking.rs +++ b/library/std/src/panicking.rs @@ -699,7 +699,11 @@ fn rust_panic_with_hook( // have limited options. Currently our preference is to // just abort. In the future we may consider resuming // unwinding or otherwise exiting the thread cleanly. - rtprintpanic!("thread panicked while panicking. aborting.\n"); + if !can_unwind { + rtprintpanic!("thread caused non-unwinding panic. aborting.\n"); + } else { + rtprintpanic!("thread panicked while panicking. aborting.\n"); + } crate::sys::abort_internal(); } |