about summary refs log tree commit diff
path: root/src/libstd/task/spawn.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2013-11-01 11:20:01 -0700
committerAlex Crichton <alex@alexcrichton.com>2013-11-01 11:58:25 -0700
commitb00449380f520deb65de26e654aeaba4561ee13f (patch)
treea55600b9d01023cb19606c7432472ec7196e3988 /src/libstd/task/spawn.rs
parent61637439dcced37391f7896561c0feb7790626f3 (diff)
downloadrust-b00449380f520deb65de26e654aeaba4561ee13f.tar.gz
rust-b00449380f520deb65de26e654aeaba4561ee13f.zip
Remove unnecessary unwind messages
Now that the type_id intrinsic is working across crates, all of these
unnecessary messages can be removed to have the failure type for a task truly be
~Any and only ~Any
Diffstat (limited to 'src/libstd/task/spawn.rs')
-rw-r--r--src/libstd/task/spawn.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/task/spawn.rs b/src/libstd/task/spawn.rs
index 4a98e396bbc..a4a43a01edd 100644
--- a/src/libstd/task/spawn.rs
+++ b/src/libstd/task/spawn.rs
@@ -83,11 +83,11 @@ use local_data;
 use rt::local::Local;
 use rt::sched::{Scheduler, Shutdown, TaskFromFriend};
 use rt::task::{Task, Sched};
-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 task::LinkedFailure;
 use task::SingleThreaded;
 use task::TaskOpts;
 use task::unkillable;
@@ -324,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(UnwindMessageLinked));
+                    x.task_result = Some(Failure(~LinkedFailure as ~Any));
                 }
                 // Take everybody down with us. After this point, every
                 // other task in the group will see 'tg' as none, which
@@ -379,7 +379,7 @@ impl AutoNotify {
             notify_chan: chan,
 
             // Un-set above when taskgroup successfully made.
-            task_result: Some(Failure(UnwindMessageStrStatic("AutoNotify::new()")))
+            task_result: Some(Failure(~("AutoNotify::new()") as ~Any))
         }
     }
 }