From 2d76c94dd077406d030a9b7058fb52f979db8bd2 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <japaricious@gmail.com>
Date: Tue, 27 Jan 2015 21:50:33 -0500
Subject: s/while let/for/g now that #21245 has been fixed

---
 src/libsyntax/fold.rs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/libsyntax')

diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs
index d739e5fe6a0..a1362f5382c 100644
--- a/src/libsyntax/fold.rs
+++ b/src/libsyntax/fold.rs
@@ -37,14 +37,10 @@ pub trait MoveMap<T> {
 
 impl<T> MoveMap<T> for Vec<T> {
     fn move_map<F>(mut self, mut f: F) -> Vec<T> 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
-- 
cgit 1.4.1-3-g733a5