From 90fbe38f0064836fd5e169c520d3fd19953e5604 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 13 Jun 2013 23:16:27 -0700
Subject: std::rt: Tasks must have an unwinder. Simpler

---
 src/libstd/task/mod.rs   | 11 +----------
 src/libstd/task/spawn.rs |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'src/libstd/task')

diff --git a/src/libstd/task/mod.rs b/src/libstd/task/mod.rs
index f24d2327358..faa505c1995 100644
--- a/src/libstd/task/mod.rs
+++ b/src/libstd/task/mod.rs
@@ -515,16 +515,7 @@ pub fn failing() -> bool {
         _ => {
             let mut unwinding = false;
             do Local::borrow::<Task> |local| {
-                unwinding = match local.unwinder {
-                    Some(unwinder) => {
-                        unwinder.unwinding
-                    }
-                    None => {
-                        // Because there is no unwinder we can't be unwinding.
-                        // (The process will abort on failure)
-                        false
-                    }
-                }
+                unwinding = local.unwinder.unwinding
             }
             return unwinding;
         }
diff --git a/src/libstd/task/spawn.rs b/src/libstd/task/spawn.rs
index a4fbec11d72..a17a6777a98 100644
--- a/src/libstd/task/spawn.rs
+++ b/src/libstd/task/spawn.rs
@@ -579,7 +579,7 @@ fn spawn_raw_newsched(_opts: TaskOpts, f: ~fn()) {
 
     let mut task = None;
     do Local::borrow::<Task>() |running_task| {
-        task = Some(~running_task.new_child_without_unwinding());
+        task = Some(~running_task.new_child());
     }
 
     let mut sched = Local::take::<Scheduler>();
-- 
cgit 1.4.1-3-g733a5