mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-29 23:57:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

index: unify evaluate_revset() implementations

Browse source 
The lifetime is a bit tricky since CompositeIndex is a reference wrapper
whereas Index trait has no notion about ownership.
This commit is contained in:
Yuya Nishihara 2023-05-26 17:06:55 +09:00
parent b7b9b8c88e
commit f27ac22ba4
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/src/default_index_store.rs
View file

@ -721,8 +721,7 @@ impl Index for MutableIndexImpl {
expression: &ResolvedExpression,
store: &Arc<Store>,
) -> Result<Box<dyn Revset<'index> + 'index>, RevsetEvaluationError> {
let revset_impl = default_revset_engine::evaluate(expression, store, CompositeIndex(self))?;
Ok(Box::new(revset_impl))
CompositeIndex(self).evaluate_revset(expression, store)
}
}
@ -1039,6 +1038,15 @@ impl<'a> CompositeIndex<'a> {
}
candidate_positions
}
fn evaluate_revset(
&self,
expression: &ResolvedExpression,
store: &Arc<Store>,
) -> Result<Box<dyn Revset<'a> + 'a>, RevsetEvaluationError> {
let revset_impl = default_revset_engine::evaluate(expression, store, *self)?;
Ok(Box::new(revset_impl))
}
}
impl Index for CompositeIndex<'_> {
@ -1116,8 +1124,7 @@ impl Index for CompositeIndex<'_> {
expression: &ResolvedExpression,
store: &Arc<Store>,
) -> Result<Box<dyn Revset<'index> + 'index>, RevsetEvaluationError> {
let revset_impl = default_revset_engine::evaluate(expression, store, *self)?;
Ok(Box::new(revset_impl))
CompositeIndex::evaluate_revset(self, expression, store)
}
}
@ -2016,8 +2023,7 @@ impl Index for ReadonlyIndexImpl {
expression: &ResolvedExpression,
store: &Arc<Store>,
) -> Result<Box<dyn Revset<'index> + 'index>, RevsetEvaluationError> {
let revset_impl = default_revset_engine::evaluate(expression, store, CompositeIndex(self))?;
Ok(Box::new(revset_impl))
CompositeIndex(self).evaluate_revset(expression, store)
}
}