From 8d4928f7808813de62fefcb89139bfb7382b250b Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Tue, 18 Sep 2012 21:41:13 -0700
Subject: Revert "replace explicit calls to vec::each with vec::each_ref,
 partially demode str"

This reverts commit 1be24f0758d3075d2e7f141f8831bb8a233ce86e.

Not quite ready.
---
 src/test/bench/graph500-bfs.rs             | 13 +++++--------
 src/test/bench/msgsend-pipes-shared.rs     |  5 +----
 src/test/bench/msgsend-pipes.rs            |  5 +----
 src/test/bench/msgsend.rs                  |  4 +---
 src/test/bench/shootout-chameneos-redux.rs | 14 +++++++-------
 src/test/bench/task-perf-one-million.rs    |  6 +++---
 6 files changed, 18 insertions(+), 29 deletions(-)

(limited to 'src/test/bench')

diff --git a/src/test/bench/graph500-bfs.rs b/src/test/bench/graph500-bfs.rs
index 44f2b59f94b..8acbf7e4b0c 100644
--- a/src/test/bench/graph500-bfs.rs
+++ b/src/test/bench/graph500-bfs.rs
@@ -74,13 +74,10 @@ fn make_graph(N: uint, edges: ~[(node_id, node_id)]) -> graph {
         map::HashMap::<node_id, ()>()
     };
 
-    do vec::each_ref(edges) |e| {
-        match *e {
-            (i, j) => {
-                map::set_add(graph[i], j);
-                map::set_add(graph[j], i);
-            }
-        }
+    do vec::each(edges) |e| {
+        let (i, j) = e;
+        map::set_add(graph[i], j);
+        map::set_add(graph[j], i);
         true
     }
 
@@ -410,7 +407,7 @@ fn main(args: ~[~str]) {
     let stop = time::precise_time_s();
 
     let mut total_edges = 0u;
-    vec::each_ref(graph, |edges| { total_edges += edges.len(); true });
+    vec::each(graph, |edges| { total_edges += edges.len(); true });
 
     io::stdout().write_line(fmt!("Generated graph with %? edges in %? seconds.",
                                  total_edges / 2u,
diff --git a/src/test/bench/msgsend-pipes-shared.rs b/src/test/bench/msgsend-pipes-shared.rs
index 533068aeb2f..5d459f97a25 100644
--- a/src/test/bench/msgsend-pipes-shared.rs
+++ b/src/test/bench/msgsend-pipes-shared.rs
@@ -73,10 +73,7 @@ fn run(args: &[~str]) {
         server(from_parent, to_parent);
     }
 
-    for vec::each_ref(worker_results) |r| {
-        future::get(r);
-    }
-
+    vec::iter(worker_results, |r| { future::get(&r); } );
     //error!("sending stop message");
     to_child.send(stop);
     move_out!(to_child);
diff --git a/src/test/bench/msgsend-pipes.rs b/src/test/bench/msgsend-pipes.rs
index afcecda27d1..f6da3296a03 100644
--- a/src/test/bench/msgsend-pipes.rs
+++ b/src/test/bench/msgsend-pipes.rs
@@ -70,10 +70,7 @@ fn run(args: &[~str]) {
         server(from_parent, to_parent);
     }
 
-    for vec::each_ref(worker_results) |r| {
-        future::get(r);
-    }
-
+    vec::iter(worker_results, |r| { future::get(&r); } );
     //error!("sending stop message");
     to_child.send(stop);
     move_out!(to_child);
diff --git a/src/test/bench/msgsend.rs b/src/test/bench/msgsend.rs
index 3b084c6b682..6006b30a689 100644
--- a/src/test/bench/msgsend.rs
+++ b/src/test/bench/msgsend.rs
@@ -44,9 +44,7 @@ fn run(args: ~[~str]) {
             }
         };
     }
-    for vec::each_ref(worker_results) |r| {
-        future::get(r);
-    }
+    vec::iter(worker_results, |r| { future::get(&r); } );
     comm::send(to_child, stop);
     let result = comm::recv(from_child);
     let end = std::time::precise_time_s();
diff --git a/src/test/bench/shootout-chameneos-redux.rs b/src/test/bench/shootout-chameneos-redux.rs
index 0c9c7fc1c3a..785ad6fe767 100644
--- a/src/test/bench/shootout-chameneos-redux.rs
+++ b/src/test/bench/shootout-chameneos-redux.rs
@@ -7,10 +7,10 @@ use std::sort;
 
 fn print_complements() {
     let all = ~[Blue, Red, Yellow];
-    for vec::each_ref(all) |aa| {
-        for vec::each_ref(all) |bb| {
-            io::println(show_color(*aa) + ~" + " + show_color(*bb) +
-                ~" -> " + show_color(transform(*aa, *bb)));
+    for vec::each(all) |aa| {
+        for vec::each(all) |bb| {
+            io::println(show_color(aa) + ~" + " + show_color(bb) +
+                ~" -> " + show_color(transform(aa,bb)));
         }
     }
 }
@@ -162,7 +162,7 @@ fn rendezvous(nn: uint, set: ~[color]) {
 
     // save each creature's meeting stats
     let mut report = ~[];
-    for vec::each_ref(to_creature) |_to_one| {
+    for vec::each(to_creature) |_to_one| {
         vec::push(report, comm::recv(from_creatures_log));
     }
 
@@ -170,8 +170,8 @@ fn rendezvous(nn: uint, set: ~[color]) {
     io::println(show_color_list(set));
 
     // print each creature's stats
-    for vec::each_ref(report) |rep| {
-        io::println(*rep);
+    for vec::each(report) |rep| {
+        io::println(rep);
     }
 
     // print the total number of creatures met
diff --git a/src/test/bench/task-perf-one-million.rs b/src/test/bench/task-perf-one-million.rs
index 628234f4c99..86b23d126cf 100644
--- a/src/test/bench/task-perf-one-million.rs
+++ b/src/test/bench/task-perf-one-million.rs
@@ -31,9 +31,9 @@ fn calc(children: uint, parent_ch: comm::Chan<msg>) {
 
     match comm::recv(port) {
         start => {
-            for vec::each_ref(child_chs) |child_ch| {
-                comm::send(*child_ch, start);
-            }
+          do vec::iter (child_chs) |child_ch| {
+              comm::send(child_ch, start);
+          }
         }
         _ => fail ~"task-perf-one-million failed (port not in start state)"
     }
-- 
cgit 1.4.1-3-g733a5