mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-08 21:55:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

revset: turn RevWalkRevset into generic wrapper of cloneable iterator

Browse source 
I failed to solve type puzzle for to_predicate_fn<'a>(&'a self) where
'repo: 'a, so struct RevWalkRevset<'repo, T> is bounded by T to consume
the lifetime parameter.
This commit is contained in:
Yuya Nishihara 2022-11-23 19:50:02 +09:00
parent bf5a00a3e5
commit e6229e6d77
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/src/revset.rs
View file

@ -32,7 +32,7 @@ use thiserror::Error;
use crate::backend::{BackendError, BackendResult, CommitId};
use crate::commit::Commit;
use crate::index::{HexPrefix, IndexEntry, PrefixResolution, RevWalk};
use crate::index::{HexPrefix, IndexEntry, PrefixResolution};
use crate::matchers::{EverythingMatcher, Matcher, PrefixMatcher};
use crate::op_store::WorkspaceId;
use crate::repo::RepoRef;
@ -1434,17 +1434,28 @@ impl<'repo> ToPredicateFn<'repo> for EagerRevset<'repo> {
}
}
struct RevWalkRevset<'repo> {
walk: RevWalk<'repo>,
struct RevWalkRevset<'repo, T>
where
// RevWalkRevset<'repo> appears to be needed to assert 'repo outlives 'a
// in to_predicate_fn<'a>(&'a self) -> Box<dyn 'a>.
T: Iterator<Item = IndexEntry<'repo>>,
{
walk: T,
}
impl<'repo> Revset<'repo> for RevWalkRevset<'repo> {
impl<'repo, T> Revset<'repo> for RevWalkRevset<'repo, T>
where
T: Iterator<Item = IndexEntry<'repo>> + Clone,
{
fn iter<'revset>(&'revset self) -> RevsetIterator<'revset, 'repo> {
RevsetIterator::new(Box::new(self.walk.clone()))
}
}
impl<'repo> ToPredicateFn<'repo> for RevWalkRevset<'repo> {
impl<'repo, T> ToPredicateFn<'repo> for RevWalkRevset<'repo, T>
where
T: Iterator<Item = IndexEntry<'repo>> + Clone,
{
fn to_predicate_fn(&self) -> Box<dyn FnMut(&IndexEntry<'repo>) -> bool + '_> {
self.iter().into_predicate_fn()
}