From 8e86cd0aa7569411e44b782462744a4aad9bcb92 Mon Sep 17 00:00:00 2001
From: Jeff Olson <olson.jeffery@gmail.com>
Date: Fri, 7 Sep 2012 15:59:14 -0700
Subject: [PATCH] test: bunch of test cleanup from sendable_futures change

---
 src/test/bench/msgsend-ring-mutex-arcs.rs | 5 +++--
 src/test/bench/msgsend-ring-pipes.rs      | 6 ++++--
 src/test/bench/msgsend-ring-rw-arcs.rs    | 6 ++++--
 src/test/bench/msgsend-ring.rs            | 6 ++++--
 src/test/bench/shootout-pfib.rs           | 2 +-
 src/test/run-pass/task-comm-3.rs          | 2 +-
 src/test/run-pass/task-comm.rs            | 4 ++--
 7 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/test/bench/msgsend-ring-mutex-arcs.rs b/src/test/bench/msgsend-ring-mutex-arcs.rs
index 81babc00f095..6cc9be29a22f 100644
--- a/src/test/bench/msgsend-ring-mutex-arcs.rs
+++ b/src/test/bench/msgsend-ring-mutex-arcs.rs
@@ -82,7 +82,7 @@ fn main(args: ~[~str]) {
         let num_chan2 = ~mut None;
         *num_chan2 <-> num_chan;
         let num_port = ~mut Some(num_port);
-        futures += ~[future::spawn(|move num_chan2, move num_port| {
+        let new_future = future::spawn(|move num_chan2, move num_port| {
             let mut num_chan = None;
             num_chan <-> *num_chan2;
             let mut num_port1 = None;
@@ -90,7 +90,8 @@ fn main(args: ~[~str]) {
             thread_ring(i, msg_per_task,
                         option::unwrap(num_chan),
                         option::unwrap(num_port1))
-        })];
+        });
+        vec::push(futures, new_future);
         num_chan = Some(new_chan);
     };
 
diff --git a/src/test/bench/msgsend-ring-pipes.rs b/src/test/bench/msgsend-ring-pipes.rs
index 63ac80536afc..8c21db3d2f50 100644
--- a/src/test/bench/msgsend-ring-pipes.rs
+++ b/src/test/bench/msgsend-ring-pipes.rs
@@ -78,7 +78,8 @@ fn main(args: ~[~str]) {
         let num_chan2 = ~mut None;
         *num_chan2 <-> num_chan;
         let num_port = ~mut Some(num_port);
-        futures += ~[future::spawn(|move num_chan2, move num_port| {
+        let new_future = do future::spawn
+            |move num_chan2, move num_port| {
             let mut num_chan = None;
             num_chan <-> *num_chan2;
             let mut num_port1 = None;
@@ -86,7 +87,8 @@ fn main(args: ~[~str]) {
             thread_ring(i, msg_per_task,
                         option::unwrap(num_chan),
                         option::unwrap(num_port1))
-        })];
+        };
+        vec::push(futures, new_future);
         num_chan = Some(new_chan);
     };
 
diff --git a/src/test/bench/msgsend-ring-rw-arcs.rs b/src/test/bench/msgsend-ring-rw-arcs.rs
index 745e1e4e758e..82621c2f7e91 100644
--- a/src/test/bench/msgsend-ring-rw-arcs.rs
+++ b/src/test/bench/msgsend-ring-rw-arcs.rs
@@ -82,7 +82,8 @@ fn main(args: ~[~str]) {
         let num_chan2 = ~mut None;
         *num_chan2 <-> num_chan;
         let num_port = ~mut Some(num_port);
-        futures += ~[future::spawn(|move num_chan2, move num_port| {
+        let new_future = do future::spawn
+            |move num_chan2, move num_port| {
             let mut num_chan = None;
             num_chan <-> *num_chan2;
             let mut num_port1 = None;
@@ -90,7 +91,8 @@ fn main(args: ~[~str]) {
             thread_ring(i, msg_per_task,
                         option::unwrap(num_chan),
                         option::unwrap(num_port1))
-        })];
+        };
+        vec::push(futures, new_future);
         num_chan = Some(new_chan);
     };
 
diff --git a/src/test/bench/msgsend-ring.rs b/src/test/bench/msgsend-ring.rs
index d972dde4c4ae..15a18725abf6 100644
--- a/src/test/bench/msgsend-ring.rs
+++ b/src/test/bench/msgsend-ring.rs
@@ -45,11 +45,13 @@ fn main(args: ~[~str]) {
         let get_chan = Port();
         let get_chan_chan = Chan(get_chan);
 
-        futures += ~[do future::spawn |copy num_chan, move get_chan_chan| {
+        let new_future = do future::spawn
+            |copy num_chan, move get_chan_chan| {
             let p = Port();
             get_chan_chan.send(Chan(p));
             thread_ring(i, msg_per_task, num_chan,  p)
-        }];
+        };
+        vec::push(futures, new_future);
         
         num_chan = get_chan.recv();
     };
diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs
index 5e7648b5f85c..17ecf3fb332e 100644
--- a/src/test/bench/shootout-pfib.rs
+++ b/src/test/bench/shootout-pfib.rs
@@ -71,7 +71,7 @@ fn stress(num_tasks: int) {
     let mut results = ~[];
     for range(0, num_tasks) |i| {
         do task::task().future_result(|+r| {
-            results += ~[r];
+            vec::push(results, r);
         }).spawn {
             stress_task(i);
         }
diff --git a/src/test/run-pass/task-comm-3.rs b/src/test/run-pass/task-comm-3.rs
index 2dc33fa52bd8..e47daceb6e6f 100644
--- a/src/test/run-pass/task-comm-3.rs
+++ b/src/test/run-pass/task-comm-3.rs
@@ -31,7 +31,7 @@ fn test00() {
     while i < number_of_tasks {
         let ch = po.chan();        
         do task::task().future_result(|+r| {
-            results += ~[r];
+            vec::push(results, r);
         }).spawn |copy i| {
             test00_start(ch, i, number_of_messages)
         }
diff --git a/src/test/run-pass/task-comm.rs b/src/test/run-pass/task-comm.rs
index 5320ced981d5..ca34d42423fa 100644
--- a/src/test/run-pass/task-comm.rs
+++ b/src/test/run-pass/task-comm.rs
@@ -40,7 +40,7 @@ fn test00() {
     while i < number_of_tasks {
         i = i + 1;
         do task::task().future_result(|+r| {
-            results += ~[r];
+            vec::push(results, r);
         }).spawn |copy i| {
             test00_start(ch, i, number_of_messages);
         }
@@ -127,7 +127,7 @@ fn test06() {
     while i < number_of_tasks {
         i = i + 1;
         do task::task().future_result(|+r| {
-            results += ~[r];
+            vec::push(results, r);
         }).spawn |copy i| {
             test06_start(i);
         };