From 21ceef4934b28a0c3a4f6faa2035021dfe8b3c3d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 16 Aug 2024 18:12:39 +0300 Subject: refactor(tvix/castore): add into_nodes(), implement consuming proto conv 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 Reviewed-by: Connor Brewster --- tvix/castore/src/fs/mod.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tvix/castore/src/fs') 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(); -- cgit 1.4.1