Drop the 2 from the spawn*2 functions

Issue #1022

61 files changed, 107 insertions, 107 deletions

diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs
index fdf158451c3..da550f1735b 100644
--- a/src/compiletest/compiletest.rs
+++ b/src/compiletest/compiletest.rs
@@ -191,7 +191,7 @@ fn closure_to_task(cx: cx, configport: port<[u8]>, testfn: fn()) ->
     testfn();
     let testfile = recv(configport);
 
-    ret task::spawn_joinable2(
+    ret task::spawn_joinable(
         (cx.config, cx.procsrv.chan, testfile), run_test_task);
 }
 
diff --git a/src/compiletest/procsrv.rs b/src/compiletest/procsrv.rs
index 3d2f622ed34..099968a23ea 100644
--- a/src/compiletest/procsrv.rs
+++ b/src/compiletest/procsrv.rs
@@ -37,7 +37,7 @@ type response = {pid: int, infd: int, outfd: int, errfd: int};
 
 fn mk() -> handle {
     let setupport = port();
-    let task = task::spawn_joinable2(
+    let task = task::spawn_joinable(
         chan(setupport),
         fn# (setupchan: chan<chan<request>>) {
             let reqport = port();
diff --git a/src/lib/aio.rs b/src/lib/aio.rs
index 618e3f08726..c06d1fa3db1 100644
--- a/src/lib/aio.rs
+++ b/src/lib/aio.rs
@@ -107,7 +107,7 @@ fn# server_task(args: (net::ip_addr, int, chan<server_event>,
         if rustrt::aio_is_null_client(client) {
             log "client was actually null, returning";
             ret;
-        } else { task::spawn2((client, events), accept_task); }
+        } else { task::spawn((client, events), accept_task); }
     }
 }
 
@@ -129,10 +129,10 @@ fn# request_task(c: chan<ctx>) {
             ret;
           }
           connect(remote(ip, portnum), client) {
-            task::spawn2((ip, portnum, client), connect_task);
+            task::spawn((ip, portnum, client), connect_task);
           }
           serve(ip, portnum, events, server) {
-            task::spawn2((ip, portnum, events, server), server_task);
+            task::spawn((ip, portnum, events, server), server_task);
           }
           write(socket, v, status) unsafe {
             rustrt::aio_writedata(socket, vec::unsafe::to_ptr::<u8>(v),
@@ -157,7 +157,7 @@ fn# iotask(c: chan<ctx>) {
 
     log "io task init";
     // Spawn our request task
-    let reqtask = task::spawn_joinable2(c, request_task);
+    let reqtask = task::spawn_joinable(c, request_task);
 
     log "uv run task init";
     // Enter IO loop. This never returns until aio_stop is called.
@@ -169,7 +169,7 @@ fn# iotask(c: chan<ctx>) {
 
 fn new() -> ctx {
     let p: port<ctx> = port();
-    task::spawn2(chan(p), iotask);
+    task::spawn(chan(p), iotask);
     ret recv(p);
 }
 
diff --git a/src/lib/task.rs b/src/lib/task.rs
index a0c1e37aff1..8808f0c8d02 100644
--- a/src/lib/task.rs
+++ b/src/lib/task.rs
@@ -18,9 +18,9 @@ export task_result;
 export tr_success;
 export tr_failure;
 export get_task_id;
-export spawn2;
-export spawn_notify2;
-export spawn_joinable2;
+export spawn;
+export spawn_notify;
+export spawn_joinable;
 
 native "rust" mod rustrt {
     fn task_sleep(time_in_us: uint);
@@ -93,18 +93,18 @@ fn unpin() { rustrt::unpin_task(); }
 
 fn set_min_stack(stack_size: uint) { rustrt::set_min_stack(stack_size); }
 
-fn spawn2<~T>(-data: T, f: fn#(T)) -> task {
+fn spawn<~T>(-data: T, f: fn#(T)) -> task {
     spawn_inner2(data, f, none)
 }
 
-fn spawn_notify2<~T>(-data: T, f: fn#(T),
+fn spawn_notify<~T>(-data: T, f: fn#(T),
                          notify: comm::chan<task_notification>) -> task {
     spawn_inner2(data, f, some(notify))
 }
 
-fn spawn_joinable2<~T>(-data: T, f: fn#(T)) -> joinable_task {
+fn spawn_joinable<~T>(-data: T, f: fn#(T)) -> joinable_task {
     let p = comm::port::<task_notification>();
-    let id = spawn_notify2(data, f, comm::chan::<task_notification>(p));
+    let id = spawn_notify(data, f, comm::chan::<task_notification>(p));
     ret (id, p);
 }
 
diff --git a/src/lib/test.rs b/src/lib/test.rs
index f40874842be..17d34ed4c1f 100644
--- a/src/lib/test.rs
+++ b/src/lib/test.rs
@@ -325,7 +325,7 @@ fn default_test_to_task(&&f: default_test_fn) -> joinable {
         configure_test_task();
         f();
     }
-    ret task::spawn_joinable2(f, run_task);
+    ret task::spawn_joinable(f, run_task);
 }
 
 // Call from within a test task to make sure it's set up correctly
diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs
index 018cdc330e8..292db247e6f 100644
--- a/src/test/bench/shootout-pfib.rs
+++ b/src/test/bench/shootout-pfib.rs
@@ -36,15 +36,15 @@ fn fib(n: int) -> int {
         } else {
             let p = port();
 
-            let t1 = task::spawn2((chan(p), n - 1), pfib);
-            let t2 = task::spawn2((chan(p), n - 2), pfib);
+            let t1 = task::spawn((chan(p), n - 1), pfib);
+            let t2 = task::spawn((chan(p), n - 2), pfib);
 
             send(c, recv(p) + recv(p));
         }
     }
 
     let p = port();
-    let t = task::spawn2((chan(p), n), pfib);
+    let t = task::spawn((chan(p), n), pfib);
     ret recv(p);
 }
 
@@ -75,7 +75,7 @@ fn# stress_task(&&id: int) {
 fn stress(num_tasks: int) {
     let tasks = [];
     for each i: int in range(0, num_tasks) {
-        tasks += [task::spawn_joinable2(copy i, stress_task)];
+        tasks += [task::spawn_joinable(copy i, stress_task)];
     }
     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 87de2a8ccb5..ff8c0cb05f7 100644
--- a/src/test/bench/task-perf-spawnalot.rs
+++ b/src/test/bench/task-perf-spawnalot.rs
@@ -7,7 +7,7 @@ import std::str;
 fn# f(&&n: uint) {
     let i = 0u;
     while i < n {
-        task::join(task::spawn_joinable2((), 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::spawn2(copy n, f); i += 1u; }
+    while i < n { task::spawn(copy n, f); i += 1u; }
 }
diff --git a/src/test/bench/task-perf-vector-party.rs b/src/test/bench/task-perf-vector-party.rs
index 62f2b704a2e..c8c359b11cc 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) };
-    for each i in uint::range(0u, 100u) { task::spawn2(copy n, f); }
+    for each i in uint::range(0u, 100u) { task::spawn(copy n, f); }
 }
diff --git a/src/test/bench/task-perf-word-count.rs b/src/test/bench/task-perf-word-count.rs
index cedb8c53ad4..5316941355f 100644
--- a/src/test/bench/task-perf-word-count.rs
+++ b/src/test/bench/task-perf-word-count.rs
@@ -70,7 +70,7 @@ mod map_reduce {
        [joinable_task] {
         let tasks = [];
         for i: str in inputs {
-            tasks += [task::spawn_joinable2((ctrl, i), map_task)];
+            tasks += [task::spawn_joinable((ctrl, i), map_task)];
         }
         ret tasks;
     }
@@ -171,7 +171,7 @@ mod map_reduce {
                     // log_err "creating new reducer for " + k;
                     let p = port();
                     tasks +=
-                        [task::spawn_joinable2((k, chan(p)), reduce_task)];
+                        [task::spawn_joinable((k, chan(p)), reduce_task)];
                     c = recv(p);
                     reducers.insert(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 76eaf2e29ac..5e467d1e03f 100644
--- a/src/test/compile-fail/spawn-non-nil-fn.rs
+++ b/src/test/compile-fail/spawn-non-nil-fn.rs
@@ -5,4 +5,4 @@ import std::task;
 
 fn# f(&&x: int) -> int { ret x; }
 
-fn main() { task::spawn2(10, f); }
+fn main() { task::spawn(10, f); }
diff --git a/src/test/run-fail/linked-failure.rs b/src/test/run-fail/linked-failure.rs
index e471908d5db..0b6bea132d2 100644
--- a/src/test/run-fail/linked-failure.rs
+++ b/src/test/run-fail/linked-failure.rs
@@ -10,6 +10,6 @@ fn# child(&&_i: ()) { assert (1 == 2); }
 
 fn main() {
     let p = port::<int>();
-    task::spawn2((), 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 1a9fe3a8d83..61d1827f055 100644
--- a/src/test/run-fail/linked-failure2.rs
+++ b/src/test/run-fail/linked-failure2.rs
@@ -11,6 +11,6 @@ fn# child(&&_i: ()) { fail; }
 
 fn main() {
     let p = port::<int>();
-    task::spawn2((), 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 7e280c3d20f..057095a3a4b 100644
--- a/src/test/run-fail/linked-failure3.rs
+++ b/src/test/run-fail/linked-failure3.rs
@@ -10,12 +10,12 @@ fn# grandchild(&&_i: ()) { fail; }
 
 fn# child(&&_i: ()) {
     let p = port::<int>();
-    task::spawn2((), grandchild);
+    task::spawn((), grandchild);
     let x = recv(p);
 }
 
 fn main() {
     let p = port::<int>();
-    task::spawn2((), child);
+    task::spawn((), child);
     let x = recv(p);
 }
diff --git a/src/test/run-fail/task-comm-recv-block.rs b/src/test/run-fail/task-comm-recv-block.rs
index ea161cb9a4f..98778a9f9d7 100644
--- a/src/test/run-fail/task-comm-recv-block.rs
+++ b/src/test/run-fail/task-comm-recv-block.rs
@@ -10,7 +10,7 @@ fn# goodfail(&&_i: ()) {
 }
 
 fn main() {
-    task::spawn2((), goodfail);
+    task::spawn((), goodfail);
     let po = comm::port();
     // We shouldn't be able to get past this recv since there's no
     // message available
diff --git a/src/test/run-pass/basic-1.rs b/src/test/run-pass/basic-1.rs
index 7122a3d50fa..dbfd515244a 100644
--- a/src/test/run-pass/basic-1.rs
+++ b/src/test/run-pass/basic-1.rs
@@ -11,8 +11,8 @@ fn# a(c: chan<int>) { send(c, 10); }
 
 fn main() {
     let p = port();
-    task::spawn2(chan(p), a);
-    task::spawn2(chan(p), a);
+    task::spawn(chan(p), a);
+    task::spawn(chan(p), a);
     let n: int = 0;
     n = recv(p);
     n = recv(p);
diff --git a/src/test/run-pass/basic-2.rs b/src/test/run-pass/basic-2.rs
index c47cc395fb6..5a7dc86f64f 100644
--- a/src/test/run-pass/basic-2.rs
+++ b/src/test/run-pass/basic-2.rs
@@ -11,8 +11,8 @@ fn# a(c: chan<int>) { log "task a0"; log "task a1"; send(c, 10); }
 
 fn main() {
     let p = comm::port();
-    task::spawn2(chan(p), a);
-    task::spawn2(chan(p), b);
+    task::spawn(chan(p), a);
+    task::spawn(chan(p), b);
     let n: int = 0;
     n = recv(p);
     n = recv(p);
diff --git a/src/test/run-pass/basic.rs b/src/test/run-pass/basic.rs
index d4c92e33a1f..381ebba1128 100644
--- a/src/test/run-pass/basic.rs
+++ b/src/test/run-pass/basic.rs
@@ -26,8 +26,8 @@ fn main() {
     let n: int = 2 + 3 * 7;
     let s: str = "hello there";
     let p = comm::port();
-    task::spawn2(chan(p), a);
-    task::spawn2(chan(p), b);
+    task::spawn(chan(p), a);
+    task::spawn(chan(p), b);
     let x: int = 10;
     x = g(n, s);
     log x;
diff --git a/src/test/run-pass/binops.rs b/src/test/run-pass/binops.rs
index df98d52d9fd..ee3476c9477 100644
--- a/src/test/run-pass/binops.rs
+++ b/src/test/run-pass/binops.rs
@@ -89,8 +89,8 @@ fn test_ptr() {
 fn test_task() {
     fn# f(&&_i: ()) { }
     let f1 = f, f2 = f;
-    let t1 = task::spawn2((), f1);
-    let t2 = task::spawn2((), f2);
+    let t1 = task::spawn((), f1);
+    let t2 = task::spawn((), f2);
 
     assert (t1 == t1);
     assert (t1 != t2);
diff --git a/src/test/run-pass/chan-leak.rs b/src/test/run-pass/chan-leak.rs
index 575a120a0db..5ea0cda7783 100644
--- a/src/test/run-pass/chan-leak.rs
+++ b/src/test/run-pass/chan-leak.rs
@@ -23,7 +23,7 @@ fn# request_task(c: chan<ctx>) {
 
 fn new() -> ctx {
     let p = port();
-    let t = task::spawn2(chan(p), request_task);
+    let t = task::spawn(chan(p), request_task);
     let cx: ctx;
     cx = recv(p);
     ret cx;
diff --git a/src/test/run-pass/child-outlives-parent.rs b/src/test/run-pass/child-outlives-parent.rs
index 055fc69b97d..a2f7a59f917 100644
--- a/src/test/run-pass/child-outlives-parent.rs
+++ b/src/test/run-pass/child-outlives-parent.rs
@@ -5,4 +5,4 @@ import std::task;
 
 fn# child2(&&s: str) { }
 
-fn main() { let x = task::spawn2("hi", child2); }
+fn main() { let x = task::spawn("hi", child2); }
diff --git a/src/test/run-pass/comm.rs b/src/test/run-pass/comm.rs
index 39dea4f39be..c8a911596cf 100644
--- a/src/test/run-pass/comm.rs
+++ b/src/test/run-pass/comm.rs
@@ -9,7 +9,7 @@ import std::task;
 
 fn main() {
     let p = comm::port();
-    let t = task::spawn2(chan(p), child);
+    let t = task::spawn(chan(p), child);
     let y = recv(p);
     log_err "received";
     log_err y;
diff --git a/src/test/run-pass/hashmap-memory.rs b/src/test/run-pass/hashmap-memory.rs
index a6783267c58..ade075d856d 100644
--- a/src/test/run-pass/hashmap-memory.rs
+++ b/src/test/run-pass/hashmap-memory.rs
@@ -33,7 +33,7 @@ mod map_reduce {
     tag ctrl_proto { find_reducer([u8], chan<int>); mapper_done; }
 
     fn start_mappers(ctrl: chan<ctrl_proto>, inputs: [str]) {
-        for i: str in inputs { task::spawn2((ctrl, i), map_task); }
+        for i: str in inputs { task::spawn((ctrl, i), map_task); }
     }
 
     fn# map_task(&&args: (chan<ctrl_proto>, str)) {
diff --git a/src/test/run-pass/issue-506.rs b/src/test/run-pass/issue-506.rs
index 8eace3302b5..be73f314d80 100644
--- a/src/test/run-pass/issue-506.rs
+++ b/src/test/run-pass/issue-506.rs
@@ -11,4 +11,4 @@ native "rust" mod rustrt {
 
 fn# yield_wrap(&&_i: ()) unsafe { rustrt::task_yield(); }
 
-fn main() { task::spawn2((), yield_wrap); }
+fn main() { task::spawn((), yield_wrap); }
diff --git a/src/test/run-pass/issue-507.rs b/src/test/run-pass/issue-507.rs
index 457cf4533f6..89744707fbc 100644
--- a/src/test/run-pass/issue-507.rs
+++ b/src/test/run-pass/issue-507.rs
@@ -18,14 +18,14 @@ import std::comm::recv;
 fn# grandchild(c: chan<int>) { send(c, 42); }
 
 fn# child(c: chan<int>) {
-    let _grandchild = task::spawn_joinable2(c, grandchild);
+    let _grandchild = task::spawn_joinable(c, grandchild);
     join(_grandchild);
 }
 
 fn main() {
     let p = comm::port();
 
-    let _child = task::spawn_joinable2(chan(p), child);
+    let _child = task::spawn_joinable(chan(p), child);
 
     let x: int = recv(p);
 
diff --git a/src/test/run-pass/issue-687.rs b/src/test/run-pass/issue-687.rs
index bb8f04b84bf..76989f47c6f 100644
--- a/src/test/run-pass/issue-687.rs
+++ b/src/test/run-pass/issue-687.rs
@@ -37,10 +37,10 @@ fn# packager(&&args: (chan<chan<[u8]>>, chan<msg>)) {
 fn main() {
     let p: port<msg> = port();
     let recv_reader: port<chan<[u8]>> = port();
-    let pack = task::spawn2((chan(recv_reader), chan(p)), packager);
+    let pack = task::spawn((chan(recv_reader), chan(p)), packager);
 
     let source_chan: chan<[u8]> = recv(recv_reader);
-    let prod = task::spawn2(source_chan, producer);
+    let prod = task::spawn(source_chan, producer);
 
     while true {
         let msg = recv(p);
diff --git a/src/test/run-pass/ivec-tag.rs b/src/test/run-pass/ivec-tag.rs
index 33fdc72c4bb..6b61def87f6 100644
--- a/src/test/run-pass/ivec-tag.rs
+++ b/src/test/run-pass/ivec-tag.rs
@@ -15,7 +15,7 @@ fn# producer(c: chan<[u8]>) {
 
 fn main() {
     let p: port<[u8]> = port();
-    let prod = task::spawn2(chan(p), producer);
+    let prod = task::spawn(chan(p), producer);
 
     let data: [u8] = recv(p);
 }
diff --git a/src/test/run-pass/join.rs b/src/test/run-pass/join.rs
index 326841ed762..323abbce931 100644
--- a/src/test/run-pass/join.rs
+++ b/src/test/run-pass/join.rs
@@ -5,7 +5,7 @@ use std;
 import std::task::*;
 
 fn main() {
-    let other = spawn_joinable2((), child);
+    let other = spawn_joinable((), child);
     log_err "1";
     yield();
     join(other);
diff --git a/src/test/run-pass/lazychan.rs b/src/test/run-pass/lazychan.rs
index 3d2588e798a..93eb368febb 100644
--- a/src/test/run-pass/lazychan.rs
+++ b/src/test/run-pass/lazychan.rs
@@ -8,13 +8,13 @@ fn main() {
     let p = port();
     let y: int;
 
-    task::spawn2(chan(p), child);
+    task::spawn(chan(p), child);
     y = recv(p);
     log "received 1";
     log y;
     assert (y == 10);
 
-    task::spawn2(chan(p), child);
+    task::spawn(chan(p), child);
     y = recv(p);
     log "received 2";
     log y;
diff --git a/src/test/run-pass/linked-failure.rs b/src/test/run-pass/linked-failure.rs
index 6f0d6efb2cf..1bee29271b9 100644
--- a/src/test/run-pass/linked-failure.rs
+++ b/src/test/run-pass/linked-failure.rs
@@ -12,10 +12,10 @@ fn# parent(&&_i: ()) {
     // process
     task::unsupervise();
     let p = port::<int>();
-    task::spawn2((), child);
+    task::spawn((), child);
     let x = recv(p);
 }
 
 fn main() {
-    task::spawn2((), parent);
+    task::spawn((), parent);
 }
\ No newline at end of file
diff --git a/src/test/run-pass/lots-a-fail.rs b/src/test/run-pass/lots-a-fail.rs
index 33e116bed1c..ded0a0268ad 100644
--- a/src/test/run-pass/lots-a-fail.rs
+++ b/src/test/run-pass/lots-a-fail.rs
@@ -10,11 +10,11 @@ fn# die(&&_i: ()) {
 
 fn# iloop(&&_i: ()) {
     task::unsupervise();
-    task::spawn2((), die);
+    task::spawn((), die);
 }
 
 fn main() {
     for each i in uint::range(0u, 100u) {
-        task::spawn2((), iloop);
+        task::spawn((), iloop);
     }
 }
\ No newline at end of file
diff --git a/src/test/run-pass/many.rs b/src/test/run-pass/many.rs
index 660ea0eb568..4d4607b0a86 100644
--- a/src/test/run-pass/many.rs
+++ b/src/test/run-pass/many.rs
@@ -10,7 +10,7 @@ fn# sub(&&args: (comm::chan<int>, int)) {
         comm::send(parent, 0);
     } else {
         let p = comm::port();
-        let child = task::spawn2((comm::chan(p), id - 1), sub);
+        let child = task::spawn((comm::chan(p), id - 1), sub);
         let y = comm::recv(p);
         comm::send(parent, y + 1);
     }
@@ -18,7 +18,7 @@ fn# sub(&&args: (comm::chan<int>, int)) {
 
 fn main() {
     let p = comm::port();
-    let child = task::spawn2((comm::chan(p), 200), sub);
+    let child = task::spawn((comm::chan(p), 200), sub);
     let y = comm::recv(p);
     log "transmission complete";
     log y;
diff --git a/src/test/run-pass/send-iloop.rs b/src/test/run-pass/send-iloop.rs
index 7dced1afb1e..71b8f12cdf0 100644
--- a/src/test/run-pass/send-iloop.rs
+++ b/src/test/run-pass/send-iloop.rs
@@ -10,7 +10,7 @@ fn# die(&&_i: ()) {
 
 fn# iloop(&&_i: ()) {
     task::unsupervise();
-    task::spawn2((), die);
+    task::spawn((), die);
     let p = comm::port::<()>();
     let c = comm::chan(p);
     while true {
@@ -20,6 +20,6 @@ fn# iloop(&&_i: ()) {
 
 fn main() {
     for each i in uint::range(0u, 16u) {
-        task::spawn2((), iloop);
+        task::spawn((), iloop);
     }
 }
\ No newline at end of file
diff --git a/src/test/run-pass/spawn-fn.rs b/src/test/run-pass/spawn-fn.rs
index 2e32a529991..7cf3e27c5f2 100644
--- a/src/test/run-pass/spawn-fn.rs
+++ b/src/test/run-pass/spawn-fn.rs
@@ -10,9 +10,9 @@ fn# x(&&args: (str, int)) {
 }
 
 fn main() {
-    task::spawn2(("hello from first spawned fn", 65), x);
-    task::spawn2(("hello from second spawned fn", 66), x);
-    task::spawn2(("hello from third spawned fn", 67), x);
+    task::spawn(("hello from first spawned fn", 65), x);
+    task::spawn(("hello from second spawned fn", 66), x);
+    task::spawn(("hello from third spawned fn", 67), x);
     let i: int = 30;
     while i > 0 { i = i - 1; log "parent sleeping"; yield(); }
 }
diff --git a/src/test/run-pass/spawn-module-qualified.rs b/src/test/run-pass/spawn-module-qualified.rs
index d106e4b04bd..ebac9fccb2b 100644
--- a/src/test/run-pass/spawn-module-qualified.rs
+++ b/src/test/run-pass/spawn-module-qualified.rs
@@ -1,8 +1,8 @@
 use std;
 import std::task::join;
-import std::task::spawn_joinable2;
+import std::task::spawn_joinable;
 
-fn main() { let x = spawn_joinable2(10, m::child); join(x); }
+fn main() { let x = spawn_joinable(10, m::child); join(x); }
 
 mod m {
     fn# child(&&i: int) { log i; }
diff --git a/src/test/run-pass/spawn-types.rs b/src/test/run-pass/spawn-types.rs
index c3af9dd9e57..c67ce7475e8 100644
--- a/src/test/run-pass/spawn-types.rs
+++ b/src/test/run-pass/spawn-types.rs
@@ -19,5 +19,5 @@ fn# iotask(&&args: (ctx, str)) {
 
 fn main() {
     let p = comm::port::<int>();
-    task::spawn2((comm::chan(p), "localhost"), iotask);
+    task::spawn((comm::chan(p), "localhost"), iotask);
 }
diff --git a/src/test/run-pass/spawn.rs b/src/test/run-pass/spawn.rs
index 2e4a5782347..c1752f1d23c 100644
--- a/src/test/run-pass/spawn.rs
+++ b/src/test/run-pass/spawn.rs
@@ -4,7 +4,7 @@ use std;
 
 import std::task;
 
-fn main() { let t = task::spawn_joinable2(10, child); task::join(t); }
+fn main() { let t = task::spawn_joinable(10, child); task::join(t); }
 
 fn# child(&&i: int) { log_err i; assert (i == 10); }
 
diff --git a/src/test/run-pass/spawn2.rs b/src/test/run-pass/spawn2.rs
index 38770de9689..a9acb1514ca 100644
--- a/src/test/run-pass/spawn2.rs
+++ b/src/test/run-pass/spawn2.rs
@@ -1,9 +1,9 @@
 // -*- rust -*-
 
 use std;
-import std::task::spawn2;
+import std::task::spawn;
 
-fn main() { spawn2((10, 20, 30, 40, 50, 60, 70, 80, 90), child); }
+fn main() { spawn((10, 20, 30, 40, 50, 60, 70, 80, 90), child); }
 
 fn# child(&&args: (int, int, int, int, int, int, int, int, int)) {
     let (i1, i2, i3, i4, i5, i6, i7, i8, i9) = args;
diff --git a/src/test/run-pass/task-comm-0.rs b/src/test/run-pass/task-comm-0.rs
index 03be2053e13..8c6f40bc93b 100644
--- a/src/test/run-pass/task-comm-0.rs
+++ b/src/test/run-pass/task-comm-0.rs
@@ -20,7 +20,7 @@ fn# test05_start(ch : chan<int>) {
 fn test05() {
     let po = comm::port();
     let ch = comm::chan(po);
-    task::spawn2(ch, test05_start);
+    task::spawn(ch, test05_start);
     let value = comm::recv(po);
     log_err value;
     value = comm::recv(po);
diff --git a/src/test/run-pass/task-comm-1.rs b/src/test/run-pass/task-comm-1.rs
index 93a66dae433..0fcb00c5052 100644
--- a/src/test/run-pass/task-comm-1.rs
+++ b/src/test/run-pass/task-comm-1.rs
@@ -1,6 +1,6 @@
 use std;
 
-import std::task::spawn_joinable2;
+import std::task::spawn_joinable;
 import std::task::join;
 
 fn main() { test00(); }
@@ -8,7 +8,7 @@ fn main() { test00(); }
 fn# start(&&_i: ()) { log "Started / Finished task."; }
 
 fn test00() {
-    let t = spawn_joinable2((), start);
+    let t = spawn_joinable((), start);
     join(t);
     log "Completing.";
 }
diff --git a/src/test/run-pass/task-comm-10.rs b/src/test/run-pass/task-comm-10.rs
index d9c18818d17..0938d8602d6 100644
--- a/src/test/run-pass/task-comm-10.rs
+++ b/src/test/run-pass/task-comm-10.rs
@@ -18,7 +18,7 @@ fn# start(c: comm::chan<comm::chan<str>>) {
 
 fn main() {
     let p = comm::port();
-    let child = task::spawn2(comm::chan(p), start);
+    let child = task::spawn(comm::chan(p), start);
 
     let c = comm::recv(p);
     comm::send(c, "A");
diff --git a/src/test/run-pass/task-comm-11.rs b/src/test/run-pass/task-comm-11.rs
index c100e610cb7..d427b4c1dd2 100644
--- a/src/test/run-pass/task-comm-11.rs
+++ b/src/test/run-pass/task-comm-11.rs
@@ -9,6 +9,6 @@ fn# start(c: comm::chan<comm::chan<int>>) {
 
 fn main() {
     let p = comm::port();
-    let child = task::spawn2(comm::chan(p), start);
+    let child = task::spawn(comm::chan(p), start);
     let c = comm::recv(p);
 }
diff --git a/src/test/run-pass/task-comm-12.rs b/src/test/run-pass/task-comm-12.rs
index 81143a88a4d..2d82a1fa1c8 100644
--- a/src/test/run-pass/task-comm-12.rs
+++ b/src/test/run-pass/task-comm-12.rs
@@ -7,7 +7,7 @@ fn# start(&&task_number: int) { log "Started / Finished task."; }
 
 fn test00() {
     let i: int = 0;
-    let t = task::spawn_joinable2(i, start);
+    let t = task::spawn_joinable(i, start);
 
     // Sleep long enough for the task to finish.
     task::sleep(10000u);
diff --git a/src/test/run-pass/task-comm-13.rs b/src/test/run-pass/task-comm-13.rs
index df9e0bf2b3c..f6a1efc0565 100644
--- a/src/test/run-pass/task-comm-13.rs
+++ b/src/test/run-pass/task-comm-13.rs
@@ -12,7 +12,7 @@ fn# start(&&args: (comm::chan<int>, int, int)) {
 fn main() {
     log "Check that we don't deadlock.";
     let p = comm::port::<int>();
-    let a = task::spawn_joinable2((comm::chan(p), 0, 10), start);
+    let a = task::spawn_joinable((comm::chan(p), 0, 10), start);
     task::join(a);
     log "Joined task";
 }
diff --git a/src/test/run-pass/task-comm-14.rs b/src/test/run-pass/task-comm-14.rs
index 219f6360594..e04e923d22d 100644
--- a/src/test/run-pass/task-comm-14.rs
+++ b/src/test/run-pass/task-comm-14.rs
@@ -9,7 +9,7 @@ fn main() {
     let i = 10;
     while (i > 0) {
         log i;
-        task::spawn2((i, comm::chan(po)), child);
+        task::spawn((i, comm::chan(po)), child);
         i = i - 1;
     }
 
diff --git a/src/test/run-pass/task-comm-17.rs b/src/test/run-pass/task-comm-17.rs
index 7a58762df46..52d84d90dfc 100644
--- a/src/test/run-pass/task-comm-17.rs
+++ b/src/test/run-pass/task-comm-17.rs
@@ -12,5 +12,5 @@ fn f() {
 }
 
 fn main() {
-    task::spawn2(bind f());
+    task::spawn(bind f());
 }
\ No newline at end of file
diff --git a/src/test/run-pass/task-comm-2.rs b/src/test/run-pass/task-comm-2.rs
index 3fa46952978..5a07d1a9aac 100644
--- a/src/test/run-pass/task-comm-2.rs
+++ b/src/test/run-pass/task-comm-2.rs
@@ -19,7 +19,7 @@ fn test00() {
     let tasks = [];
     while i < number_of_tasks {
         i = i + 1;
-        tasks += [task::spawn_joinable2(copy i, start)];
+        tasks += [task::spawn_joinable(copy i, start)];
     }
 
     for t in tasks { task::join(t); }
diff --git a/src/test/run-pass/task-comm-3.rs b/src/test/run-pass/task-comm-3.rs
index c37731ca474..9ae26c254b8 100644
--- a/src/test/run-pass/task-comm-3.rs
+++ b/src/test/run-pass/task-comm-3.rs
@@ -33,7 +33,7 @@ fn test00() {
     // Create and spawn tasks...
     let tasks = [];
     while i < number_of_tasks {
-        tasks += [task::spawn_joinable2(
+        tasks += [task::spawn_joinable(
             (ch, i, number_of_messages), test00_start)];
         i = i + 1;
     }
diff --git a/src/test/run-pass/task-comm-7.rs b/src/test/run-pass/task-comm-7.rs
index c3adaed008d..2aca0058794 100644
--- a/src/test/run-pass/task-comm-7.rs
+++ b/src/test/run-pass/task-comm-7.rs
@@ -20,19 +20,19 @@ fn test00() {
     let number_of_messages: int = 10;
 
     let t0 =
-        task::spawn_joinable2((chan(p),
+        task::spawn_joinable((chan(p),
                                number_of_messages * 0,
                                number_of_messages), test00_start);
     let t1 =
-        task::spawn_joinable2((chan(p),
+        task::spawn_joinable((chan(p),
                                number_of_messages * 1,
                                number_of_messages), test00_start);
     let t2 =
-        task::spawn_joinable2((chan(p),
+        task::spawn_joinable((chan(p),
                                number_of_messages * 2,
                                number_of_messages), test00_start);
     let t3 =
-        task::spawn_joinable2((chan(p),
+        task::spawn_joinable((chan(p),
                                number_of_messages * 3,
                                number_of_messages), test00_start);
 
diff --git a/src/test/run-pass/task-comm-8.rs b/src/test/run-pass/task-comm-8.rs
index e0c660e3884..400336afe74 100644
--- a/src/test/run-pass/task-comm-8.rs
+++ b/src/test/run-pass/task-comm-8.rs
@@ -17,19 +17,19 @@ fn test00() {
     let number_of_messages: int = 10;
 
     let t0 =
-        task::spawn_joinable2((comm::chan(p),
+        task::spawn_joinable((comm::chan(p),
                                number_of_messages * 0,
                                number_of_messages), test00_start);
     let t1 =
-        task::spawn_joinable2((comm::chan(p),
+        task::spawn_joinable((comm::chan(p),
                                number_of_messages * 1,
                                number_of_messages), test00_start);
     let t2 =
-        task::spawn_joinable2((comm::chan(p),
+        task::spawn_joinable((comm::chan(p),
                                number_of_messages * 2,
                                number_of_messages), test00_start);
     let t3 =
-        task::spawn_joinable2((comm::chan(p),
+        task::spawn_joinable((comm::chan(p),
                                number_of_messages * 3,
                                number_of_messages), test00_start);
 
diff --git a/src/test/run-pass/task-comm-9.rs b/src/test/run-pass/task-comm-9.rs
index 4b506c271c8..b6c2bcb15b9 100644
--- a/src/test/run-pass/task-comm-9.rs
+++ b/src/test/run-pass/task-comm-9.rs
@@ -16,7 +16,7 @@ fn test00() {
     let p = comm::port();
     let number_of_messages: int = 10;
 
-    let t0 = task::spawn_joinable2((comm::chan(p), number_of_messages),
+    let t0 = task::spawn_joinable((comm::chan(p), number_of_messages),
                                   test00_start);
 
     let i: int = 0;
diff --git a/src/test/run-pass/task-life-0.rs b/src/test/run-pass/task-life-0.rs
index 4607f3de4de..5937232f318 100644
--- a/src/test/run-pass/task-life-0.rs
+++ b/src/test/run-pass/task-life-0.rs
@@ -1,6 +1,6 @@
 use std;
 import std::task;
-fn main() { task::spawn2("Hello", child); }
+fn main() { task::spawn("Hello", child); }
 
 fn# child(&&s: str) {
 
diff --git a/src/test/run-pass/terminate-in-initializer.rs b/src/test/run-pass/terminate-in-initializer.rs
index a396aa7e376..45a61c30201 100644
--- a/src/test/run-pass/terminate-in-initializer.rs
+++ b/src/test/run-pass/terminate-in-initializer.rs
@@ -11,13 +11,13 @@ fn test_ret() { let x: @int = ret; }
 
 fn test_fail() {
     fn# f(&&_i: ()) { std::task::unsupervise(); let x: @int = fail; }
-    std::task::spawn2((), f);
+    std::task::spawn((), f);
 }
 
 fn test_fail_indirect() {
     fn f() -> ! { fail; }
     fn# g(&&_i: ()) { std::task::unsupervise(); let x: @int = f(); }
-    std::task::spawn2((), g);
+    std::task::spawn((), g);
 }
 
 fn main() {
diff --git a/src/test/run-pass/threads.rs b/src/test/run-pass/threads.rs
index b86bb19cbae..64f79848caa 100644
--- a/src/test/run-pass/threads.rs
+++ b/src/test/run-pass/threads.rs
@@ -5,7 +5,7 @@ import std::task;
 
 fn main() {
     let i = 10;
-    while i > 0 { task::spawn2(copy i, child); i = i - 1; }
+    while i > 0 { task::spawn(copy i, child); i = i - 1; }
     log "main thread exiting";
 }
 
diff --git a/src/test/run-pass/unique-send-2.rs b/src/test/run-pass/unique-send-2.rs
index 7354744c8de..2fa17677150 100644
--- a/src/test/run-pass/unique-send-2.rs
+++ b/src/test/run-pass/unique-send-2.rs
@@ -13,7 +13,7 @@ fn main() {
     let n = 100u;
     let expected = 0u;
     for each i in uint::range(0u, n) {
-        task::spawn2((comm::chan(p), i), child);
+        task::spawn((comm::chan(p), i), child);
         expected += i;
     }
 
diff --git a/src/test/run-pass/unwind-box.rs b/src/test/run-pass/unwind-box.rs
index 6c26bc14c2d..8b678a0a1a7 100644
--- a/src/test/run-pass/unwind-box.rs
+++ b/src/test/run-pass/unwind-box.rs
@@ -9,5 +9,5 @@ fn# f(&&_i: ()) {
 }
 
 fn main() {
-    task::spawn2((), f);
+    task::spawn((), f);
 }
\ No newline at end of file
diff --git a/src/test/run-pass/unwind-resource.rs b/src/test/run-pass/unwind-resource.rs
index 7403a3da535..b5c79b07015 100644
--- a/src/test/run-pass/unwind-resource.rs
+++ b/src/test/run-pass/unwind-resource.rs
@@ -16,6 +16,6 @@ fn# f(c: comm::chan<bool>) {
 fn main() {
     let p = comm::port();
     let c = comm::chan(p);
-    task::spawn2(c, f);
+    task::spawn(c, f);
     assert comm::recv(p);
 }
\ No newline at end of file
diff --git a/src/test/run-pass/unwind-resource2.rs b/src/test/run-pass/unwind-resource2.rs
index 801b9dde5ec..a7eab7f7eeb 100644
--- a/src/test/run-pass/unwind-resource2.rs
+++ b/src/test/run-pass/unwind-resource2.rs
@@ -13,5 +13,5 @@ fn# f(&&_i: ()) {
 }
 
 fn main() {
-    task::spawn2((), f);
+    task::spawn((), f);
 }
\ No newline at end of file
diff --git a/src/test/run-pass/unwind-unique.rs b/src/test/run-pass/unwind-unique.rs
index d869f11a78f..9bc34db3b5a 100644
--- a/src/test/run-pass/unwind-unique.rs
+++ b/src/test/run-pass/unwind-unique.rs
@@ -9,5 +9,5 @@ fn# f(&&_i: ()) {
 }
 
 fn main() {
-    task::spawn2((), f);
+    task::spawn((), f);
 }
\ No newline at end of file
diff --git a/src/test/run-pass/yield.rs b/src/test/run-pass/yield.rs
index d0b80a3343e..7b7a9d53b03 100644
--- a/src/test/run-pass/yield.rs
+++ b/src/test/run-pass/yield.rs
@@ -4,7 +4,7 @@ import std::task;
 import std::task::*;
 
 fn main() {
-    let other = task::spawn_joinable2((), child);
+    let other = task::spawn_joinable((), child);
     log_err "1";
     yield();
     log_err "2";
diff --git a/src/test/run-pass/yield1.rs b/src/test/run-pass/yield1.rs
index 49ff487c05f..945e3da86e7 100644
--- a/src/test/run-pass/yield1.rs
+++ b/src/test/run-pass/yield1.rs
@@ -4,7 +4,7 @@ import std::task;
 import std::task::*;
 
 fn main() {
-    let other = task::spawn_joinable2((), child);
+    let other = task::spawn_joinable((), child);
     log_err "1";
     yield();
     join(other);
diff --git a/src/test/stdtest/task.rs b/src/test/stdtest/task.rs
index 0d86cd9df4b..bc34428e5b2 100644
--- a/src/test/stdtest/task.rs
+++ b/src/test/stdtest/task.rs
@@ -8,19 +8,19 @@ fn test_sleep() { task::sleep(1000000u); }
 #[test]
 fn test_unsupervise() {
     fn# f(&&_i: ()) { task::unsupervise(); fail; }
-    task::spawn2((), f);
+    task::spawn((), f);
 }
 
 #[test]
 fn test_lib_spawn() {
     fn# foo(&&_i: ()) { log_err "Hello, World!"; }
-    task::spawn2((), foo);
+    task::spawn((), foo);
 }
 
 #[test]
 fn test_lib_spawn2() {
     fn# foo(&&x: int) { assert (x == 42); }
-    task::spawn2(42, foo);
+    task::spawn(42, foo);
 }
 
 #[test]
@@ -28,7 +28,7 @@ fn test_join_chan() {
     fn# winner(&&_i: ()) { }
 
     let p = comm::port();
-    task::spawn_notify2((), winner, comm::chan(p));
+    task::spawn_notify((), winner, comm::chan(p));
     let s = comm::recv(p);
     log_err "received task status message";
     log_err s;
@@ -43,7 +43,7 @@ fn test_join_chan_fail() {
     fn# failer(&&_i: ()) { task::unsupervise(); fail }
 
     let p = comm::port();
-    task::spawn_notify2((), failer, comm::chan(p));
+    task::spawn_notify((), failer, comm::chan(p));
     let s = comm::recv(p);
     log_err "received task status message";
     log_err s;
@@ -56,7 +56,7 @@ fn test_join_chan_fail() {
 #[test]
 fn test_join_convenient() {
     fn# winner(&&_i: ()) { }
-    let handle = task::spawn_joinable2((), winner);
+    let handle = task::spawn_joinable((), winner);
     assert (task::tr_success == task::join(handle));
 }
 
@@ -66,6 +66,6 @@ fn spawn_polymorphic() {
     // FIXME #1038: Can't spawn palymorphic functions
     /*fn# foo<~T>(x: T) { log_err x; }
 
-    task::spawn2(true, foo);
-    task::spawn2(42, foo);*/
+    task::spawn(true, foo);
+    task::spawn(42, foo);*/
 }