remove obsolete `foreach` keyword

this has been replaced by `for`

3 files changed, 38 insertions, 38 deletions

diff --git a/src/libextra/num/bigint.rs b/src/libextra/num/bigint.rs
index 6f575926cc6..ab843fe6546 100644
--- a/src/libextra/num/bigint.rs
+++ b/src/libextra/num/bigint.rs
@@ -131,7 +131,7 @@ impl TotalOrd for BigUint {
         if s_len < o_len { return Less; }
         if s_len > o_len { return Greater;  }
 
-        foreach (&self_i, &other_i) in self.data.rev_iter().zip(other.data.rev_iter()) {
+        for (&self_i, &other_i) in self.data.rev_iter().zip(other.data.rev_iter()) {
             cond!((self_i < other_i) { return Less; }
                   (self_i > other_i) { return Greater; })
         }
@@ -420,7 +420,7 @@ impl Integer for BigUint {
             let bn = *b.data.last();
             let mut d = ~[];
             let mut carry = 0;
-            foreach elt in an.rev_iter() {
+            for elt in an.rev_iter() {
                 let ai = BigDigit::to_uint(carry, *elt);
                 let di = ai / (bn as uint);
                 assert!(di < BigDigit::base);
@@ -524,7 +524,7 @@ impl ToStrRadix for BigUint {
         fn fill_concat(v: &[BigDigit], radix: uint, l: uint) -> ~str {
             if v.is_empty() { return ~"0" }
             let mut s = str::with_capacity(v.len() * l);
-            foreach n in v.rev_iter() {
+            for n in v.rev_iter() {
                 let ss = uint::to_str_radix(*n as uint, radix);
                 s.push_str("0".repeat(l - ss.len()));
                 s.push_str(ss);
@@ -651,7 +651,7 @@ impl BigUint {
 
         let mut borrow = 0;
         let mut shifted = ~[];
-        foreach elem in self.data.rev_iter() {
+        for elem in self.data.rev_iter() {
             shifted = ~[(*elem >> n_bits) | borrow] + shifted;
             borrow = *elem << (BigDigit::bits - n_bits);
         }
@@ -1186,8 +1186,8 @@ mod biguint_tests {
     fn test_cmp() {
         let data: ~[BigUint] = [ &[], &[1], &[2], &[-1], &[0, 1], &[2, 1], &[1, 1, 1]  ]
             .map(|v| BigUint::from_slice(*v));
-        foreach (i, ni) in data.iter().enumerate() {
-            foreach (j0, nj) in data.slice(i, data.len()).iter().enumerate() {
+        for (i, ni) in data.iter().enumerate() {
+            for (j0, nj) in data.slice(i, data.len()).iter().enumerate() {
                 let j = j0 + i;
                 if i == j {
                     assert_eq!(ni.cmp(nj), Equal);
@@ -1360,7 +1360,7 @@ mod biguint_tests {
 
     #[test]
     fn test_add() {
-        foreach elm in sum_triples.iter() {
+        for elm in sum_triples.iter() {
             let (aVec, bVec, cVec) = *elm;
             let a = BigUint::from_slice(aVec);
             let b = BigUint::from_slice(bVec);
@@ -1373,7 +1373,7 @@ mod biguint_tests {
 
     #[test]
     fn test_sub() {
-        foreach elm in sum_triples.iter() {
+        for elm in sum_triples.iter() {
             let (aVec, bVec, cVec) = *elm;
             let a = BigUint::from_slice(aVec);
             let b = BigUint::from_slice(bVec);
@@ -1424,7 +1424,7 @@ mod biguint_tests {
 
     #[test]
     fn test_mul() {
-        foreach elm in mul_triples.iter() {
+        for elm in mul_triples.iter() {
             let (aVec, bVec, cVec) = *elm;
             let a = BigUint::from_slice(aVec);
             let b = BigUint::from_slice(bVec);
@@ -1434,7 +1434,7 @@ mod biguint_tests {
             assert!(b * a == c);
         }
 
-        foreach elm in div_rem_quadruples.iter() {
+        for elm in div_rem_quadruples.iter() {
             let (aVec, bVec, cVec, dVec) = *elm;
             let a = BigUint::from_slice(aVec);
             let b = BigUint::from_slice(bVec);
@@ -1448,7 +1448,7 @@ mod biguint_tests {
 
     #[test]
     fn test_div_rem() {
-        foreach elm in mul_triples.iter() {
+        for elm in mul_triples.iter() {
             let (aVec, bVec, cVec) = *elm;
             let a = BigUint::from_slice(aVec);
             let b = BigUint::from_slice(bVec);
@@ -1462,7 +1462,7 @@ mod biguint_tests {
             }
         }
 
-        foreach elm in div_rem_quadruples.iter() {
+        for elm in div_rem_quadruples.iter() {
             let (aVec, bVec, cVec, dVec) = *elm;
             let a = BigUint::from_slice(aVec);
             let b = BigUint::from_slice(bVec);
@@ -1579,9 +1579,9 @@ mod biguint_tests {
     #[test]
     fn test_to_str_radix() {
         let r = to_str_pairs();
-        foreach num_pair in r.iter() {
+        for num_pair in r.iter() {
             let &(ref n, ref rs) = num_pair;
-            foreach str_pair in rs.iter() {
+            for str_pair in rs.iter() {
                 let &(ref radix, ref str) = str_pair;
                 assert_eq!(&n.to_str_radix(*radix), str);
             }
@@ -1591,9 +1591,9 @@ mod biguint_tests {
     #[test]
     fn test_from_str_radix() {
         let r = to_str_pairs();
-        foreach num_pair in r.iter() {
+        for num_pair in r.iter() {
             let &(ref n, ref rs) = num_pair;
-            foreach str_pair in rs.iter() {
+            for str_pair in rs.iter() {
                 let &(ref radix, ref str) = str_pair;
                 assert_eq!(n, &FromStrRadix::from_str_radix(*str, *radix).get());
             }
@@ -1608,7 +1608,7 @@ mod biguint_tests {
     fn test_factor() {
         fn factor(n: uint) -> BigUint {
             let mut f= One::one::<BigUint>();
-            foreach i in range(2, n + 1) {
+            for i in range(2, n + 1) {
                 // FIXME(#6102): Assignment operator for BigInt causes ICE
                 // f *= BigUint::from_uint(i);
                 f = f * BigUint::from_uint(i);
@@ -1658,14 +1658,14 @@ mod bigint_tests {
     fn test_cmp() {
         let vs = [ &[2 as BigDigit], &[1, 1], &[2, 1], &[1, 1, 1] ];
         let mut nums = ~[];
-        foreach s in vs.rev_iter() {
+        for s in vs.rev_iter() {
             nums.push(BigInt::from_slice(Minus, *s));
         }
         nums.push(Zero::zero());
         nums.push_all_move(vs.map(|s| BigInt::from_slice(Plus, *s)));
 
-        foreach (i, ni) in nums.iter().enumerate() {
-            foreach (j0, nj) in nums.slice(i, nums.len()).iter().enumerate() {
+        for (i, ni) in nums.iter().enumerate() {
+            for (j0, nj) in nums.slice(i, nums.len()).iter().enumerate() {
                 let j = i + j0;
                 if i == j {
                     assert_eq!(ni.cmp(nj), Equal);
@@ -1769,7 +1769,7 @@ mod bigint_tests {
 
     #[test]
     fn test_add() {
-        foreach elm in sum_triples.iter() {
+        for elm in sum_triples.iter() {
             let (aVec, bVec, cVec) = *elm;
             let a = BigInt::from_slice(Plus, aVec);
             let b = BigInt::from_slice(Plus, bVec);
@@ -1788,7 +1788,7 @@ mod bigint_tests {
 
     #[test]
     fn test_sub() {
-        foreach elm in sum_triples.iter() {
+        for elm in sum_triples.iter() {
             let (aVec, bVec, cVec) = *elm;
             let a = BigInt::from_slice(Plus, aVec);
             let b = BigInt::from_slice(Plus, bVec);
@@ -1845,7 +1845,7 @@ mod bigint_tests {
 
     #[test]
     fn test_mul() {
-        foreach elm in mul_triples.iter() {
+        for elm in mul_triples.iter() {
             let (aVec, bVec, cVec) = *elm;
             let a = BigInt::from_slice(Plus, aVec);
             let b = BigInt::from_slice(Plus, bVec);
@@ -1858,7 +1858,7 @@ mod bigint_tests {
             assert!((-b) * a == -c);
         }
 
-        foreach elm in div_rem_quadruples.iter() {
+        for elm in div_rem_quadruples.iter() {
             let (aVec, bVec, cVec, dVec) = *elm;
             let a = BigInt::from_slice(Plus, aVec);
             let b = BigInt::from_slice(Plus, bVec);
@@ -1897,7 +1897,7 @@ mod bigint_tests {
             }
         }
 
-        foreach elm in mul_triples.iter() {
+        for elm in mul_triples.iter() {
             let (aVec, bVec, cVec) = *elm;
             let a = BigInt::from_slice(Plus, aVec);
             let b = BigInt::from_slice(Plus, bVec);
@@ -1907,7 +1907,7 @@ mod bigint_tests {
             if !b.is_zero() { check(&c, &b, &a, &Zero::zero()); }
         }
 
-        foreach elm in div_rem_quadruples.iter() {
+        for elm in div_rem_quadruples.iter() {
             let (aVec, bVec, cVec, dVec) = *elm;
             let a = BigInt::from_slice(Plus, aVec);
             let b = BigInt::from_slice(Plus, bVec);
@@ -1940,7 +1940,7 @@ mod bigint_tests {
             check_sub(&a.neg(), b, &q.neg(), &r.neg());
             check_sub(&a.neg(), &b.neg(), q, &r.neg());
         }
-        foreach elm in mul_triples.iter() {
+        for elm in mul_triples.iter() {
             let (aVec, bVec, cVec) = *elm;
             let a = BigInt::from_slice(Plus, aVec);
             let b = BigInt::from_slice(Plus, bVec);
@@ -1950,7 +1950,7 @@ mod bigint_tests {
             if !b.is_zero() { check(&c, &b, &a, &Zero::zero()); }
         }
 
-        foreach elm in div_rem_quadruples.iter() {
+        for elm in div_rem_quadruples.iter() {
             let (aVec, bVec, cVec, dVec) = *elm;
             let a = BigInt::from_slice(Plus, aVec);
             let b = BigInt::from_slice(Plus, bVec);
diff --git a/src/libextra/num/complex.rs b/src/libextra/num/complex.rs
index 82b0808b788..669dc1c1b45 100644
--- a/src/libextra/num/complex.rs
+++ b/src/libextra/num/complex.rs
@@ -239,14 +239,14 @@ mod test {
     fn test_scale_unscale() {
         assert_eq!(_05_05i.scale(2f), _1_1i);
         assert_eq!(_1_1i.unscale(2f), _05_05i);
-        foreach &c in all_consts.iter() {
+        for &c in all_consts.iter() {
             assert_eq!(c.scale(2f).unscale(2f), c);
         }
     }
 
     #[test]
     fn test_conj() {
-        foreach &c in all_consts.iter() {
+        for &c in all_consts.iter() {
             assert_eq!(c.conj(), Cmplx::new(c.re, -c.im));
             assert_eq!(c.conj().conj(), c);
         }
@@ -283,7 +283,7 @@ mod test {
             let (r, theta) = c.to_polar();
             assert!((c - Cmplx::from_polar(&r, &theta)).norm() < 1e-6);
         }
-        foreach &c in all_consts.iter() { test(c); }
+        for &c in all_consts.iter() { test(c); }
     }
 
     mod arith {
@@ -296,7 +296,7 @@ mod test {
             assert_eq!(_0_1i + _1_0i, _1_1i);
             assert_eq!(_1_0i + _neg1_1i, _0_1i);
 
-            foreach &c in all_consts.iter() {
+            for &c in all_consts.iter() {
                 assert_eq!(_0_0i + c, c);
                 assert_eq!(c + _0_0i, c);
             }
@@ -308,7 +308,7 @@ mod test {
             assert_eq!(_0_1i - _1_0i, _neg1_1i);
             assert_eq!(_0_1i - _neg1_1i, _1_0i);
 
-            foreach &c in all_consts.iter() {
+            for &c in all_consts.iter() {
                 assert_eq!(c - _0_0i, c);
                 assert_eq!(c - c, _0_0i);
             }
@@ -323,7 +323,7 @@ mod test {
             assert_eq!(_0_1i * _0_1i, -_1_0i);
             assert_eq!(_0_1i * _0_1i * _0_1i * _0_1i, _1_0i);
 
-            foreach &c in all_consts.iter() {
+            for &c in all_consts.iter() {
                 assert_eq!(c * _1_0i, c);
                 assert_eq!(_1_0i * c, c);
             }
@@ -331,7 +331,7 @@ mod test {
         #[test]
         fn test_div() {
             assert_eq!(_neg1_1i / _0_1i, _1_1i);
-            foreach &c in all_consts.iter() {
+            for &c in all_consts.iter() {
                 if c != Zero::zero() {
                     assert_eq!(c / c, _1_0i);
                 }
@@ -341,7 +341,7 @@ mod test {
         fn test_neg() {
             assert_eq!(-_1_0i + _0_1i, _neg1_1i);
             assert_eq!((-_0_1i) * _0_1i, _1_0i);
-            foreach &c in all_consts.iter() {
+            for &c in all_consts.iter() {
                 assert_eq!(-(-c), c);
             }
         }
diff --git a/src/libextra/num/rational.rs b/src/libextra/num/rational.rs
index af09ba42b80..60dd36a3b88 100644
--- a/src/libextra/num/rational.rs
+++ b/src/libextra/num/rational.rs
@@ -500,7 +500,7 @@ mod test {
         }
 
         let xs = ["0 /1", "abc", "", "1/", "--1/2","3/2/1"];
-        foreach &s in xs.iter() {
+        for &s in xs.iter() {
             test(s);
         }
     }
@@ -540,7 +540,7 @@ mod test {
         }
 
         let xs = ["0 /1", "abc", "", "1/", "--1/2","3/2/1", "3/2"];
-        foreach &s in xs.iter() {
+        for &s in xs.iter() {
             test(s);
         }
     }