ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

revset: inline FilterRevsetIterator by using .filter()

Browse source
This commit is contained in:
Yuya Nishihara 2022-11-29 18:14:09 +09:00
parent 5b13c0b38f
commit fae3822422
1 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/src/revset.rs
View file

@ -1433,23 +1433,7 @@ struct FilterRevset<'revset, 'repo: 'revset> {
impl<'repo> Revset<'repo> for FilterRevset<'_, 'repo> {
fn iter<'revset>(&'revset self) -> RevsetIterator<'revset, 'repo> {
RevsetIterator::new(Box::new(FilterRevsetIterator {
iter: self.candidates.iter(),
predicate: self.predicate.as_ref(),
}))
}
}
struct FilterRevsetIterator<'revset, 'repo> {
iter: RevsetIterator<'revset, 'repo>,
predicate: &'revset dyn Fn(&IndexEntry<'repo>) -> bool,
}
impl<'revset, 'repo> Iterator for FilterRevsetIterator<'revset, 'repo> {
type Item = IndexEntry<'repo>;
fn next(&mut self) -> Option<Self::Item> {
self.iter.find(self.predicate)
RevsetIterator::new(Box::new(self.candidates.iter().filter(&self.predicate)))
}
}