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

fix style nits

Browse source
This commit is contained in:
Andre Bogus 2017-01-17 13:18:16 +01:00
parent 6c940893e5
commit 27f76157aa
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libcore/iter/mod.rs
View file

@ -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
}
}