From 2d76c94dd077406d030a9b7058fb52f979db8bd2 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Tue, 27 Jan 2015 21:50:33 -0500 Subject: [PATCH] s/while let/for/g now that #21245 has been fixed --- src/libcollections/bit.rs | 4 +--- src/libcollections/ring_buf.rs | 8 ++------ src/libcollections/vec.rs | 4 +--- src/librustc/middle/dataflow.rs | 4 +--- src/libserialize/collection_impls.rs | 4 +--- src/libstd/ascii.rs | 5 +---- src/libstd/rand/os.rs | 4 +--- src/libstd/sync/mpsc/mod.rs | 8 ++------ src/libstd/sync/mpsc/mpsc_queue.rs | 4 +--- src/libsyntax/fold.rs | 12 ++++-------- src/test/bench/shootout-mandelbrot.rs | 8 ++------ src/test/bench/shootout-meteor.rs | 8 ++------ 12 files changed, 19 insertions(+), 54 deletions(-) diff --git a/src/libcollections/bit.rs b/src/libcollections/bit.rs index 99172dcdef3c..d676cfca9294 100644 --- a/src/libcollections/bit.rs +++ b/src/libcollections/bit.rs @@ -104,9 +104,7 @@ type MatchWords<'a> = Chain>, Skip u8 { let mut result = 0; - // FIXME(#21245) use a for loop - let mut iter = 0..u8::BITS; - while let Some(i) = iter.next() { + for i in 0..u8::BITS { result |= ((byte >> i) & 1) << (u8::BITS - 1 - i); } result diff --git a/src/libcollections/ring_buf.rs b/src/libcollections/ring_buf.rs index a9b31da8250e..a19b3c221b1e 100644 --- a/src/libcollections/ring_buf.rs +++ b/src/libcollections/ring_buf.rs @@ -1793,9 +1793,7 @@ mod tests { fn bench_push_back_100(b: &mut test::Bencher) { let mut deq = RingBuf::with_capacity(101); b.iter(|| { - // FIXME(#21245) use a for loop - let mut iter = 0i..100; - while let Some(i) = iter.next() { + for i in 0i..100 { deq.push_back(i); } deq.head = 0; @@ -1807,9 +1805,7 @@ mod tests { fn bench_push_front_100(b: &mut test::Bencher) { let mut deq = RingBuf::with_capacity(101); b.iter(|| { - // FIXME(#21245) use a for loop - let mut iter = 0i..100; - while let Some(i) = iter.next() { + for i in 0i..100 { deq.push_front(i); } deq.head = 0; diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs index 4ea8267135f0..1d20d39b1151 100644 --- a/src/libcollections/vec.rs +++ b/src/libcollections/vec.rs @@ -1567,9 +1567,7 @@ impl Drop for Vec { // zeroed (when moving out, because of #[unsafe_no_drop_flag]). if self.cap != 0 { unsafe { - // FIXME(#21245) use a for loop - let mut iter = self.iter(); - while let Some(x) = iter.next() { + for x in self.iter() { ptr::read(x); } dealloc(*self.ptr, self.cap) diff --git a/src/librustc/middle/dataflow.rs b/src/librustc/middle/dataflow.rs index d5ee0e57b796..01d42523f355 100644 --- a/src/librustc/middle/dataflow.rs +++ b/src/librustc/middle/dataflow.rs @@ -352,9 +352,7 @@ impl<'a, 'tcx, O:DataFlowOperator> DataFlowContext<'a, 'tcx, O> { for (word_index, &word) in words.iter().enumerate() { if word != 0 { let base_index = word_index * uint::BITS; - // FIXME(#21245) use a for loop - let mut iter = 0u..uint::BITS; - while let Some(offset) = iter.next() { + for offset in 0u..uint::BITS { let bit = 1 << offset; if (word & bit) != 0 { // NB: we round up the total number of bits diff --git a/src/libserialize/collection_impls.rs b/src/libserialize/collection_impls.rs index 77308d0a66f6..8b39d91ffaeb 100644 --- a/src/libserialize/collection_impls.rs +++ b/src/libserialize/collection_impls.rs @@ -148,9 +148,7 @@ impl< fn decode(d: &mut D) -> Result, D::Error> { let bits = try!(d.read_uint()); let mut set = EnumSet::new(); - // FIXME(#21245) use a for loop - let mut iter = 0..uint::BITS; - while let Some(bit) = iter.next() { + for bit in 0..uint::BITS { if bits & (1 << bit) != 0 { set.insert(CLike::from_uint(1 << bit)); } diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs index ffc4c5c6bace..9aa38e711e70 100644 --- a/src/libstd/ascii.rs +++ b/src/libstd/ascii.rs @@ -232,10 +232,7 @@ pub fn escape_default(c: u8, mut f: F) where _ => { f(b'\\'); f(b'x'); - // FIXME(#21245) use a for loop - let arr = [4u, 0u]; - let mut iter = arr.iter(); - while let ::option::Option::Some(&offset) = ::iter::Iterator::next(&mut iter) { + for &offset in [4u, 0u].iter() { match ((c as i32) >> offset) & 0xf { i @ 0 ... 9 => f(b'0' + (i as u8)), i => f(b'a' + (i as u8 - 10)), diff --git a/src/libstd/rand/os.rs b/src/libstd/rand/os.rs index 05677e1379db..992afb2d10fc 100644 --- a/src/libstd/rand/os.rs +++ b/src/libstd/rand/os.rs @@ -404,9 +404,7 @@ mod test { } // start all the tasks - // FIXME(#21245) use a for loop - let mut iter = txs.iter(); - while let Some(tx) = iter.next() { + for tx in txs.iter() { tx.send(()).unwrap(); } } diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs index b503b92b00f9..6a43eccbaba4 100644 --- a/src/libstd/sync/mpsc/mod.rs +++ b/src/libstd/sync/mpsc/mod.rs @@ -1476,9 +1476,7 @@ mod test { let _t = Thread::spawn(move|| { let mut count = 0; - // FIXME(#21245) use a for loop - let mut iter = rx.iter(); - while let Some(x) = iter.next() { + for x in rx.iter() { if count >= 3 { break; } else { @@ -1942,9 +1940,7 @@ mod sync_tests { let _t = Thread::spawn(move|| { let mut count = 0; - // FIXME(#21245) use a for loop - let mut iter = rx.iter(); - while let Some(x) = iter.next() { + for x in rx.iter() { if count >= 3 { break; } else { diff --git a/src/libstd/sync/mpsc/mpsc_queue.rs b/src/libstd/sync/mpsc/mpsc_queue.rs index cc09cfd665c7..53eba131674c 100644 --- a/src/libstd/sync/mpsc/mpsc_queue.rs +++ b/src/libstd/sync/mpsc/mpsc_queue.rs @@ -185,9 +185,7 @@ mod tests { let tx = tx.clone(); let q = q.clone(); Thread::spawn(move|| { - // FIXME(#21245) use a for loop - let mut iter = 0..nmsgs; - while let Some(i) = iter.next() { + for i in 0..nmsgs { q.push(i); } tx.send(()).unwrap(); diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs index d739e5fe6a03..a1362f5382c9 100644 --- a/src/libsyntax/fold.rs +++ b/src/libsyntax/fold.rs @@ -37,14 +37,10 @@ pub trait MoveMap { impl MoveMap for Vec { fn move_map(mut self, mut f: F) -> Vec where F: FnMut(T) -> T { - // FIXME(#21245) use a for loop - { - let mut iter = self.iter_mut(); - while let Some(p) = iter.next() { - unsafe { - // FIXME(#5016) this shouldn't need to zero to be safe. - ptr::write(p, f(ptr::read_and_zero(p))); - } + for p in self.iter_mut() { + unsafe { + // FIXME(#5016) this shouldn't need to zero to be safe. + ptr::write(p, f(ptr::read_and_zero(p))); } } self diff --git a/src/test/bench/shootout-mandelbrot.rs b/src/test/bench/shootout-mandelbrot.rs index e84e6ac5699e..4a9c5a91dcf0 100644 --- a/src/test/bench/shootout-mandelbrot.rs +++ b/src/test/bench/shootout-mandelbrot.rs @@ -133,9 +133,7 @@ fn mandelbrot(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: uint, mut out: W) -> old_io::IoResult<()> { }).collect::>(); 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() diff --git a/src/test/bench/shootout-meteor.rs b/src/test/bench/shootout-meteor.rs index 209cc985383b..e6ef58cba35f 100644 --- a/src/test/bench/shootout-meteor.rs +++ b/src/test/bench/shootout-meteor.rs @@ -180,9 +180,7 @@ fn make_masks() -> Vec > > { // all unused piece can be placed on the board. fn is_board_unfeasible(board: u64, masks: &Vec>>) -> 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) -> Vec { let mut sol = repeat('.' as u8).take(50).collect::>(); 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; }