Using move-mode for spawn thunks to avoid race conditions.

2 files changed, 5 insertions, 4 deletions

diff --git a/src/test/bench/task-perf-spawnalot.rs b/src/test/bench/task-perf-spawnalot.rs
index 50182155ad9..48e1b4d8087 100644
--- a/src/test/bench/task-perf-spawnalot.rs
+++ b/src/test/bench/task-perf-spawnalot.rs
@@ -7,7 +7,8 @@ import std::str;
 fn f(n: uint) {
     let i = 0u;
     while i < n {
-        task::join_id(task::_spawn(bind g()));
+        let thunk = g;
+        task::join_id(task::spawn(thunk));
         i += 1u;
     }
 }
@@ -23,7 +24,7 @@ fn main(args: [str]) {
     };
     let i = 0u;
     while i < n {
-        task::_spawn(bind f(n));
+        task::spawn(bind f(n));
         i += 1u;
     }
 }
diff --git a/src/test/bench/task-perf-word-count.rs b/src/test/bench/task-perf-word-count.rs
index 914446e1300..54bfae13c23 100644
--- a/src/test/bench/task-perf-word-count.rs
+++ b/src/test/bench/task-perf-word-count.rs
@@ -77,7 +77,7 @@ mod map_reduce {
     fn start_mappers(ctrl: _chan<ctrl_proto>, inputs: &[str]) -> [task_id] {
         let tasks = ~[];
         for i: str in inputs {
-            tasks += ~[task::_spawn(bind map_task(ctrl, i))];
+            tasks += ~[task::spawn(bind map_task(ctrl, i))];
         }
         ret tasks;
     }
@@ -179,7 +179,7 @@ mod map_reduce {
                     // log_err "creating new reducer for " + k;
                     let p = mk_port();
                     tasks +=
-                        ~[task::_spawn(bind reduce_task(k, p.mk_chan()))];
+                        ~[task::spawn(bind reduce_task(k, p.mk_chan()))];
                     c = p.recv();
                     reducers.insert(k, c);
                   }