cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-16 20:54:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

rewrite: replace use of "lift"ed function application with try_collect()

Browse Source 
Also removed redundant borrow + clone.
This commit is contained in:
Yuya Nishihara 2023-10-30 10:15:36 +09:00
parent b482898924
commit 2d3fe7eee2
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/src/rewrite.rs
View File

@ -17,7 +17,7 @@
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use std::sync::Arc; use std::sync::Arc;
use itertools::{process_results, Itertools}; use itertools::Itertools;
use tracing::instrument; use tracing::instrument;
use crate::backend::{BackendError, CommitId, ObjectId}; use crate::backend::{BackendError, CommitId, ObjectId};
@ -401,16 +401,13 @@ impl<'settings, 'repo> DescendantRebaser<'settings, 'repo> {
.mut_repo .mut_repo
.index() .index()
.heads(&mut new_parent_ids.iter()) .heads(&mut new_parent_ids.iter())
.iter() .into_iter()
.cloned()
.collect(); .collect();
let new_parents = process_results( let new_parents: Vec<_> = new_parent_ids
new_parent_ids .iter()
.iter() .filter(|new_parent| head_set.contains(new_parent))
.filter(|new_parent| head_set.contains(new_parent)) .map(|new_parent_id| self.mut_repo.store().get_commit(new_parent_id))
.map(|new_parent_id| self.mut_repo.store().get_commit(new_parent_id)), .try_collect()?;
|iter| iter.collect_vec(),
)?;
let new_commit = let new_commit =
rebase_commit(self.settings, self.mut_repo, &old_commit, &new_parents)?; rebase_commit(self.settings, self.mut_repo, &old_commit, &new_parents)?;
self.rebased self.rebased