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

26 files changed, 53 insertions, 48 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); }
     }
 }
 
diff --git a/src/test/compile-fail/issue-2149.rs b/src/test/compile-fail/issue-2149.rs
index 3917e73a9ae..eb8da1519e8 100644
--- a/src/test/compile-fail/issue-2149.rs
+++ b/src/test/compile-fail/issue-2149.rs
@@ -5,7 +5,7 @@ trait vec_monad<A> {
 impl<A> ~[A]: vec_monad<A> {
     fn bind<B>(f: fn(A) -> ~[B]) {
         let mut r = fail;
-        for self.each |elt| { r += f(elt); }
+        for self.each |elt| { r += f(*elt); }
         //~^ WARNING unreachable expression
         //~^^ ERROR the type of this value must be known
    }
diff --git a/src/test/run-pass/argv.rs b/src/test/run-pass/argv.rs
index 79d7e4e5b0f..0d067eb0e15 100644
--- a/src/test/run-pass/argv.rs
+++ b/src/test/run-pass/argv.rs
@@ -1,5 +1,5 @@
 fn main(args: ~[~str]) {
     let vs: ~[~str] = ~[~"hi", ~"there", ~"this", ~"is", ~"a", ~"vec"];
     let vvs: ~[~[~str]] = ~[args, vs];
-    for vvs.each |vs| { for vs.each |s| { log(debug, s); } }
+    for vvs.each |vs| { for vs.each |s| { log(debug, *s); } }
 }
diff --git a/src/test/run-pass/block-iter-1.rs b/src/test/run-pass/block-iter-1.rs
index 692f9ea6ca4..74a81d5b803 100644
--- a/src/test/run-pass/block-iter-1.rs
+++ b/src/test/run-pass/block-iter-1.rs
@@ -1,7 +1,7 @@
 // xfail-fast
 #[legacy_modes];
 
-fn iter_vec<T>(v: ~[T], f: fn(T)) { for v.each |x| { f(x); } }
+fn iter_vec<T>(v: ~[T], f: fn(T)) { for v.each |x| { f(*x); } }
 
 fn main() {
     let v = ~[1, 2, 3, 4, 5, 6, 7];
diff --git a/src/test/run-pass/block-iter-2.rs b/src/test/run-pass/block-iter-2.rs
index 6f5021ea7b1..6389ef0f644 100644
--- a/src/test/run-pass/block-iter-2.rs
+++ b/src/test/run-pass/block-iter-2.rs
@@ -1,7 +1,7 @@
 // xfail-fast
 #[legacy_modes];
 
-fn iter_vec<T>(v: ~[T], f: fn(T)) { for v.each |x| { f(x); } }
+fn iter_vec<T>(v: ~[T], f: fn(T)) { for v.each |x| { f(*x); } }
 
 fn main() {
     let v = ~[1, 2, 3, 4, 5];
diff --git a/src/test/run-pass/borrowck-borrow-from-at-vec.rs b/src/test/run-pass/borrowck-borrow-from-at-vec.rs
index a79b581c562..a8013c1514c 100644
--- a/src/test/run-pass/borrowck-borrow-from-at-vec.rs
+++ b/src/test/run-pass/borrowck-borrow-from-at-vec.rs
@@ -1,6 +1,6 @@
 fn sum_slice(x: &[int]) -> int {
     let mut sum = 0;
-    for x.each |i| { sum += i; }
+    for x.each |i| { sum += *i; }
     return sum;
 }
 
diff --git a/src/test/run-pass/explicit-self-closures.rs b/src/test/run-pass/explicit-self-closures.rs
index 3fd9826a392..162c62803c3 100644
--- a/src/test/run-pass/explicit-self-closures.rs
+++ b/src/test/run-pass/explicit-self-closures.rs
@@ -6,13 +6,13 @@ struct Box {
 
 impl Box {
     fn set_many(&mut self, xs: &[uint]) {
-        for xs.each |x| { self.x = x; }
+        for xs.each |x| { self.x = *x; }
     }
     fn set_many2(@mut self, xs: &[uint]) {
-        for xs.each |x| { self.x = x; }
+        for xs.each |x| { self.x = *x; }
     }
     fn set_many3(~mut self, xs: &[uint]) {
-        for xs.each |x| { self.x = x; }
+        for xs.each |x| { self.x = *x; }
     }
 }
 
diff --git a/src/test/run-pass/hashmap-memory.rs b/src/test/run-pass/hashmap-memory.rs
index 5d89cee1083..9e0727471e2 100644
--- a/src/test/run-pass/hashmap-memory.rs
+++ b/src/test/run-pass/hashmap-memory.rs
@@ -30,7 +30,8 @@ mod map_reduce {
 
     fn start_mappers(ctrl: Chan<ctrl_proto>, inputs: ~[~str]) {
         for inputs.each |i| {
-            task::spawn(|| map_task(ctrl, i) );
+            let i = *i;
+            task::spawn(|move i| map_task(ctrl, i) );
         }
     }
 
diff --git a/src/test/run-pass/linear-for-loop.rs b/src/test/run-pass/linear-for-loop.rs
index 5091020508d..ccb2c25b58d 100644
--- a/src/test/run-pass/linear-for-loop.rs
+++ b/src/test/run-pass/linear-for-loop.rs
@@ -3,7 +3,7 @@
 fn main() {
     let x = ~[1, 2, 3];
     let mut y = 0;
-    for x.each |i| { log(debug, i); y += i; }
+    for x.each |i| { log(debug, *i); y += *i; }
     log(debug, y);
     assert (y == 6);
     let s = ~"hello there";
diff --git a/src/test/run-pass/loop-scope.rs b/src/test/run-pass/loop-scope.rs
index 9dc53e726d6..6ffbfa21ba4 100644
--- a/src/test/run-pass/loop-scope.rs
+++ b/src/test/run-pass/loop-scope.rs
@@ -1,6 +1,6 @@
 fn main() {
     let x = ~[10, 20, 30];
     let mut sum = 0;
-    for x.each |x| { sum += x; }
+    for x.each |x| { sum += *x; }
     assert (sum == 60);
 }
diff --git a/src/test/run-pass/main-ivec.rs b/src/test/run-pass/main-ivec.rs
index 2cd454a1ccf..0c2251a2419 100644
--- a/src/test/run-pass/main-ivec.rs
+++ b/src/test/run-pass/main-ivec.rs
@@ -1 +1 @@
-fn main(args: ~[~str]) { for args.each |s| { log(debug, s); } }
+fn main(args: ~[~str]) { for args.each |s| { log(debug, *s); } }
diff --git a/src/test/run-pass/monad.rs b/src/test/run-pass/monad.rs
index 131ae43def2..ddfc29fc8d8 100644
--- a/src/test/run-pass/monad.rs
+++ b/src/test/run-pass/monad.rs
@@ -8,7 +8,7 @@ trait vec_monad<A> {
 impl<A> ~[A]: vec_monad<A> {
     fn bind<B: Copy>(f: fn(A) -> ~[B]) -> ~[B] {
         let mut r = ~[];
-        for self.each |elt| { r += f(elt); }
+        for self.each |elt| { r += f(*elt); }
         r
     }
 }
diff --git a/src/test/run-pass/morestack6.rs b/src/test/run-pass/morestack6.rs
index da4cfd0b471..deca22de643 100644
--- a/src/test/run-pass/morestack6.rs
+++ b/src/test/run-pass/morestack6.rs
@@ -52,8 +52,9 @@ fn main() {
     ];
     let rng = rand::Rng();
     for fns.each |f| {
+        let f = *f;
         let sz = rng.next() % 256u32 + 256u32;
         let frame_backoff = rng.next() % 10u32 + 1u32;
-        task::try(|| runtest(f, frame_backoff) );
+        task::try(|move f| runtest(f, frame_backoff) );
     }
 }
diff --git a/src/test/run-pass/reflect-visit-data.rs b/src/test/run-pass/reflect-visit-data.rs
index 7a6217a7c2e..affd0ef6162 100644
--- a/src/test/run-pass/reflect-visit-data.rs
+++ b/src/test/run-pass/reflect-visit-data.rs
@@ -624,7 +624,7 @@ fn main() {
     visit_tydesc(td, v);
 
     for (copy u.vals).each |s| {
-        io::println(fmt!("val: %s", s));
+        io::println(fmt!("val: %s", *s));
     }
     error!("%?", copy u.vals);
     assert u.vals == ~[~"1", ~"2", ~"3", ~"true", ~"false", ~"5", ~"4", ~"3"];
diff --git a/src/test/run-pass/static-impl.rs b/src/test/run-pass/static-impl.rs
index 60965f801fb..750d13b87e2 100644
--- a/src/test/run-pass/static-impl.rs
+++ b/src/test/run-pass/static-impl.rs
@@ -36,10 +36,10 @@ trait vec_utils<T> {
 
 impl<T> ~[T]: vec_utils<T> {
     fn length_() -> uint { vec::len(self) }
-    fn iter_(f: fn(T)) { for self.each |x| { f(x); } }
+    fn iter_(f: fn(T)) { for self.each |x| { f(*x); } }
     fn map_<U: Copy>(f: fn(T) -> U) -> ~[U] {
         let mut r = ~[];
-        for self.each |elt| { r += ~[f(elt)]; }
+        for self.each |elt| { r += ~[f(*elt)]; }
         r
     }
 }
diff --git a/src/test/run-pass/static-method-test.rs b/src/test/run-pass/static-method-test.rs
index ef9e08797d5..2619cc05586 100644
--- a/src/test/run-pass/static-method-test.rs
+++ b/src/test/run-pass/static-method-test.rs
@@ -55,7 +55,7 @@ fn map<T, IT: BaseIter<T>, U, BU: buildable<U>>
     (v: IT, f: fn(T) -> U) -> BU {
     do build |push| {
         for v.each() |elem| {
-            push(f(elem));
+            push(f(*elem));
         }
     }
 }
diff --git a/src/test/run-pass/task-comm-3.rs b/src/test/run-pass/task-comm-3.rs
index c4ed0302b35..dd2dd5e54d4 100644
--- a/src/test/run-pass/task-comm-3.rs
+++ b/src/test/run-pass/task-comm-3.rs
@@ -32,7 +32,7 @@ fn test00() {
     // Create and spawn tasks...
     let mut results = ~[];
     while i < number_of_tasks {
-        let ch = po.chan();        
+        let ch = po.chan();
         do task::task().future_result(|+r| {
             vec::push(results, r);
         }).spawn |copy i| {
@@ -53,7 +53,7 @@ fn test00() {
     }
 
     // Join spawned tasks...
-    for results.each |r| { future::get(&r); }
+    for results.each |r| { future::get(r); }
 
     debug!("Completed: Final number is: ");
     log(error, sum);
diff --git a/src/test/run-pass/task-comm.rs b/src/test/run-pass/task-comm.rs
index 4b6ea2c1603..a3a6b6efd7f 100644
--- a/src/test/run-pass/task-comm.rs
+++ b/src/test/run-pass/task-comm.rs
@@ -51,7 +51,7 @@ fn test00() {
         while i < number_of_messages { sum += recv(po); i = i + 1; }
     }
 
-    for results.each |r| { future::get(&r); }
+    for results.each |r| { future::get(r); }
 
     debug!("Completed: Final number is: ");
     assert (sum ==
@@ -134,7 +134,7 @@ fn test06() {
     }
 
 
-    for results.each |r| { future::get(&r); }
+    for results.each |r| { future::get(r); }
 }
 
 
diff --git a/src/test/run-pass/trait-generic.rs b/src/test/run-pass/trait-generic.rs
index 9b8e752d808..83391d80e26 100644
--- a/src/test/run-pass/trait-generic.rs
+++ b/src/test/run-pass/trait-generic.rs
@@ -20,7 +20,7 @@ trait map<T> {
 impl<T> ~[T]: map<T> {
     fn map<U: Copy>(f: fn(T) -> U) -> ~[U] {
         let mut r = ~[];
-        for self.each |x| { r += ~[f(x)]; }
+        for self.each |x| { r += ~[f(*x)]; }
         r
     }
 }