bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #81306 - SkiFire13:fuse-flatten, r=cuviper

Browse source 
Fuse inner iterator in FlattenCompat and improve related tests

Fixes #81248
This commit is contained in:
Yuki Okushi 2021-01-29 09:17:36 +09:00 • committed by GitHub
commit 94e093ab97
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
library/core/src/iter/adapters/flatten.rs
View file

@ -265,7 +265,13 @@ where
}
}
match self.iter.next() {
None => return self.backiter.as_mut()?.next(),
None => match self.backiter.as_mut()?.next() {
None => {
self.backiter = None;
return None;
}
elt @ Some(_) => return elt,
},
Some(inner) => self.frontiter = Some(inner.into_iter()),
}
}
@ -353,7 +359,13 @@ where
}
}
match self.iter.next_back() {
None => return self.frontiter.as_mut()?.next_back(),
None => match self.frontiter.as_mut()?.next_back() {
None => {
self.frontiter = None;
return None;
}
elt @ Some(_) => return elt,
},
next => self.backiter = next.map(IntoIterator::into_iter),
}
}