user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

s/while let/for/g now that #21245 has been fixed

Browse source
This commit is contained in:
Jorge Aparicio 2015-01-27 21:50:33 -05:00
parent c013a018b8
commit 2d76c94dd0
12 changed files with 19 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/test/bench/shootout-mandelbrot.rs
View file

@ -133,9 +133,7 @@ fn mandelbrot<W: old_io::Writer>(w: uint, mut out: W) -> old_io::IoResult<()> {
(i + 1) * chunk_size
};
// FIXME(#21245) use a for loop
let mut iter = vec_init_i[start..end].iter();
while let Some(&init_i) = iter.next() {
for &init_i in vec_init_i[start..end].iter() {
write_line(init_i, init_r_slice, &mut res);
}
@ -144,9 +142,7 @@ fn mandelbrot<W: old_io::Writer>(w: uint, mut out: W) -> old_io::IoResult<()> {
}).collect::<Vec<_>>();
try!(writeln!(&mut out as &mut Writer, "P4\n{} {}", w, h));
// FIXME(#21245) use a for loop
let mut iter = data.into_iter();
while let Some(res) = iter.next() {
for res in data.into_iter() {
try!(out.write(res.join().ok().unwrap().as_slice()));
}
out.flush()

8
src/test/bench/shootout-meteor.rs
View file

@ -180,9 +180,7 @@ fn make_masks() -> Vec<Vec<Vec<u64> > > {
// all unused piece can be placed on the board.
fn is_board_unfeasible(board: u64, masks: &Vec<Vec<Vec<u64>>>) -> bool {
let mut coverable = board;
// FIXME(#21245) use a for loop
let mut iter = masks.iter().enumerate();
while let Some((i, masks_at)) = iter.next() {
for (i, masks_at) in masks.iter().enumerate() {
if board & 1 << i != 0 { continue; }
for (cur_id, pos_masks) in masks_at.iter().enumerate() {
if board & 1 << (50 + cur_id) != 0 { continue; }
@ -224,9 +222,7 @@ fn to_vec(raw_sol: &List<u64>) -> Vec<u8> {
let mut sol = repeat('.' as u8).take(50).collect::<Vec<_>>();
for &m in raw_sol.iter() {
let id = '0' as u8 + get_id(m);
// FIXME(#21245) use a for loop
let mut iter = 0u..50;
while let Some(i) = iter.next() {
for i in 0u..50 {
if m & 1 << i != 0 {
sol[i] = id;
}