diff options
author | Florian Klink <flokli@flokli.de> | 2024-08-16T15·12+0300 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2024-08-17T15·59+0000 |
commit | 21ceef4934b28a0c3a4f6faa2035021dfe8b3c3d (patch) | |
tree | 8133e2e8f0de0fd55494f3538257786aa2794c6c /tvix/castore/src/fs/mod.rs | |
parent | 5ec93b57e6a263eef91ee583aba9f04581e4a66b (diff) |
refactor(tvix/castore): add into_nodes(), implement consuming proto conv r/8507
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>
Diffstat (limited to 'tvix/castore/src/fs/mod.rs')
-rw-r--r-- | tvix/castore/src/fs/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tvix/castore/src/fs/mod.rs b/tvix/castore/src/fs/mod.rs index d196266ab438..e700a25d3966 100644 --- a/tvix/castore/src/fs/mod.rs +++ b/tvix/castore/src/fs/mod.rs @@ -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(); |