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

4 files changed, 5 insertions, 16 deletions

diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs
index ffc4c5c6bac..9aa38e711e7 100644
--- a/src/libstd/ascii.rs
+++ b/src/libstd/ascii.rs
@@ -232,10 +232,7 @@ pub fn escape_default<F>(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 05677e1379d..992afb2d10f 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 b503b92b00f..6a43eccbaba 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 cc09cfd665c..53eba131674 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();