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/task/spawn.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/task/spawn.rs')
| -rw-r--r-- | src/libstd/task/spawn.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libstd/task/spawn.rs b/src/libstd/task/spawn.rs index a08bf8f3147..4a98e396bbc 100644 --- a/src/libstd/task/spawn.rs +++ b/src/libstd/task/spawn.rs @@ -83,12 +83,11 @@ use local_data; use rt::local::Local; use rt::sched::{Scheduler, Shutdown, TaskFromFriend}; use rt::task::{Task, Sched}; -use rt::task::{UnwindReasonLinked, UnwindReasonStr}; +use rt::task::{UnwindMessageLinked, UnwindMessageStrStatic}; use rt::task::{UnwindResult, Success, Failure}; use rt::thread::Thread; use rt::work_queue::WorkQueue; use rt::{in_green_task_context, new_event_loop, KillHandle}; -use send_str::IntoSendStr; use task::SingleThreaded; use task::TaskOpts; use task::unkillable; @@ -325,7 +324,7 @@ impl Drop for Taskgroup { do RuntimeGlue::with_task_handle_and_failing |me, failing| { if failing { for x in self.notifier.mut_iter() { - x.task_result = Some(Failure(UnwindReasonLinked)); + x.task_result = Some(Failure(UnwindMessageLinked)); } // Take everybody down with us. After this point, every // other task in the group will see 'tg' as none, which @@ -380,7 +379,7 @@ impl AutoNotify { notify_chan: chan, // Un-set above when taskgroup successfully made. - task_result: Some(Failure(UnwindReasonStr("AutoNotify::new()".into_send_str()))) + task_result: Some(Failure(UnwindMessageStrStatic("AutoNotify::new()"))) } } } |
