demode the each() method on vec and other iterables.

8 files changed, 28 insertions, 25 deletions

diff --git a/src/test/bench/graph500-bfs.rs b/src/test/bench/graph500-bfs.rs
index 15ffbfc182a..5e49a5488e9 100644
--- a/src/test/bench/graph500-bfs.rs
+++ b/src/test/bench/graph500-bfs.rs
@@ -123,9 +123,9 @@ fn bfs(graph: graph, key: node_id) -> bfs_result {
         let t = Q.pop_front();
 
         do graph[t].each() |k| {
-            if marks[k] == -1i64 {
-                marks[k] = t;
-                Q.add_back(k);
+            if marks[*k] == -1i64 {
+                marks[*k] = t;
+                Q.add_back(*k);
             }
             true
         };
@@ -183,8 +183,8 @@ fn bfs2(graph: graph, key: node_id) -> bfs_result {
                 let mut color = white;
 
                 do neighbors.each() |k| {
-                    if is_gray(colors[k]) {
-                        color = gray(k);
+                    if is_gray(colors[*k]) {
+                        color = gray(*k);
                         false
                     }
                     else { true }
@@ -264,8 +264,8 @@ fn pbfs(&&graph: arc::ARC<graph>, key: node_id) -> bfs_result {
                     let mut color = white;
 
                     do neighbors.each() |k| {
-                        if is_gray(colors[k]) {
-                            color = gray(k);
+                        if is_gray(colors[*k]) {
+                            color = gray(*k);
                             false
                         }
                         else { true }
diff --git a/src/test/bench/msgsend-ring-mutex-arcs.rs b/src/test/bench/msgsend-ring-mutex-arcs.rs
index 86ab3df63b8..ca76835dadd 100644
--- a/src/test/bench/msgsend-ring-mutex-arcs.rs
+++ b/src/test/bench/msgsend-ring-mutex-arcs.rs
@@ -99,7 +99,7 @@ fn main(args: ~[~str]) {
     thread_ring(0u, msg_per_task, option::unwrap(num_chan), num_port);
 
     // synchronize
-    for futures.each |f| { future::get(&f) };
+    for futures.each |f| { future::get(f) };
 
     let stop = time::precise_time_s();
 
diff --git a/src/test/bench/msgsend-ring-pipes.rs b/src/test/bench/msgsend-ring-pipes.rs
index 4e873b0127b..9fa30af4bde 100644
--- a/src/test/bench/msgsend-ring-pipes.rs
+++ b/src/test/bench/msgsend-ring-pipes.rs
@@ -96,7 +96,7 @@ fn main(args: ~[~str]) {
     thread_ring(0u, msg_per_task, option::unwrap(num_chan), num_port);
 
     // synchronize
-    for futures.each |f| { future::get(&f) };
+    for futures.each |f| { future::get(f) };
 
     let stop = time::precise_time_s();
 
diff --git a/src/test/bench/msgsend-ring-rw-arcs.rs b/src/test/bench/msgsend-ring-rw-arcs.rs
index d59a8dc47e8..77e5d7c8b67 100644
--- a/src/test/bench/msgsend-ring-rw-arcs.rs
+++ b/src/test/bench/msgsend-ring-rw-arcs.rs
@@ -100,7 +100,7 @@ fn main(args: ~[~str]) {
     thread_ring(0u, msg_per_task, option::unwrap(num_chan), num_port);
 
     // synchronize
-    for futures.each |f| { future::get(&f) };
+    for futures.each |f| { future::get(f) };
 
     let stop = time::precise_time_s();
 
diff --git a/src/test/bench/shootout-k-nucleotide-pipes.rs b/src/test/bench/shootout-k-nucleotide-pipes.rs
index 78225a0d68a..bcdd77d015a 100644
--- a/src/test/bench/shootout-k-nucleotide-pipes.rs
+++ b/src/test/bench/shootout-k-nucleotide-pipes.rs
@@ -46,14 +46,15 @@ fn sort_and_fmt(mm: HashMap<~[u8], uint>, total: uint) -> ~str {
    });
 
    let pairs_sorted = sortKV(pairs);
-   
+
    let mut buffer = ~"";
 
-   pairs_sorted.each(fn&(kv: (~[u8], float)) -> bool unsafe {
-      let (k,v) = kv;
-      buffer += (fmt!("%s %0.3f\n", str::to_upper(str::raw::from_bytes(k)), v));
-      return true;
-   });
+   for pairs_sorted.each |kv| {
+       let (k,v) = *kv;
+       unsafe {
+           buffer += (fmt!("%s %0.3f\n", str::to_upper(str::raw::from_bytes(k)), v));
+       }
+   }
 
    return buffer;
 }
diff --git a/src/test/bench/shootout-k-nucleotide.rs b/src/test/bench/shootout-k-nucleotide.rs
index dae261502ce..bc9d068094e 100644
--- a/src/test/bench/shootout-k-nucleotide.rs
+++ b/src/test/bench/shootout-k-nucleotide.rs
@@ -43,14 +43,15 @@ fn sort_and_fmt(mm: HashMap<~[u8], uint>, total: uint) -> ~str {
    });
 
    let pairs_sorted = sortKV(pairs);
-   
+
    let mut buffer = ~"";
 
-   pairs_sorted.each(fn&(kv: (~[u8], float)) -> bool unsafe {
-      let (k,v) = kv;
-      buffer += (fmt!("%s %0.3f\n", str::to_upper(str::raw::from_bytes(k)), v));
-      return true;
-   });
+   for pairs_sorted.each |kv| {
+      let (k,v) = *kv;
+      unsafe {
+          buffer += (fmt!("%s %0.3f\n", str::to_upper(str::raw::from_bytes(k)), v));
+      }
+   }
 
    return buffer;
 }
diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs
index 57f64760745..9740e5adc1d 100644
--- a/src/test/bench/shootout-pfib.rs
+++ b/src/test/bench/shootout-pfib.rs
@@ -78,7 +78,7 @@ fn stress(num_tasks: int) {
             stress_task(i);
         }
     }
-    for results.each |r| { future::get(&r); }
+    for results.each |r| { future::get(r); }
 }
 
 fn main(args: ~[~str]) {
diff --git a/src/test/bench/task-perf-word-count-generic.rs b/src/test/bench/task-perf-word-count-generic.rs
index 606a5aa53b9..b7d6e4769a0 100644
--- a/src/test/bench/task-perf-word-count-generic.rs
+++ b/src/test/bench/task-perf-word-count-generic.rs
@@ -153,7 +153,8 @@ mod map_reduce {
         for inputs.each |i| {
             let (ctrl, ctrl_server) = ctrl_proto::init();
             let ctrl = box(ctrl);
-            vec::push(tasks, spawn_joinable(|| map_task(map, ctrl, i) ));
+            let i = copy *i;
+            vec::push(tasks, spawn_joinable(|move i| map_task(map, ctrl, i)));
             vec::push(ctrls, ctrl_server);
         }
         return tasks;
@@ -283,7 +284,7 @@ mod map_reduce {
 
         for reducers.each_value |v| { send(v, done) }
 
-        for tasks.each |t| { join(t); }
+        for tasks.each |t| { join(*t); }
     }
 }