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

tree_builder: leverage BTreeMap::pop_last() now that we're on Rust 1.66+

Browse source
This commit is contained in:
Martin von Zweigbergk 2023-07-20 04:53:16 -07:00 committed by Martin von Zweigbergk
parent 1c3fe9a651
commit 07dca6ef6a
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/src/tree_builder.rs
View file

@ -17,8 +17,6 @@
use std::collections::BTreeMap;
use std::sync::Arc;
use itertools::Itertools as _;
use crate::backend;
use crate::backend::{TreeId, TreeValue};
use crate::repo_path::RepoPath;
@ -90,10 +88,7 @@ impl TreeBuilder {
// Write trees in reverse lexicographical order, starting with trees without
// children.
let store = &self.store;
// TODO: trees_to_write.pop_last() can be used, but requires Rust 1.66.0
let mut dirs_to_write = trees_to_write.keys().cloned().collect_vec();
while let Some(dir) = dirs_to_write.pop() {
let tree = trees_to_write.remove(&dir).unwrap();
while let Some((dir, tree)) = trees_to_write.pop_last() {
if let Some((parent, basename)) = dir.split() {
let parent_tree = trees_to_write.get_mut(&parent).unwrap();
if tree.is_empty() {
@ -108,7 +103,7 @@ impl TreeBuilder {
}
} else {
// We're writing the root tree. Write it even if empty. Return its id.
assert!(dirs_to_write.is_empty());
assert!(trees_to_write.is_empty());
return store.write_tree(&dir, tree).unwrap().id().clone();
}
}