From a1ef79c9d2da211e5f418733cb34861bfe69e270 Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Fri, 6 Jan 2012 20:55:56 -0800
Subject: [PATCH] update to use new spawn syntax

---
 src/test/bench/shootout-pfib.rs                | 15 +++++++--------
 src/test/bench/task-perf-spawnalot.rs          |  4 ++--
 src/test/bench/task-perf-vector-party.rs       |  2 +-
 src/test/bench/task-perf-word-count-generic.rs |  9 +++++----
 src/test/compile-fail/spawn-non-nil-fn.rs      |  4 +---
 src/test/run-fail/linked-failure.rs            |  4 ++--
 src/test/run-fail/linked-failure2.rs           |  4 ++--
 src/test/run-fail/linked-failure3.rs           |  8 ++++----
 src/test/run-fail/linked-failure4.rs           | 12 ++++++------
 src/test/run-fail/morestack2.rs                |  4 ++--
 src/test/run-fail/morestack3.rs                |  4 +++-
 src/test/run-fail/morestack4.rs                |  4 +++-
 src/test/run-fail/spawnfail.rs                 |  4 ++--
 src/test/run-fail/task-comm-recv-block.rs      |  4 ++--
 14 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs
index 3ba6a6f7e2e..0ade9b73636 100644
--- a/src/test/bench/shootout-pfib.rs
+++ b/src/test/bench/shootout-pfib.rs
@@ -31,24 +31,23 @@
 import result::{ok, err};
 
 fn fib(n: int) -> int {
-    fn pfib(args: (chan<int>, int)) {
-        let (c, n) = args;
+    fn pfib(c: chan<int>, n: int) {
         if n == 0 {
             send(c, 0);
         } else if n <= 2 {
             send(c, 1);
         } else {
             let p = port();
-
-            let t1 = task::spawn((chan(p), n - 1), pfib);
-            let t2 = task::spawn((chan(p), n - 2), pfib);
-
+            let ch = chan(p);
+            task::spawn {|| pfib(ch, n - 1); };
+            task::spawn {|| pfib(ch, n - 2); };
             send(c, recv(p) + recv(p));
         }
     }
 
     let p = port();
-    let t = task::spawn((chan(p), n), pfib);
+    let ch = chan(p);
+    let t = task::spawn {|| pfib(ch, n); };
     ret recv(p);
 }
 
@@ -79,7 +78,7 @@ fn stress_task(&&id: int) {
 fn stress(num_tasks: int) {
     let tasks = [];
     range(0, num_tasks) {|i|
-        tasks += [task::spawn_joinable(copy i, stress_task)];
+        tasks += [task::spawn_joinable {|| stress_task(i); }];
     }
     for t in tasks { task::join(t); }
 }
diff --git a/src/test/bench/task-perf-spawnalot.rs b/src/test/bench/task-perf-spawnalot.rs
index 3b9b9a0a05b..d20c4d72cd0 100644
--- a/src/test/bench/task-perf-spawnalot.rs
+++ b/src/test/bench/task-perf-spawnalot.rs
@@ -7,7 +7,7 @@
 fn f(&&n: uint) {
     let i = 0u;
     while i < n {
-        task::join(task::spawn_joinable((), g));
+        task::join(task::spawn_joinable {|| g(); });
         i += 1u;
     }
 }
@@ -20,5 +20,5 @@ fn main(args: [str]) {
             10u
         } else { uint::parse_buf(str::bytes(args[1]), 10u) };
     let i = 0u;
-    while i < n { task::spawn(copy n, f); i += 1u; }
+    while i < n { task::spawn {|| f(n); }; i += 1u; }
 }
diff --git a/src/test/bench/task-perf-vector-party.rs b/src/test/bench/task-perf-vector-party.rs
index b5d7fbf24a0..000e3670500 100644
--- a/src/test/bench/task-perf-vector-party.rs
+++ b/src/test/bench/task-perf-vector-party.rs
@@ -21,5 +21,5 @@ fn main(args: [str]) {
         if vec::len(args) < 2u {
             100u
         } else { uint::parse_buf(str::bytes(args[1]), 10u) };
-    uint::range(0u, 100u) {|i| task::spawn(copy n, f); }
+    uint::range(0u, 100u) {|i| task::spawn {|| f(n); };}
 }
diff --git a/src/test/bench/task-perf-word-count-generic.rs b/src/test/bench/task-perf-word-count-generic.rs
index e13603aec91..1c5b7dc2516 100644
--- a/src/test/bench/task-perf-word-count-generic.rs
+++ b/src/test/bench/task-perf-word-count-generic.rs
@@ -79,7 +79,7 @@ fn start_mappers<K1: send, K2: send,
         let tasks = [];
         for i in inputs {
             let m = map, c = ctrl, ii = i;
-            tasks += [task::spawn_joinable(bind map_task(m, c, ii))];
+            tasks += [task::spawn_joinable {|| map_task(m, c, ii)}];
         }
         ret tasks;
     }
@@ -182,10 +182,11 @@ fn map_reduce<K: send1, K: send2,
                   none. {
                     // log(error, "creating new reducer for " + k);
                     let p = port();
+                    let ch = chan(p);
                     let r = reduce, kk = k;
-                    tasks +=
-                        [task::spawn_joinable(bind reduce_task(r, kk,
-                                                               chan(p)))];
+                    tasks += [
+                        task::spawn_joinable {|| reduce_task(r, kk, ch) }
+                    ];
                     c = recv(p);
                     treemap::insert(reducers, k, c);
                   }
diff --git a/src/test/compile-fail/spawn-non-nil-fn.rs b/src/test/compile-fail/spawn-non-nil-fn.rs
index e517be752e6..42e5145c862 100644
--- a/src/test/compile-fail/spawn-non-nil-fn.rs
+++ b/src/test/compile-fail/spawn-non-nil-fn.rs
@@ -3,6 +3,4 @@
 use std;
 import task;
 
-fn f(&&x: int) -> int { ret x; }
-
-fn main() { task::spawn(10, f); }
+fn main() { task::spawn(sendfn() -> int { 10 }); }
diff --git a/src/test/run-fail/linked-failure.rs b/src/test/run-fail/linked-failure.rs
index 0baa9fd9098..62ecac925bb 100644
--- a/src/test/run-fail/linked-failure.rs
+++ b/src/test/run-fail/linked-failure.rs
@@ -6,10 +6,10 @@
 import comm::port;
 import comm::recv;
 
-fn child(&&_i: ()) { assert (1 == 2); }
+fn child() { assert (1 == 2); }
 
 fn main() {
     let p = port::<int>();
-    task::spawn((), child);
+    task::spawn {|| child(); };
     let x = recv(p);
 }
diff --git a/src/test/run-fail/linked-failure2.rs b/src/test/run-fail/linked-failure2.rs
index a52c1fed1ca..5350159475c 100644
--- a/src/test/run-fail/linked-failure2.rs
+++ b/src/test/run-fail/linked-failure2.rs
@@ -7,10 +7,10 @@
 import comm::port;
 import comm::recv;
 
-fn child(&&_i: ()) { fail; }
+fn child() { fail; }
 
 fn main() {
     let p = port::<int>();
-    task::spawn((), child);
+    task::spawn {|| child(); };
     task::yield();
 }
diff --git a/src/test/run-fail/linked-failure3.rs b/src/test/run-fail/linked-failure3.rs
index b24c6d8a6cf..4c807712c65 100644
--- a/src/test/run-fail/linked-failure3.rs
+++ b/src/test/run-fail/linked-failure3.rs
@@ -6,16 +6,16 @@
 import comm::port;
 import comm::recv;
 
-fn grandchild(&&_i: ()) { fail; }
+fn grandchild() { fail "grandchild dies"; }
 
-fn child(&&_i: ()) {
+fn child() {
     let p = port::<int>();
-    task::spawn((), grandchild);
+    task::spawn {|| grandchild(); };
     let x = recv(p);
 }
 
 fn main() {
     let p = port::<int>();
-    task::spawn((), child);
+    task::spawn {|| child(); };
     let x = recv(p);
 }
diff --git a/src/test/run-fail/linked-failure4.rs b/src/test/run-fail/linked-failure4.rs
index ef544778d43..629cc925749 100644
--- a/src/test/run-fail/linked-failure4.rs
+++ b/src/test/run-fail/linked-failure4.rs
@@ -6,22 +6,22 @@
 import comm::port;
 import comm::recv;
 
-fn child(&&_args: ()) { assert (1 == 2); }
+fn child() { assert (1 == 2); }
 
-fn parent(&&_args: ()) {
+fn parent() {
     let p = port::<int>();
-    task::spawn((), child);
+    task::spawn {|| child(); };
     let x = recv(p);
 }
 
 // This task is not linked to the failure chain, but since the other
 // tasks are going to fail the kernel, this one will fail too
-fn sleeper(&&_args: ()) {
+fn sleeper() {
     let p = port::<int>();
     let x = recv(p);
 }
 
 fn main() {
-    task::spawn((), sleeper);
-    task::spawn((), parent);
+    task::spawn {|| sleeper(); };
+    task::spawn {|| parent(); };
 }
\ No newline at end of file
diff --git a/src/test/run-fail/morestack2.rs b/src/test/run-fail/morestack2.rs
index beb62d72e1d..60b79ee1537 100644
--- a/src/test/run-fail/morestack2.rs
+++ b/src/test/run-fail/morestack2.rs
@@ -30,8 +30,8 @@ fn getbig(i: int) {
 }
 
 fn main() {
-    task::spawn((), fn (&&_i: ()) {
+    task::spawn {||
         let r = and_then_get_big_again(());
         getbig_call_c_and_fail(10000);
-    });
+    };
 }
\ No newline at end of file
diff --git a/src/test/run-fail/morestack3.rs b/src/test/run-fail/morestack3.rs
index dd52986c4a4..223f9211307 100644
--- a/src/test/run-fail/morestack3.rs
+++ b/src/test/run-fail/morestack3.rs
@@ -23,5 +23,7 @@ fn getbig(i: int) {
 }
 
 fn main() {
-    task::spawn(400, getbig_and_fail);
+    task::spawn {||
+        getbig_and_fail(400);
+    };
 }
\ No newline at end of file
diff --git a/src/test/run-fail/morestack4.rs b/src/test/run-fail/morestack4.rs
index 3c85c45e897..b36372d74e1 100644
--- a/src/test/run-fail/morestack4.rs
+++ b/src/test/run-fail/morestack4.rs
@@ -22,5 +22,7 @@ fn getbig_and_fail(&&i: int) {
 
 fn main() {
     rustrt::set_min_stack(256u);
-    task::spawn(1, getbig_and_fail);
+    task::spawn {||
+        getbig_and_fail(1);
+    };
 }
\ No newline at end of file
diff --git a/src/test/run-fail/spawnfail.rs b/src/test/run-fail/spawnfail.rs
index 87cf90fc69d..8d342d7fe74 100644
--- a/src/test/run-fail/spawnfail.rs
+++ b/src/test/run-fail/spawnfail.rs
@@ -5,8 +5,8 @@
 
 // We don't want to see any invalid reads
 fn main() {
-    fn f(&&_i: ()) {
+    fn f() {
         fail;
     }
-    task::spawn((), f);
+    task::spawn {|| f(); };
 }
\ No newline at end of file
diff --git a/src/test/run-fail/task-comm-recv-block.rs b/src/test/run-fail/task-comm-recv-block.rs
index 314921cdfb7..50a32ed296c 100644
--- a/src/test/run-fail/task-comm-recv-block.rs
+++ b/src/test/run-fail/task-comm-recv-block.rs
@@ -4,13 +4,13 @@
 import task;
 import comm;
 
-fn goodfail(&&_i: ()) {
+fn goodfail() {
     task::yield();
     fail "goodfail";
 }
 
 fn main() {
-    task::spawn((), goodfail);
+    task::spawn {|| goodfail(); };
     let po = comm::port();
     // We shouldn't be able to get past this recv since there's no
     // message available
-- 
2.44.0