diff options
| author | bors <bors@rust-lang.org> | 2013-10-30 18:31:26 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-10-30 18:31:26 -0700 |
| commit | f73a48e9fd6c214976888d8583fb87de55dd05d8 (patch) | |
| tree | 2b831b569632c393f36c3fccfc20ca8ba4f87b0f /src/libstd/rt/kill.rs | |
| parent | 6789a77fa02b5f7c3f9ca0261a5387a951d23caf (diff) | |
| parent | 54f4dcd76aafe33c553f6b58fe3e808f055465e1 (diff) | |
| download | rust-f73a48e9fd6c214976888d8583fb87de55dd05d8.tar.gz rust-f73a48e9fd6c214976888d8583fb87de55dd05d8.zip | |
auto merge of #10120 : Kimundi/rust/remove_sys, r=alexcrichton
- `begin_unwind` and `fail!` is now generic over any `T: Any + Send`. - Every value you fail with gets boxed as an `~Any`. - Because of implementation issues, `&'static str` and `~str` are still handled specially behind the scenes. - Changed the big macro source string in libsyntax to a raw string literal, and enabled doc comments there.
Diffstat (limited to 'src/libstd/rt/kill.rs')
| -rw-r--r-- | src/libstd/rt/kill.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/rt/kill.rs b/src/libstd/rt/kill.rs index edf6ffb820b..949421db9fc 100644 --- a/src/libstd/rt/kill.rs +++ b/src/libstd/rt/kill.rs @@ -155,7 +155,7 @@ use cell::Cell; use option::{Option, Some, None}; use prelude::*; use rt::task::Task; -use rt::task::UnwindReasonLinked; +use rt::task::UnwindMessageLinked; use rt::task::{UnwindResult, Failure}; use task::spawn::Taskgroup; use to_bytes::IterBytes; @@ -597,7 +597,7 @@ impl Death { } if !success { - result = Cell::new(Failure(UnwindReasonLinked)); + result = Cell::new(Failure(UnwindMessageLinked)); } } on_exit(result.take()); |
