mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-24 15:43:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

revset: remove redundant type bound from RevWalkRevset

Browse source 
The "'index: 'a" bound can be removed by bypassing the Box<dyn> indirection
of self.iter().
This commit is contained in:
Yuya Nishihara 2023-04-01 17:59:47 +09:00
parent a58af4f19d
commit 2404dc8cd3
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/src/default_revset_engine.rs
View file

@ -216,16 +216,11 @@ impl<'index> ToPredicateFn<'index> for EagerRevset<'index> {
}
}
struct RevWalkRevset<'index, T>
where
// RevWalkRevset<'index> appears to be needed to assert 'index outlives 'a
// in to_predicate_fn<'a>(&'a self) -> Box<dyn 'a>.
T: Iterator<Item = IndexEntry<'index>>,
{
struct RevWalkRevset<T> {
walk: T,
}
impl<'index, T> InternalRevset<'index> for RevWalkRevset<'index, T>
impl<'index, T> InternalRevset<'index> for RevWalkRevset<T>
where
T: Iterator<Item = IndexEntry<'index>> + Clone,
{
@ -234,12 +229,12 @@ where
}
}
impl<'index, T> ToPredicateFn<'index> for RevWalkRevset<'index, T>
impl<'index, T> ToPredicateFn<'index> for RevWalkRevset<T>
where
T: Iterator<Item = IndexEntry<'index>> + Clone,
{
fn to_predicate_fn(&self) -> Box<dyn FnMut(&IndexEntry<'index>) -> bool + '_> {
predicate_fn_from_iter(self.iter())
predicate_fn_from_iter(self.walk.clone())
}
}