From 27f76157aafbac691e625b5d1b8b37330ec04552 Mon Sep 17 00:00:00 2001
From: Andre Bogus <bogusandre@gmail.com>
Date: Tue, 17 Jan 2017 13:18:16 +0100
Subject: [PATCH] fix style nits

---
 src/libcore/iter/mod.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/libcore/iter/mod.rs b/src/libcore/iter/mod.rs
index 5dce60b79c99..ea98265ef8de 100644
--- a/src/libcore/iter/mod.rs
+++ b/src/libcore/iter/mod.rs
@@ -1086,7 +1086,7 @@ impl<I: Iterator, P> Iterator for Filter<I, P> where P: FnMut(&I::Item) -> bool
 
     #[inline]
     fn next(&mut self) -> Option<I::Item> {
-        for x in self.iter.by_ref() {
+        for x in &mut self.iter {
             if (self.predicate)(&x) {
                 return Some(x);
             }
@@ -1101,13 +1101,12 @@ impl<I: Iterator, P> Iterator for Filter<I, P> where P: FnMut(&I::Item) -> bool
     }
 
     #[inline]
-    fn count(self) -> usize {
-        let (mut c, mut predicate, mut iter) = (0, self.predicate, self.iter);
-        for x in iter.by_ref() {
-            // branchless count
-            c += (&mut predicate)(&x) as usize;
+    fn count(mut self) -> usize {
+        let mut count = 0;
+        for x in &mut self.iter {
+            count += (self.predicate)(&x) as usize;
         }
-        c
+        count
     }
 }