Drop the 2 from the spawn*2 functions

Issue #1022

3 files changed, 13 insertions, 13 deletions

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