From 686d6a485f71b98fe9ea7dddd25de0c33efeea7a Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 13 Oct 2011 21:23:07 -0700
Subject: Drop the 2 from the spawn*2 functions

Issue #1022
---
 src/test/stdtest/task.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/test/stdtest')

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);*/
 }
-- 
cgit 1.4.1-3-g733a5