mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-15 08:53:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

local_working_copy: remove unneeded boxing of diff stream

Browse source
This commit is contained in:
Yuya Nishihara 2024-12-02 15:31:59 +09:00
parent 05fc855185
commit 8f55680787
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/src/local_working_copy.rs
View file

@ -1545,20 +1545,18 @@ impl TreeState {
};
let mut changed_file_states = Vec::new();
let mut deleted_files = HashSet::new();
let mut diff_stream = Box::pin(
old_tree
.diff_stream(new_tree, matcher)
.map(|TreeDiffEntry { path, values }| async {
match values {
Ok((before, after)) => {
let result = materialize_tree_value(&self.store, &path, after).await;
(path, result.map(|value| (before, value)))
}
Err(err) => (path, Err(err)),
let mut diff_stream = old_tree
.diff_stream(new_tree, matcher)
.map(|TreeDiffEntry { path, values }| async {
match values {
Ok((before, after)) => {
let result = materialize_tree_value(&self.store, &path, after).await;
(path, result.map(|value| (before, value)))
}
})
.buffered(self.store.concurrency().max(1)),
);
Err(err) => (path, Err(err)),
}
})
.buffered(self.store.concurrency().max(1));
while let Some((path, data)) = diff_stream.next().await {
let (before, after) = data?;
if after.is_absent() {