From 22854c75f34604a382790f8a751f6cc75d2f9364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marijan=20Petri=C4=8Devi=C4=87?= Date: Mon, 17 Feb 2025 07:06:56 +0100 Subject: [PATCH] refactor(tvix/castore): don't require Arc'd DirectoryService Since cl/12661 this doesn't need to be Arc'd. Change-Id: I3c14c45df7815867ddea6f461e81649772648962 Reviewed-on: https://cl.tvl.fyi/c/depot/+/13155 Tested-by: BuildkiteCI Reviewed-by: flokli --- tvix/castore/src/directoryservice/traverse.rs | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/tvix/castore/src/directoryservice/traverse.rs b/tvix/castore/src/directoryservice/traverse.rs index 0bd67e9bc..b2989783c 100644 --- a/tvix/castore/src/directoryservice/traverse.rs +++ b/tvix/castore/src/directoryservice/traverse.rs @@ -10,7 +10,7 @@ pub async fn descend_to( path: impl AsRef + std::fmt::Display, ) -> Result, Error> where - DS: AsRef, + DS: DirectoryService, { let mut parent_node = root_node; for component in path.as_ref().components_bytes() { @@ -22,17 +22,12 @@ where } Node::Directory { digest, .. } => { // fetch the linked node from the directory_service. - let directory = - directory_service - .as_ref() - .get(&digest) - .await? - .ok_or_else(|| { - // If we didn't get the directory node that's linked, that's a store inconsistency, bail out! - warn!("directory {} does not exist", digest); + let directory = directory_service.get(&digest).await?.ok_or_else(|| { + // If we didn't get the directory node that's linked, that's a store inconsistency, bail out! + warn!("directory {} does not exist", digest); - Error::StorageError(format!("directory {} does not exist", digest)) - })?; + Error::StorageError(format!("directory {} does not exist", digest)) + })?; // look for the component in the [Directory]. if let Some((_child_name, child_node)) = directory