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

revset: extract inner method that constructs IndexEntry iterator

Browse source
This commit is contained in:
Yuya Nishihara 2023-12-11 12:47:26 +09:00
parent 0b196010a7
commit e332d39375
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/src/default_revset_engine.rs
View file

@ -76,8 +76,12 @@ impl<'index> RevsetImpl<'index> {
}
}
fn entries(&self) -> Box<dyn Iterator<Item = IndexEntry<'index>> + '_> {
self.inner.iter()
}
pub fn iter_graph_impl(&self) -> RevsetGraphIterator<'_, 'index> {
RevsetGraphIterator::new(self.index, self.inner.iter())
RevsetGraphIterator::new(self.index, self.entries())
}
}
@ -91,13 +95,12 @@ impl fmt::Debug for RevsetImpl<'_> {
impl<'index> Revset<'index> for RevsetImpl<'index> {
fn iter(&self) -> Box<dyn Iterator<Item = CommitId> + '_> {
Box::new(self.inner.iter().map(|index_entry| index_entry.commit_id()))
Box::new(self.entries().map(|index_entry| index_entry.commit_id()))
}
fn commit_change_ids(&self) -> Box<dyn Iterator<Item = (CommitId, ChangeId)> + '_> {
Box::new(
self.inner
.iter()
self.entries()
.map(|index_entry| (index_entry.commit_id(), index_entry.change_id())),
)
}
@ -109,7 +112,7 @@ impl<'index> Revset<'index> for RevsetImpl<'index> {
fn change_id_index(&self) -> Box<dyn ChangeIdIndex + 'index> {
// TODO: Create a persistent lookup from change id to commit ids.
let mut pos_by_change = IdIndex::builder();
for entry in self.inner.iter() {
for entry in self.entries() {
pos_by_change.insert(&entry.change_id(), entry.position());
}
Box::new(ChangeIdIndexImpl {
@ -119,11 +122,11 @@ impl<'index> Revset<'index> for RevsetImpl<'index> {
}
fn is_empty(&self) -> bool {
self.iter().next().is_none()
self.entries().next().is_none()
}
fn count(&self) -> usize {
self.inner.iter().count()
self.entries().count()
}
}