diff options
| -rw-r--r-- | doc/rust.md | 6 | ||||
| -rw-r--r-- | src/libstd/rt/unwind.rs | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/doc/rust.md b/doc/rust.md index 37a8b391142..ea592d1fde5 100644 --- a/doc/rust.md +++ b/doc/rust.md @@ -3605,10 +3605,8 @@ failed destructor. Nonetheless, the outermost unwinding activity will continue until the stack is unwound and the task transitions to the *dead* state. There is no way to "recover" from task failure. Once a task has temporarily suspended its unwinding in the *failing* state, failure -occurring from within this destructor results in *hard* failure. The -unwinding procedure of hard failure frees resources but does not execute -destructors. The original (soft) failure is still resumed at the point where -it was temporarily suspended. +occurring from within this destructor results in *hard* failure. +A hard failure currently results in the process aborting. A task in the *dead* state cannot transition to other states; it exists only to have its termination status inspected by other tasks, and/or to await diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index 358df7260f4..6be4ab97ee3 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -354,7 +354,13 @@ pub fn begin_unwind<M: Any + Send>(msg: M, file: &'static str, line: uint) -> ! } if (*task).unwinder.unwinding { - rtabort!("unwinding again"); + // If a task fails while it's already unwinding then we + // have limited options. Currently our preference is to + // just abort. In the future we may consider resuming + // unwinding or otherwise exiting the task cleanly. + rterrln!("task failed during unwinding (double-failure - total drag!)") + rterrln!("rust must abort now. so sorry."); + intrinsics::abort(); } } |