---

yaml
---
r: 22673
b: refs/heads/master
c: cbaa602
h: refs/heads/master
i:
  22671: ca5e86a
v: v3

Author: bblum

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: b30a58abe24643bdad8473850945f46927fb186b
+refs/heads/master: cbaa602dbd9904b9b095dfd4b3be7a473e1742c0
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libstd/test.rs

@@ -9,6 +9,7 @@ import either::either;
 import result::{ok, err};
 import io::writer_util;
 import libc::size_t;
+import task::task_builder;
 
 export test_name;
 export test_fn;
@@ -392,11 +393,11 @@ fn run_test(+test: test_desc, monitor_ch: comm::chan<monitor_msg>) {
 
     do task::spawn {
         let testfn = copy test.fn;
-        let mut builder = task::builder();
-        let result_future = task::future_result(builder);
-        task::unsupervise(builder);
-        task::run(builder, testfn);
-        let task_result = future::get(result_future);
+        let mut result_future = none; // task::future_result(builder);
+        task::task().unlinked().future_result(|-r| {
+            result_future = some(r);
+        }).spawn(testfn);
+        let task_result = future::get(option::unwrap(result_future));
         let test_result = calc_result(test, task_result == task::success);
         comm::send(monitor_ch, (copy test, test_result));
     };