remove obsolete foreach keyword

this has been replaced by `for`
This commit is contained in:
Daniel Micay 2013-08-03 12:45:23 -04:00
parent 9f74217d80
commit 1008945528
298 changed files with 1569 additions and 1574 deletions

View file

@ -28,7 +28,7 @@ pub fn alist_get<A:Clone + 'static,
k: A)
-> B {
let eq_fn = lst.eq_fn;
foreach entry in lst.data.iter() {
for entry in lst.data.iter() {
if eq_fn(entry.key.clone(), k.clone()) {
return entry.value.clone();
}

View file

@ -31,19 +31,19 @@ fn ascending<M: MutableMap<uint, uint>>(map: &mut M, n_keys: uint) {
io::println(" Ascending integers:");
do timed("insert") {
foreach i in range(0u, n_keys) {
for i in range(0u, n_keys) {
map.insert(i, i + 1);
}
}
do timed("search") {
foreach i in range(0u, n_keys) {
for i in range(0u, n_keys) {
assert_eq!(map.find(&i).unwrap(), &(i + 1));
}
}
do timed("remove") {
foreach i in range(0, n_keys) {
for i in range(0, n_keys) {
assert!(map.remove(&i));
}
}
@ -77,19 +77,19 @@ fn descending<M: MutableMap<uint, uint>>(map: &mut M, n_keys: uint) {
fn vector<M: MutableMap<uint, uint>>(map: &mut M, n_keys: uint, dist: &[uint]) {
do timed("insert") {
foreach i in range(0u, n_keys) {
for i in range(0u, n_keys) {
map.insert(dist[i], i + 1);
}
}
do timed("search") {
foreach i in range(0u, n_keys) {
for i in range(0u, n_keys) {
assert_eq!(map.find(&dist[i]).unwrap(), &(i + 1));
}
}
do timed("remove") {
foreach i in range(0u, n_keys) {
for i in range(0u, n_keys) {
assert!(map.remove(&dist[i]));
}
}

View file

@ -46,11 +46,11 @@ impl Results {
{
let mut set = f();
do timed(&mut self.sequential_ints) {
foreach i in range(0u, num_keys) {
for i in range(0u, num_keys) {
set.insert(i);
}
foreach i in range(0u, num_keys) {
for i in range(0u, num_keys) {
assert!(set.contains(&i));
}
}
@ -67,12 +67,12 @@ impl Results {
{
let mut set = f();
foreach i in range(0u, num_keys) {
for i in range(0u, num_keys) {
set.insert(i);
}
do timed(&mut self.delete_ints) {
foreach i in range(0u, num_keys) {
for i in range(0u, num_keys) {
assert!(set.remove(&i));
}
}
@ -88,12 +88,12 @@ impl Results {
{
let mut set = f();
do timed(&mut self.sequential_strings) {
foreach i in range(0u, num_keys) {
for i in range(0u, num_keys) {
let s = uint::to_str(i);
set.insert(s);
}
foreach i in range(0u, num_keys) {
for i in range(0u, num_keys) {
let s = uint::to_str(i);
assert!(set.contains(&s));
}
@ -112,11 +112,11 @@ impl Results {
{
let mut set = f();
foreach i in range(0u, num_keys) {
for i in range(0u, num_keys) {
set.insert(uint::to_str(i));
}
do timed(&mut self.delete_strings) {
foreach i in range(0u, num_keys) {
for i in range(0u, num_keys) {
assert!(set.remove(&uint::to_str(i)));
}
}

View file

@ -74,7 +74,7 @@ fn read_line() {
let path = Path(env!("CFG_SRC_DIR"))
.push_rel(&Path("src/test/bench/shootout-k-nucleotide.data"));
foreach _ in range(0, 3) {
for _ in range(0, 3) {
let reader = io::file_reader(&path).unwrap();
while !reader.eof() {
reader.read_line();
@ -119,7 +119,7 @@ fn vec_push_all() {
let mut r = rand::rng();
let mut v = ~[];
foreach i in range(0u, 1500) {
for i in range(0u, 1500) {
let mut rv = vec::from_elem(r.gen_uint_range(0, i + 1), i);
if r.gen() {
v.push_all(rv);
@ -133,7 +133,7 @@ fn vec_push_all() {
fn is_utf8_ascii() {
let mut v : ~[u8] = ~[];
foreach _ in range(0u, 20000) {
for _ in range(0u, 20000) {
v.push('b' as u8);
if !str::is_utf8(v) {
fail!("is_utf8 failed");
@ -144,7 +144,7 @@ fn is_utf8_ascii() {
fn is_utf8_multibyte() {
let s = "b¢€𤭢";
let mut v : ~[u8]= ~[];
foreach _ in range(0u, 5000) {
for _ in range(0u, 5000) {
v.push_all(s.as_bytes());
if !str::is_utf8(v) {
fail!("is_utf8 failed");

View file

@ -23,7 +23,7 @@ fn main() {
let n = uint::from_str(args[1]).get();
foreach i in range(0u, n) {
for i in range(0u, n) {
let x = uint::to_str(i);
info!(x);
}

View file

@ -87,7 +87,7 @@ fn make_graph(N: uint, edges: ~[(node_id, node_id)]) -> graph {
HashSet::new()
};
foreach e in edges.iter() {
for e in edges.iter() {
match *e {
(i, j) => {
graph[i].insert(j);
@ -98,7 +98,7 @@ fn make_graph(N: uint, edges: ~[(node_id, node_id)]) -> graph {
do graph.consume_iter().transform |v| {
let mut vec = ~[];
foreach i in v.consume() {
for i in v.consume() {
vec.push(i);
}
vec
@ -119,7 +119,7 @@ fn gen_search_keys(graph: &[~[node_id]], n: uint) -> ~[node_id] {
}
}
let mut vec = ~[];
foreach i in keys.consume() {
for i in keys.consume() {
vec.push(i);
}
return vec;
@ -435,7 +435,7 @@ fn main() {
let stop = time::precise_time_s();
let mut total_edges = 0;
foreach edges in graph.iter() { total_edges += edges.len(); }
for edges in graph.iter() { total_edges += edges.len(); }
io::stdout().write_line(fmt!("Generated graph with %? edges in %? seconds.",
total_edges / 2,

View file

@ -64,12 +64,12 @@ fn run(args: &[~str]) {
let num_bytes = 100;
let start = extra::time::precise_time_s();
let mut worker_results = ~[];
foreach _ in range(0u, workers) {
for _ in range(0u, workers) {
let to_child = to_child.clone();
let mut builder = task::task();
builder.future_result(|r| worker_results.push(r));
do builder.spawn {
foreach _ in range(0u, size / workers) {
for _ in range(0u, size / workers) {
//error!("worker %?: sending %? bytes", i, num_bytes);
to_child.send(bytes(num_bytes));
}
@ -80,7 +80,7 @@ fn run(args: &[~str]) {
server(&from_parent, &to_parent);
}
foreach r in worker_results.iter() {
for r in worker_results.iter() {
r.recv();
}

View file

@ -58,12 +58,12 @@ fn run(args: &[~str]) {
let num_bytes = 100;
let start = extra::time::precise_time_s();
let mut worker_results = ~[];
foreach _ in range(0u, workers) {
for _ in range(0u, workers) {
let to_child = to_child.clone();
let mut builder = task::task();
builder.future_result(|r| worker_results.push(r));
do builder.spawn {
foreach _ in range(0u, size / workers) {
for _ in range(0u, size / workers) {
//error!("worker %?: sending %? bytes", i, num_bytes);
to_child.send(bytes(num_bytes));
}
@ -74,7 +74,7 @@ fn run(args: &[~str]) {
server(&from_parent, &to_parent);
}
foreach r in worker_results.iter() {
for r in worker_results.iter() {
r.recv();
}

View file

@ -57,7 +57,7 @@ fn thread_ring(i: uint, count: uint, num_chan: pipe, num_port: pipe) {
let mut num_chan = Some(num_chan);
let mut num_port = Some(num_port);
// Send/Receive lots of messages.
foreach j in range(0u, count) {
for j in range(0u, count) {
//error!("task %?, iter %?", i, j);
let num_chan2 = num_chan.take_unwrap();
let num_port2 = num_port.take_unwrap();
@ -90,7 +90,7 @@ fn main() {
// create the ring
let mut futures = ~[];
foreach i in range(1u, num_tasks) {
for i in range(1u, num_tasks) {
//error!("spawning %?", i);
let (new_chan, num_port) = init();
let num_chan2 = Cell::new(num_chan.take());
@ -108,7 +108,7 @@ fn main() {
thread_ring(0, msg_per_task, num_chan.take(), num_port);
// synchronize
foreach f in futures.mut_iter() {
for f in futures.mut_iter() {
f.get()
}

View file

@ -53,7 +53,7 @@ fn thread_ring(i: uint, count: uint, num_chan: pipe, num_port: pipe) {
let mut num_chan = Some(num_chan);
let mut num_port = Some(num_port);
// Send/Receive lots of messages.
foreach j in range(0u, count) {
for j in range(0u, count) {
//error!("task %?, iter %?", i, j);
let num_chan2 = num_chan.take_unwrap();
let num_port2 = num_port.take_unwrap();
@ -86,7 +86,7 @@ fn main() {
// create the ring
let mut futures = ~[];
foreach i in range(1u, num_tasks) {
for i in range(1u, num_tasks) {
//error!("spawning %?", i);
let (new_chan, num_port) = init();
let num_chan2 = Cell::new(num_chan.take());
@ -104,7 +104,7 @@ fn main() {
thread_ring(0, msg_per_task, num_chan.take(), num_port);
// synchronize
foreach f in futures.mut_iter() {
for f in futures.mut_iter() {
let _ = f.get();
}

View file

@ -38,11 +38,11 @@ impl Noise2DContext {
pub fn new() -> Noise2DContext {
let mut r = rand::rng();
let mut rgradients = [ Vec2 { x: 0.0, y: 0.0 }, ..256 ];
foreach i in range(0, 256) {
for i in range(0, 256) {
rgradients[i] = random_gradient(&mut r);
}
let mut permutations = [ 0, ..256 ];
foreach i in range(0, 256) {
for i in range(0, 256) {
permutations[i] = i;
}
r.shuffle_mut(permutations);
@ -106,8 +106,8 @@ fn main() {
let mut pixels = [0f32, ..256*256];
let n2d = ~Noise2DContext::new();
do 100.times {
foreach y in range(0, 256) {
foreach x in range(0, 256) {
for y in range(0, 256) {
for x in range(0, 256) {
let v = n2d.get(
x as f32 * 0.1f32,
y as f32 * 0.1f32
@ -117,8 +117,8 @@ fn main() {
};
};
foreach y in range(0, 256) {
foreach x in range(0, 256) {
for y in range(0, 256) {
for x in range(0, 256) {
print(symbols[(pixels[y*256+x] / 0.2f32) as int]);
}
println("");

View file

@ -22,8 +22,8 @@ use std::uint;
fn print_complements() {
let all = [Blue, Red, Yellow];
foreach aa in all.iter() {
foreach bb in all.iter() {
for aa in all.iter() {
for bb in all.iter() {
println(show_color(*aa) + " + " + show_color(*bb) +
" -> " + show_color(transform(*aa, *bb)));
}
@ -47,7 +47,7 @@ fn show_color(cc: color) -> ~str {
fn show_color_list(set: ~[color]) -> ~str {
let mut out = ~"";
foreach col in set.iter() {
for col in set.iter() {
out.push_char(' ');
out.push_str(show_color(*col));
}
@ -180,13 +180,13 @@ fn rendezvous(nn: uint, set: ~[color]) {
}
// tell each creature to stop
foreach to_one in to_creature.iter() {
for to_one in to_creature.iter() {
to_one.send(None);
}
// save each creature's meeting stats
let mut report = ~[];
foreach _to_one in to_creature.iter() {
for _to_one in to_creature.iter() {
report.push(from_creatures_log.recv());
}
@ -194,7 +194,7 @@ fn rendezvous(nn: uint, set: ~[color]) {
io::println(show_color_list(set));
// print each creature's stats
foreach rep in report.iter() {
for rep in report.iter() {
io::println(*rep);
}

View file

@ -28,7 +28,7 @@ fn fannkuch_redux(n: i32) -> i32 {
r -= 1;
}
foreach (perm_i, perm1_i) in perm.mut_iter().zip(perm1.iter()) {
for (perm_i, perm1_i) in perm.mut_iter().zip(perm1.iter()) {
*perm_i = *perm1_i;
}
@ -41,7 +41,7 @@ fn fannkuch_redux(n: i32) -> i32 {
}
let k2 = (k+1) >> 1;
foreach i in range(0i32, k2) {
for i in range(0i32, k2) {
let (perm_i, perm_k_i) = {
(perm.unsafe_get(i as uint),
perm.unsafe_get((k-i) as uint))

View file

@ -58,7 +58,7 @@ static HOMO_SAPIENS: [AminoAcid, ..4] = [
fn sum_and_scale(a: &'static [AminoAcid]) -> ~[AminoAcid] {
let mut result = ~[];
let mut p = 0f32;
foreach a_i in a.iter() {
for a_i in a.iter() {
let mut a_i = *a_i;
p += a_i.p;
a_i.p = p * LOOKUP_SCALE;
@ -134,7 +134,7 @@ impl RandomFasta {
fn make_lookup(a: &[AminoAcid]) -> [AminoAcid, ..LOOKUP_SIZE] {
let mut lookup = [ NULL_AMINO_ACID, ..LOOKUP_SIZE ];
let mut j = 0;
foreach (i, slot) in lookup.mut_iter().enumerate() {
for (i, slot) in lookup.mut_iter().enumerate() {
while a[j].p < (i as f32) {
j += 1;
}
@ -150,7 +150,7 @@ impl RandomFasta {
fn nextc(&mut self) -> u8 {
let r = self.rng(1.0);
foreach a in self.lookup.iter() {
for a in self.lookup.iter() {
if a.p >= r {
return a.c;
}
@ -165,7 +165,7 @@ impl RandomFasta {
let mut buf = [0, ..LINE_LEN + 1];
do lines.times {
foreach i in range(0u, LINE_LEN) {
for i in range(0u, LINE_LEN) {
buf[i] = self.nextc();
}
buf[LINE_LEN] = '\n' as u8;
@ -174,7 +174,7 @@ impl RandomFasta {
1,
self.stdout);
}
foreach i in range(0u, chars_left) {
for i in range(0u, chars_left) {
buf[i] = self.nextc();
}
fwrite(transmute(&buf[0]), chars_left as size_t, 1, self.stdout);

View file

@ -46,7 +46,7 @@ struct AminoAcids {
fn make_cumulative(aa: ~[AminoAcids]) -> ~[AminoAcids] {
let mut cp: u32 = 0u32;
let mut ans: ~[AminoAcids] = ~[];
foreach a in aa.iter() {
for a in aa.iter() {
cp += a.prob;
ans.push(AminoAcids {ch: a.ch, prob: cp});
}
@ -81,7 +81,7 @@ fn make_random_fasta(wr: @io::Writer,
last: rng.next()
};
let mut op: ~str = ~"";
foreach _ in range(0u, n as uint) {
for _ in range(0u, n as uint) {
op.push_char(select_random(myrandom_next(rng, 100u32),
genelist.clone()));
if op.len() >= LINE_LENGTH {
@ -96,7 +96,7 @@ fn make_repeat_fasta(wr: @io::Writer, id: ~str, desc: ~str, s: ~str, n: int) {
wr.write_line(~">" + id + " " + desc);
let mut op = str::with_capacity( LINE_LENGTH );
let sl = s.len();
foreach i in range(0u, n as uint) {
for i in range(0u, n as uint) {
if (op.len() >= LINE_LENGTH) {
wr.write_line( op );
op = str::with_capacity( LINE_LENGTH );

View file

@ -62,7 +62,7 @@ fn sort_and_fmt(mm: &HashMap<~[u8], uint>, total: uint) -> ~str {
let mut pairs = ~[];
// map -> [(k,%)]
foreach (key, &val) in mm.iter() {
for (key, &val) in mm.iter() {
pairs.push(((*key).clone(), pct(val, total)));
}
@ -70,7 +70,7 @@ fn sort_and_fmt(mm: &HashMap<~[u8], uint>, total: uint) -> ~str {
let mut buffer = ~"";
foreach kv in pairs_sorted.iter() {
for kv in pairs_sorted.iter() {
let (k,v) = (*kv).clone();
unsafe {
let b = str::raw::from_bytes(k);
@ -215,7 +215,7 @@ fn main() {
(_, true) => {
let line_bytes = line.as_bytes();
foreach (ii, _sz) in sizes.iter().enumerate() {
for (ii, _sz) in sizes.iter().enumerate() {
let lb = line_bytes.to_owned();
to_child[ii].send(lb);
}
@ -227,12 +227,12 @@ fn main() {
}
// finish...
foreach (ii, _sz) in sizes.iter().enumerate() {
for (ii, _sz) in sizes.iter().enumerate() {
to_child[ii].send(~[]);
}
// now fetch and print result messages
foreach (ii, _sz) in sizes.iter().enumerate() {
for (ii, _sz) in sizes.iter().enumerate() {
io::println(from_child[ii].recv());
}
}

View file

@ -44,7 +44,7 @@ impl Code {
fn pack(string: &str) -> Code {
let mut code = Code(0u64);
foreach i in range(0u, string.len()) {
for i in range(0u, string.len()) {
code = code.push_char(string[i]);
}
code

View file

@ -19,9 +19,9 @@ fn main() {
let mode = "w";
let stdout = fdopen(STDOUT_FILENO as c_int, transmute(&mode[0]));
foreach y in range(0i32, h) {
for y in range(0i32, h) {
let y = y as f64;
foreach x in range(0i32, w) {
for x in range(0i32, w) {
let mut Zr = 0f64;
let mut Zi = 0f64;
let mut Tr = 0f64;
@ -29,7 +29,7 @@ fn main() {
let Cr = 2.0 * (x as f64) / (w as f64) - 1.5;
let Ci = 2.0 * (y as f64) / (h as f64) - 1.0;
foreach _ in range(0i32, ITER as i32) {
for _ in range(0i32, ITER as i32) {
if Tr + Ti > LIMIT * LIMIT {
break;
}

View file

@ -80,8 +80,8 @@ struct Planet {
fn advance(bodies: &mut [Planet, ..N_BODIES], dt: f64, steps: i32) {
let mut d = [ 0.0, ..3 ];
do (steps as uint).times {
foreach i in range(0u, N_BODIES) {
foreach j in range(i + 1, N_BODIES) {
for i in range(0u, N_BODIES) {
for j in range(i + 1, N_BODIES) {
d[0] = bodies[i].x[0] - bodies[j].x[0];
d[1] = bodies[i].x[1] - bodies[j].x[1];
d[2] = bodies[i].x[2] - bodies[j].x[2];
@ -101,7 +101,7 @@ fn advance(bodies: &mut [Planet, ..N_BODIES], dt: f64, steps: i32) {
}
}
foreach a in bodies.mut_iter() {
for a in bodies.mut_iter() {
a.x[0] += dt * a.v[0];
a.x[1] += dt * a.v[1];
a.x[2] += dt * a.v[2];
@ -112,13 +112,13 @@ fn advance(bodies: &mut [Planet, ..N_BODIES], dt: f64, steps: i32) {
fn energy(bodies: &[Planet, ..N_BODIES]) -> f64 {
let mut e = 0.0;
let mut d = [ 0.0, ..3 ];
foreach i in range(0u, N_BODIES) {
foreach k in range(0u, 3) {
for i in range(0u, N_BODIES) {
for k in range(0u, 3) {
e += bodies[i].mass * bodies[i].v[k] * bodies[i].v[k] / 2.0;
}
foreach j in range(i + 1, N_BODIES) {
foreach k in range(0u, 3) {
for j in range(i + 1, N_BODIES) {
for k in range(0u, 3) {
d[k] = bodies[i].x[k] - bodies[j].x[k];
}
let dist = (d[0]*d[0] + d[1]*d[1] + d[2]*d[2]).sqrt();
@ -129,8 +129,8 @@ fn energy(bodies: &[Planet, ..N_BODIES]) -> f64 {
}
fn offset_momentum(bodies: &mut [Planet, ..N_BODIES]) {
foreach i in range(0u, N_BODIES) {
foreach k in range(0u, 3) {
for i in range(0u, N_BODIES) {
for k in range(0u, 3) {
bodies[0].v[k] -= bodies[i].v[k] * bodies[i].mass / SOLAR_MASS;
}
}

View file

@ -83,14 +83,14 @@ fn stress_task(id: int) {
fn stress(num_tasks: int) {
let mut results = ~[];
foreach i in range(0, num_tasks) {
for i in range(0, num_tasks) {
let mut builder = task::task();
builder.future_result(|r| results.push(r));
do builder.spawn {
stress_task(i);
}
}
foreach r in results.iter() {
for r in results.iter() {
r.recv();
}
}
@ -116,8 +116,8 @@ fn main() {
let out = io::stdout();
foreach n in range(1, max + 1) {
foreach _ in range(0, num_trials) {
for n in range(1, max + 1) {
for _ in range(0, num_trials) {
let start = time::precise_time_ns();
let fibn = fib(n);
let stop = time::precise_time_ns();

View file

@ -19,16 +19,16 @@ fn A(i: i32, j: i32) -> i32 {
fn dot(v: &[f64], u: &[f64]) -> f64 {
let mut sum = 0.0;
foreach (i, &v_i) in v.iter().enumerate() {
for (i, &v_i) in v.iter().enumerate() {
sum += v_i * u[i];
}
sum
}
fn mult_Av(v: &mut [f64], out: &mut [f64]) {
foreach (i, out_i) in out.mut_iter().enumerate() {
for (i, out_i) in out.mut_iter().enumerate() {
let mut sum = 0.0;
foreach (j, &v_j) in v.mut_iter().enumerate() {
for (j, &v_j) in v.mut_iter().enumerate() {
sum += v_j / (A(i as i32, j as i32) as f64);
}
*out_i = sum;
@ -36,9 +36,9 @@ fn mult_Av(v: &mut [f64], out: &mut [f64]) {
}
fn mult_Atv(v: &mut [f64], out: &mut [f64]) {
foreach (i, out_i) in out.mut_iter().enumerate() {
for (i, out_i) in out.mut_iter().enumerate() {
let mut sum = 0.0;
foreach (j, &v_j) in v.mut_iter().enumerate() {
for (j, &v_j) in v.mut_iter().enumerate() {
sum += v_j / (A(j as i32, i as i32) as f64);
}
*out_i = sum;

View file

@ -19,13 +19,13 @@ use std::os;
use std::uint;
fn append_sequential(min: uint, max: uint, map: &mut SmallIntMap<uint>) {
foreach i in range(min, max) {
for i in range(min, max) {
map.insert(i, i + 22u);
}
}
fn check_sequential(min: uint, max: uint, map: &SmallIntMap<uint>) {
foreach i in range(min, max) {
for i in range(min, max) {
assert_eq!(*map.get(&i), i + 22u);
}
}
@ -45,7 +45,7 @@ fn main() {
let mut checkf = 0.0;
let mut appendf = 0.0;
foreach _ in range(0u, rep) {
for _ in range(0u, rep) {
let mut map = SmallIntMap::new();
let start = extra::time::precise_time_s();
append_sequential(0u, max, &mut map);

View file

@ -56,8 +56,8 @@ impl Sudoku {
}
pub fn equal(&self, other: &Sudoku) -> bool {
foreach row in range(0u8, 9u8) {
foreach col in range(0u8, 9u8) {
for row in range(0u8, 9u8) {
for col in range(0u8, 9u8) {
if self.grid[row][col] != other.grid[row][col] {
return false;
}
@ -87,9 +87,9 @@ impl Sudoku {
}
pub fn write(&self, writer: @io::Writer) {
foreach row in range(0u8, 9u8) {
for row in range(0u8, 9u8) {
writer.write_str(fmt!("%u", self.grid[row][0] as uint));
foreach col in range(1u8, 9u8) {
for col in range(1u8, 9u8) {
writer.write_str(fmt!(" %u", self.grid[row][col] as uint));
}
writer.write_char('\n');
@ -99,8 +99,8 @@ impl Sudoku {
// solve sudoku grid
pub fn solve(&mut self) {
let mut work: ~[(u8, u8)] = ~[]; /* queue of uncolored fields */
foreach row in range(0u8, 9u8) {
foreach col in range(0u8, 9u8) {
for row in range(0u8, 9u8) {
for col in range(0u8, 9u8) {
let color = self.grid[row][col];
if color == 0u8 {
work.push((row, col));
@ -143,7 +143,7 @@ impl Sudoku {
// find colors available in neighbourhood of (row, col)
fn drop_colors(&mut self, avail: &mut Colors, row: u8, col: u8) {
foreach idx in range(0u8, 9u8) {
for idx in range(0u8, 9u8) {
avail.remove(self.grid[idx][col]); /* check same column fields */
avail.remove(self.grid[row][idx]); /* check same row fields */
}
@ -151,8 +151,8 @@ impl Sudoku {
// check same block fields
let row0 = (row / 3u8) * 3u8;
let col0 = (col / 3u8) * 3u8;
foreach alt_row in range(row0, row0 + 3u8) {
foreach alt_col in range(col0, col0 + 3u8) {
for alt_row in range(row0, row0 + 3u8) {
for alt_col in range(col0, col0 + 3u8) {
avail.remove(self.grid[alt_row][alt_col]);
}
}

View file

@ -16,7 +16,7 @@ struct Foo {
impl Foo {
pub fn foo(&mut self, fun: &fn(&int)) {
foreach f in self.n.iter() {
for f in self.n.iter() {
fun(f);
}
}

View file

@ -10,7 +10,7 @@
fn main() {
let v = @mut [ 1, 2, 3 ];
foreach _x in v.iter() {
for _x in v.iter() {
v[1] = 4; //~ ERROR cannot assign
}
}

View file

@ -15,7 +15,7 @@ trait vec_monad<A> {
impl<A> vec_monad<A> for ~[A] {
fn bind<B>(&self, f: &fn(A) -> ~[B]) {
let mut r = fail!();
foreach elt in self.iter() { r = r + f(*elt); }
for elt in self.iter() { r = r + f(*elt); }
//~^ WARNING unreachable expression
//~^^ ERROR the type of this value must be known
}

View file

@ -14,7 +14,7 @@
fn fail_len(v: ~[int]) -> uint {
let mut i = 3;
fail!();
foreach x in v.iter() { i += 1u; }
for x in v.iter() { i += 1u; }
//~^ ERROR: unreachable statement
return i;
}

View file

@ -37,7 +37,7 @@ fn main() {
('c', 'd'),
('e', 'f')];
foreach &(x,y) in v.iter() {} // should be OK
for &(x,y) in v.iter() {} // should be OK
// Make sure none of the errors above were fatal
let x: char = true; //~ ERROR expected `char` but found `bool`

View file

@ -11,7 +11,7 @@
fn main() {
let mut xs = ~[1, 2, 3, 4];
foreach x in xs.mut_iter() {
for x in xs.mut_iter() {
xs.push(1) //~ ERROR cannot borrow `xs` as mutable
}
}

View file

@ -108,7 +108,7 @@ fn main() {
'\xA0', '\u1680', '\u180E', '\u2000', '\u2001', '\u2002', '\u2003',
'\u2004', '\u2005', '\u2006', '\u2007', '\u2008', '\u2009', '\u200A',
'\u2028', '\u2029', '\u202F', '\u205F', '\u3000'];
foreach c in chars.iter() {
for c in chars.iter() {
let ws = c.is_whitespace();
println(fmt!("%? %?" , c , ws));
}

View file

@ -102,7 +102,7 @@ fn main() {
'\xA0', '\u1680', '\u180E', '\u2000', '\u2001', '\u2002', '\u2003',
'\u2004', '\u2005', '\u2006', '\u2007', '\u2008', '\u2009', '\u200A',
'\u2028', '\u2029', '\u202F', '\u205F', '\u3000'];
foreach c in chars.iter() {
for c in chars.iter() {
let ws = c.is_whitespace();
println(fmt!("%? %?", c , ws));
}

View file

@ -12,7 +12,7 @@
fn f(v: &[int]) {
let mut n = 0;
foreach e in v.iter() {
for e in v.iter() {
n = *e; // This comment once triggered pretty printer bug
}
}

View file

@ -11,4 +11,4 @@
// error-pattern:moop
extern mod extra;
fn main() { foreach _ in range(0u, 10u) { fail!("moop"); } }
fn main() { for _ in range(0u, 10u) { fail!("moop"); } }

View file

@ -15,7 +15,7 @@ fn main() {
let count = @mut 0u;
let mut map = std::hashmap::HashMap::new();
let mut arr = ~[];
foreach i in range(0u, 10u) {
for i in range(0u, 10u) {
arr.push(@~"key stuff");
map.insert(arr.clone(), arr + &[@~"value stuff"]);
if arr.len() == 5 {

View file

@ -11,7 +11,7 @@
pub fn main() {
let mut sum = 0;
let xs = ~[1, 2, 3, 4, 5];
foreach x in xs.iter() {
for x in xs.iter() {
sum += *x;
}
assert_eq!(sum, 15);

View file

@ -15,7 +15,7 @@ pub fn main() {
let v = ~[-1f, 0f, 1f, 2f, 3f];
// Statement form does not require parentheses:
foreach i in v.iter() {
for i in v.iter() {
info!("%?", *i);
}

View file

@ -10,7 +10,7 @@
// xfail-fast
fn iter_vec<T>(v: ~[T], f: &fn(&T)) { foreach x in v.iter() { f(x); } }
fn iter_vec<T>(v: ~[T], f: &fn(&T)) { for x in v.iter() { f(x); } }
pub fn main() {
let v = ~[1, 2, 3, 4, 5, 6, 7];

View file

@ -10,7 +10,7 @@
// xfail-fast
fn iter_vec<T>(v: ~[T], f: &fn(&T)) { foreach x in v.iter() { f(x); } }
fn iter_vec<T>(v: ~[T], f: &fn(&T)) { for x in v.iter() { f(x); } }
pub fn main() {
let v = ~[1, 2, 3, 4, 5];

View file

@ -10,7 +10,7 @@
fn sum_slice(x: &[int]) -> int {
let mut sum = 0;
foreach i in x.iter() { sum += *i; }
for i in x.iter() { sum += *i; }
return sum;
}

View file

@ -10,7 +10,7 @@
fn want_slice(v: &[int]) -> int {
let mut sum = 0;
foreach i in v.iter() { sum += *i; }
for i in v.iter() { sum += *i; }
sum
}

View file

@ -4,7 +4,7 @@ struct Wizard {
impl Wizard {
pub fn cast(&mut self) {
foreach &spell in self.spells.iter() {
for &spell in self.spells.iter() {
println(spell);
}
}

View file

@ -17,7 +17,7 @@ pub fn main() {
loop { i += 1; if i == 20 { break; } }
assert_eq!(i, 20);
let xs = [1, 2, 3, 4, 5, 6];
foreach x in xs.iter() {
for x in xs.iter() {
if *x == 3 { break; } assert!((*x <= 3));
}
i = 0;
@ -28,7 +28,7 @@ pub fn main() {
if i >= 10 { break; }
}
let ys = ~[1, 2, 3, 4, 5, 6];
foreach x in ys.iter() {
for x in ys.iter() {
if *x % 2 == 0 { loop; }
assert!((*x % 2 != 0));
}

View file

@ -83,7 +83,7 @@ fn cat(in_x : uint, in_y : int, in_name: ~str) -> cat {
fn annoy_neighbors(critter: @noisy) {
foreach i in range(0u, 10) { critter.speak(); }
for i in range(0u, 10) { critter.speak(); }
}
pub fn main() {

View file

@ -75,7 +75,7 @@ class cat : map<int, bool> {
pub fn main() {
let nyan : cat = cat(0, 2, "nyan");
foreach _ in range(1u, 5u) { nyan.speak(); }
for _ in range(1u, 5u) { nyan.speak(); }
// cat returns true if uint input is greater than
// the number of meows so far
assert!((nyan.get(1)));

View file

@ -117,11 +117,11 @@ impl<T> cat<T> {
pub fn main() {
let mut nyan: cat<~str> = cat::new(0, 2, ~"nyan");
foreach _ in range(1u, 5) { nyan.speak(); }
for _ in range(1u, 5) { nyan.speak(); }
assert!(*nyan.find(&1).unwrap() == ~"nyan");
assert_eq!(nyan.find(&10), None);
let mut spotty: cat<cat_type> = cat::new(2, 57, tuxedo);
foreach _ in range(0u, 6) { spotty.speak(); }
for _ in range(0u, 6) { spotty.speak(); }
assert_eq!(spotty.len(), 8);
assert!((spotty.contains_key(&2)));
assert_eq!(spotty.get(&3), &tuxedo);

View file

@ -63,6 +63,6 @@ pub fn main() {
let mut nyan = cat(0u, 2, ~"nyan");
nyan.eat();
assert!((!nyan.eat()));
foreach _ in range(1u, 10u) { nyan.speak(); };
for _ in range(1u, 10u) { nyan.speak(); };
assert!((nyan.eat()));
}

View file

@ -68,7 +68,7 @@ pub fn main() {
let mut nyan = cat(0u, 2, ~"nyan");
nyan.eat();
assert!((!nyan.eat()));
foreach _ in range(1u, 10u) {
for _ in range(1u, 10u) {
make_speak(nyan.clone());
}
}

View file

@ -95,7 +95,7 @@ class cat : noisy, scratchy, bitey {
}
fn annoy_neighbors<T:noisy>(critter: T) {
foreach i in range(0u, 10u) {
for i in range(0u, 10u) {
let what = critter.speak();
info!("%u %d", i, what);
}

View file

@ -19,6 +19,6 @@ pub fn main() {
let mut nyan = cat(0u, 2, ~"nyan");
nyan.eat();
assert!((!nyan.eat()));
foreach _ in range(1u, 10u) { nyan.speak(); };
for _ in range(1u, 10u) { nyan.speak(); };
assert!((nyan.eat()));
}

View file

@ -52,6 +52,6 @@ pub fn main() {
let mut nyan = cat(0u, 2, ~"nyan");
nyan.eat();
assert!((!nyan.eat()));
foreach _ in range(1u, 10u) { nyan.speak(); };
for _ in range(1u, 10u) { nyan.speak(); };
assert!((nyan.eat()));
}

View file

@ -1,6 +1,6 @@
fn sum(x: &[int]) -> int {
let mut sum = 0;
foreach y in x.iter() { sum += *y; }
for y in x.iter() { sum += *y; }
return sum;
}

View file

@ -24,6 +24,6 @@ struct S<'self>(&'self fn());
static closures: &'static [S<'static>] = &[S(f), S(f)];
pub fn main() {
foreach &bare_fn in bare_fns.iter() { bare_fn() }
foreach &closure in closures.iter() { (*closure)() }
for &bare_fn in bare_fns.iter() { bare_fn() }
for &closure in closures.iter() { (*closure)() }
}

View file

@ -25,8 +25,8 @@ pub fn main() {
// in order for both Ord and TotalOrd
let es = [e0, e11, e12, e21, e22];
foreach (i, e1) in es.iter().enumerate() {
foreach (j, e2) in es.iter().enumerate() {
for (i, e1) in es.iter().enumerate() {
for (j, e2) in es.iter().enumerate() {
let ord = i.cmp(&j);
let eq = i == j;

View file

@ -21,8 +21,8 @@ pub fn main() {
// in order for both Ord and TotalOrd
let ss = [s1, s2];
foreach (i, s1) in ss.iter().enumerate() {
foreach (j, s2) in ss.iter().enumerate() {
for (i, s1) in ss.iter().enumerate() {
for (j, s2) in ss.iter().enumerate() {
let ord = i.cmp(&j);
let eq = i == j;

View file

@ -19,8 +19,8 @@ pub fn main() {
// in order for both Ord and TotalOrd
let tss = [ts1, ts2];
foreach (i, ts1) in tss.iter().enumerate() {
foreach (j, ts2) in tss.iter().enumerate() {
for (i, ts1) in tss.iter().enumerate() {
for (j, ts2) in tss.iter().enumerate() {
let ord = i.cmp(&j);
let eq = i == j;

View file

@ -16,10 +16,10 @@ struct Box {
impl Box {
pub fn set_many(&mut self, xs: &[uint]) {
foreach x in xs.iter() { self.x = *x; }
for x in xs.iter() { self.x = *x; }
}
pub fn set_many2(@mut self, xs: &[uint]) {
foreach x in xs.iter() { self.x = *x; }
for x in xs.iter() { self.x = *x; }
}
}

View file

@ -10,7 +10,7 @@
pub fn main() {
let v : &[(int,int)] = &[ (1, 2), (3, 4), (5, 6) ];
foreach &(x, y) in v.iter() {
for &(x, y) in v.iter() {
println(y.to_str());
println(x.to_str());
}

View file

@ -8,4 +8,4 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
pub fn main() { let x: ~[int] = ~[]; foreach _ in x.iter() { fail!("moop"); } }
pub fn main() { let x: ~[int] = ~[]; for _ in x.iter() { fail!("moop"); } }

View file

@ -11,7 +11,7 @@
fn main() {
let x = [1,..100];
let mut y = 0;
foreach i in x.iter() {
for i in x.iter() {
if y > 10 {
break;
}

View file

@ -17,7 +17,7 @@ use std::hashmap::HashMap;
fn main() {
let mut h = HashMap::new();
let kvs = [(1, 10), (2, 20), (3, 30)];
foreach &(k,v) in kvs.iter() {
for &(k,v) in kvs.iter() {
h.insert(k,v);
}
let mut x = 0;
@ -25,13 +25,13 @@ fn main() {
let mut i = h.iter();
foreach (&k,&v) in i {
for (&k,&v) in i {
x += k;
y += v;
break;
}
foreach (&k,&v) in i {
for (&k,&v) in i {
x += k;
y += v;
}

View file

@ -13,12 +13,12 @@ use std::hashmap::HashMap;
fn main() {
let mut h = HashMap::new();
let kvs = [(1, 10), (2, 20), (3, 30)];
foreach &(k,v) in kvs.iter() {
for &(k,v) in kvs.iter() {
h.insert(k,v);
}
let mut x = 0;
let mut y = 0;
foreach (&k,&v) in h.iter() {
for (&k,&v) in h.iter() {
x += k;
y += v;
}

View file

@ -11,7 +11,7 @@
fn main() {
let x = [1,..100];
let mut y = 0;
foreach (n,i) in x.iter().enumerate() {
for (n,i) in x.iter().enumerate() {
if n < 10 {
loop;
}

View file

@ -13,8 +13,8 @@ fn main() {
let y = [2,..100];
let mut p = 0;
let mut q = 0;
foreach i in x.iter() {
foreach j in y.iter() {
for i in x.iter() {
for j in y.iter() {
p += *j;
}
q += *i + p;

View file

@ -11,7 +11,7 @@
fn main() {
let x = [1,..100];
let mut y = 0;
foreach i in x.iter() {
for i in x.iter() {
y += *i
}
assert!(y == 100);

View file

@ -15,7 +15,7 @@ trait vec_utils<T> {
impl<T> vec_utils<T> for ~[T] {
fn map_<U>(x: &~[T], f: &fn(&T) -> U) -> ~[U] {
let mut r = ~[];
foreach elt in x.iter() {
for elt in x.iter() {
r.push(f(elt));
}
r

View file

@ -31,7 +31,7 @@ mod map_reduce {
enum ctrl_proto { find_reducer(~[u8], Chan<int>), mapper_done, }
fn start_mappers(ctrl: SharedChan<ctrl_proto>, inputs: ~[~str]) {
foreach i in inputs.iter() {
for i in inputs.iter() {
let ctrl = ctrl.clone();
let i = i.clone();
task::spawn(|| map_task(ctrl.clone(), i.clone()) );

View file

@ -67,14 +67,14 @@ fn read_board_grid<rdr:'static + io::Reader>(input: rdr) -> ~[~[square]] {
let mut grid = ~[];
do input.each_line |line| {
let mut row = ~[];
foreach c in line.iter() {
for c in line.iter() {
row.push(square_from_char(c))
}
grid.push(row);
true
};
let width = grid[0].len();
foreach row in grid.iter() { assert!(row.len() == width) }
for row in grid.iter() { assert!(row.len() == width) }
grid
}

View file

@ -40,7 +40,7 @@ pub fn main() {
let bools = ~[false, false, true, false, false, true, true, false];
let bools2 = to_bools(Storage{storage: ~[0b01100100]});
foreach i in range(0u, 8) {
for i in range(0u, 8) {
printfln!("%u => %u vs %u", i, bools[i] as uint, bools2[i] as uint);
}

View file

@ -14,7 +14,7 @@ struct trie_node {
}
fn print_str_vector(vector: ~[~str]) {
foreach string in vector.iter() {
for string in vector.iter() {
println(*string);
}
}

View file

@ -11,7 +11,7 @@
trait Canvas {
fn add_point(&self, point: &int);
fn add_points(&self, shapes: &[int]) {
foreach pt in shapes.iter() {
for pt in shapes.iter() {
self.add_point(pt)
}
}

View file

@ -120,7 +120,7 @@ trait Canvas {
// Unlike interfaces traits support default implementations.
// Got an ICE as soon as I added this method.
fn add_points(&mut self, shapes: &[Point]) {
foreach pt in shapes.iter() {self.add_point(*pt)};
for pt in shapes.iter() {self.add_point(*pt)};
}
}
@ -134,13 +134,13 @@ impl Canvas for AsciiArt {
fn add_rect(&mut self, shape: Rect) {
// Add the top and bottom lines.
foreach x in range(shape.top_left.x, shape.top_left.x + shape.size.width) {
for x in range(shape.top_left.x, shape.top_left.x + shape.size.width) {
self.add_pt(x, shape.top_left.y);
self.add_pt(x, shape.top_left.y + shape.size.height - 1);
}
// Add the left and right lines.
foreach y in range(shape.top_left.y, shape.top_left.y + shape.size.height) {
for y in range(shape.top_left.y, shape.top_left.y + shape.size.height) {
self.add_pt(shape.top_left.x, y);
self.add_pt(shape.top_left.x + shape.size.width - 1, y);
}

View file

@ -17,7 +17,7 @@ fn foo(name: ~str, samples_chan: Chan<Msg>) {
let callback: SamplesFn =
|buffer|
{
foreach i in range(0u, buffer.len()) {
for i in range(0u, buffer.len()) {
error!("%?: %f", i, buffer[i])
}
};

View file

@ -102,7 +102,7 @@ priv fn cmd_to_str(cmd: ~[~str]) -> ~str {
let mut res = ~"*";
res.push_str(cmd.len().to_str());
res.push_str("\r\n");
foreach s in cmd.iter() {
for s in cmd.iter() {
res.push_str([~"$", s.len().to_str(), ~"\r\n",
(*s).clone(), ~"\r\n"].concat() );
}

View file

@ -12,7 +12,7 @@ use std::os;
pub fn main() {
let x = os::args();
foreach arg in x.iter() {
for arg in x.iter() {
match arg.clone() {
s => { }
}

View file

@ -11,12 +11,12 @@
pub fn main() {
let x = ~[1, 2, 3];
let mut y = 0;
foreach i in x.iter() { info!(*i); y += *i; }
for i in x.iter() { info!(*i); y += *i; }
info!(y);
assert_eq!(y, 6);
let s = ~"hello there";
let mut i: int = 0;
foreach c in s.byte_iter() {
for c in s.byte_iter() {
if i == 0 { assert!((c == 'h' as u8)); }
if i == 1 { assert!((c == 'e' as u8)); }
if i == 2 { assert!((c == 'l' as u8)); }

View file

@ -11,6 +11,6 @@
pub fn main() {
let x = ~[10, 20, 30];
let mut sum = 0;
foreach x in x.iter() { sum += *x; }
for x in x.iter() { sum += *x; }
assert_eq!(sum, 60);
}

View file

@ -22,7 +22,7 @@ fn iloop() {
}
pub fn main() {
foreach _ in range(0u, 100u) {
for _ in range(0u, 100u) {
task::spawn_unlinked(|| iloop() );
}
}

View file

@ -19,7 +19,7 @@ trait vec_monad<A> {
impl<A> vec_monad<A> for ~[A] {
fn bind<B>(&self, f: &fn(&A) -> ~[B]) -> ~[B] {
let mut r = ~[];
foreach elt in self.iter() {
for elt in self.iter() {
r.push_all_move(f(elt));
}
r

View file

@ -67,7 +67,7 @@ pub fn main() {
calllink10
];
let mut rng = rand::rng();
foreach f in fns.iter() {
for f in fns.iter() {
let f = *f;
let sz = rng.next() % 256u32 + 256u32;
let frame_backoff = rng.next() % 10u32 + 1u32;

View file

@ -26,7 +26,7 @@ fn test(x: bool, foo: ~Triple) -> int {
pub fn main() {
let x = ~Triple{x: 1, y: 2, z: 3};
foreach _ in range(0u, 10000u) {
for _ in range(0u, 10000u) {
assert_eq!(test(true, x.clone()), 2);
}
assert_eq!(test(false, x), 5);

View file

@ -21,7 +21,7 @@ fn test(x: bool, foo: @Triple) -> int {
pub fn main() {
let x = @Triple{x: 1, y: 2, z: 3};
foreach i in range(0u, 10000u) {
for i in range(0u, 10000u) {
assert_eq!(test(true, x), 2);
}
assert_eq!(test(false, x), 5);

View file

@ -16,8 +16,8 @@ fn test1() {
fn test2() {
let mut ints = [0, ..32];
foreach i in ints.mut_iter() { *i += 22; }
foreach i in ints.iter() { assert!(*i == 22); }
for i in ints.mut_iter() { *i += 22; }
for i in ints.iter() { assert!(*i == 22); }
}
pub fn main() {

View file

@ -31,7 +31,7 @@ impl<K,V> AssociationList<K,V> {
impl<K:Eq,V:Clone> Index<K,V> for AssociationList<K,V> {
fn index(&self, index: &K) -> V {
foreach pair in self.pairs.iter() {
for pair in self.pairs.iter() {
if pair.key == *index {
return pair.value.clone();
}

View file

@ -29,7 +29,7 @@ pub fn main() {
~BarStruct{ x: 2 } as ~FooTrait
];
foreach i in range(0u, foos.len()) {
for i in range(0u, foos.len()) {
assert_eq!(i, foos[i].foo());
}
}

View file

@ -22,11 +22,11 @@ fn main() {
assert_eq!(sys::size_of::<[Foo, .. 10]>(), 90);
foreach i in range(0u, 10) {
for i in range(0u, 10) {
assert_eq!(foos[i], Foo { bar: 1, baz: 2});
}
foreach &foo in foos.iter() {
for &foo in foos.iter() {
assert_eq!(foo, Foo { bar: 1, baz: 2 });
}
}

View file

@ -16,7 +16,7 @@ fn foo(src: uint) {
match Some(src) {
Some(src_id) => {
foreach i in range(0u, 10u) {
for i in range(0u, 10u) {
let yyy = src_id;
assert_eq!(yyy, 0u);
}

View file

@ -22,7 +22,7 @@ impl cat {
}
impl cat {
fn nap(&mut self) { foreach _ in range(1u, 10u) { } }
fn nap(&mut self) { for _ in range(1u, 10u) { } }
}
fn cat(in_x : uint, in_y : int) -> cat {

View file

@ -666,7 +666,7 @@ pub fn main() {
visit_tydesc(td, v);
let r = u.vals.clone();
foreach s in r.iter() {
for s in r.iter() {
printfln!("val: %s", *s);
}
error!("%?", u.vals.clone());

View file

@ -170,7 +170,7 @@ pub fn main() {
visit_ty::<i16>(vv);
visit_ty::<~[int]>(vv);
foreach s in v.types.iter() {
for s in v.types.iter() {
printfln!("type: %s", (*s).clone());
}
assert_eq!((*v.types).clone(), ~[~"bool", ~"int", ~"i8", ~"i16", ~"[", ~"int", ~"]"]);

View file

@ -13,7 +13,7 @@ use std::util;
pub fn main() {
let mut x = 4;
foreach i in range(0u, 3) {
for i in range(0u, 3) {
// ensure that the borrow in this alt
// does not inferfere with the swap
// below. note that it would it you

View file

@ -33,7 +33,7 @@ fn iloop() {
}
pub fn main() {
foreach _ in range(0u, 16u) {
for _ in range(0u, 16u) {
task::spawn_unlinked(|| iloop() );
}
}

View file

@ -16,7 +16,7 @@ fn foo(c: ~[int]) {
match none::<int> {
some::<int>(_) => {
foreach i in c.iter() {
for i in c.iter() {
info!(a);
let a = 17;
b.push(a);

View file

@ -26,7 +26,7 @@ pub fn main() {
match io::file_writer(&path, [io::Create, io::Truncate]) {
Err(ref e) => fail!(e.clone()),
Ok(f) => {
foreach _ in range(0u, 1000) {
for _ in range(0u, 1000) {
f.write_u8(0);
}
}

View file

@ -48,10 +48,10 @@ trait vec_utils<T> {
impl<T> vec_utils<T> for ~[T] {
fn length_(&self) -> uint { self.len() }
fn iter_(&self, f: &fn(&T)) { foreach x in self.iter() { f(x); } }
fn iter_(&self, f: &fn(&T)) { for x in self.iter() { f(x); } }
fn map_<U>(&self, f: &fn(&T) -> U) -> ~[U] {
let mut r = ~[];
foreach elt in self.iter() {
for elt in self.iter() {
r.push(f(elt));
}
r

View file

@ -55,7 +55,7 @@ fn test00() {
// Read from spawned tasks...
let mut sum = 0;
foreach r in results.iter() {
for r in results.iter() {
i = 0;
while i < number_of_messages {
let value = po.recv();
@ -65,7 +65,7 @@ fn test00() {
}
// Join spawned tasks...
foreach r in results.iter() { r.recv(); }
for r in results.iter() { r.recv(); }
info!("Completed: Final number is: ");
error!(sum);

View file

@ -84,20 +84,20 @@ fn main() {
fn check_legs(arc: arc::Arc<~[~Pet:Freeze+Send]>) {
let mut legs = 0;
foreach pet in arc.get().iter() {
for pet in arc.get().iter() {
legs += pet.num_legs();
}
assert!(legs == 12);
}
fn check_names(arc: arc::Arc<~[~Pet:Freeze+Send]>) {
foreach pet in arc.get().iter() {
for pet in arc.get().iter() {
do pet.name |name| {
assert!(name[0] == 'a' as u8 && name[1] == 'l' as u8);
}
}
}
fn check_pedigree(arc: arc::Arc<~[~Pet:Freeze+Send]>) {
foreach pet in arc.get().iter() {
for pet in arc.get().iter() {
assert!(pet.of_good_pedigree());
}
}

View file

@ -32,7 +32,7 @@ impl<T> map<T> for ~[T] {
fn map<U>(&self, f: &fn(&T) -> U) -> ~[U] {
let mut r = ~[];
// FIXME: #7355 generates bad code with VecIterator
foreach i in range(0u, self.len()) {
for i in range(0u, self.len()) {
r.push(f(&self[i]));
}
r

View file

@ -26,7 +26,7 @@ fn main() {
let mut it = Unfoldr::new(0, count);
let mut i = 0;
foreach counted in it {
for counted in it {
assert_eq!(counted, i);
i += 1;
}

View file

@ -20,14 +20,14 @@ pub fn main() {
let ch = SharedChan::new(ch);
let n = 100u;
let mut expected = 0u;
foreach i in range(0u, n) {
for i in range(0u, n) {
let ch = ch.clone();
task::spawn(|| child(&ch, i) );
expected += i;
}
let mut actual = 0u;
foreach _ in range(0u, n) {
for _ in range(0u, n) {
let j = p.recv();
actual += *j;
}

View file

@ -41,7 +41,7 @@ pub fn main() {
fn check_str_eq(a: ~str, b: ~str) {
let mut i: int = 0;
foreach ab in a.byte_iter() {
for ab in a.byte_iter() {
info!(i);
info!(ab);
let bb: u8 = b[i];