maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/castore): add into_nodes(), implement consuming proto conv

Browse source 
Provide a into_nodes() function on a Directory, which consumes self and
returns owned PathComponent and Node.

Use it to provide a proper conversion from Directory to the proto
variant that doesn't clone.

There's no need for the one taking only &Directory, we don't use it
anywhere, and once someone needs that they might as well clone Directory
before converting it.

Update all other users of the `.nodes()` function to use `.into_nodes()`
where applicable, and avoid some more cloning there.

Change-Id: Id4577b9eb173c012e225337458898d3937112bcb
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12218
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: Connor Brewster <cbrewster@hey.com>
This commit is contained in:
Florian Klink 2024-08-16 18:12:39 +03:00 • committed by clbot
parent 5ec93b57e6
commit 21ceef4934
5 changed files with 24 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tvix/castore/src/fs/mod.rs
View file

@ -201,12 +201,12 @@ where
let mut inode_tracker = self.inode_tracker.write();
let children: Vec<(u64, PathComponent, Node)> = directory
.nodes()
.into_nodes()
.map(|(child_name, child_node)| {
let inode_data = InodeData::from_node(child_node);
let inode_data = InodeData::from_node(&child_node);
let child_ino = inode_tracker.put(inode_data);
(child_ino, child_name.to_owned(), child_node.clone())
(child_ino, child_name, child_node)
})
.collect();