From f20969de9b42527518b27e3fb78b6d487780baff Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 4 Jan 2024 19:18:06 +0200
Subject: refactor(tvix/castore): relax trait bounds for DS

Make this an `AsRef<dyn DirectoryService>`.

This helps dropping some Clone requirements.

Unfortunately, we can't thread this through to TvixStoreIO just yet.

Change-Id: I3f07eb28d6c793d3313fe21506ada84d5a8aa3ac
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10533
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
---
 tvix/store/src/utils.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'tvix/store')

diff --git a/tvix/store/src/utils.rs b/tvix/store/src/utils.rs
index 05d4f79b1239..6edbf94eec33 100644
--- a/tvix/store/src/utils.rs
+++ b/tvix/store/src/utils.rs
@@ -54,7 +54,7 @@ pub async fn import_path<BS, DS, PS, P>(
 where
     P: AsRef<Path> + std::fmt::Debug,
     BS: Deref<Target = dyn BlobService> + Clone,
-    DS: Deref<Target = dyn DirectoryService> + Clone,
+    DS: Deref<Target = dyn DirectoryService>,
     PS: Deref<Target = dyn PathInfoService>,
 {
     // calculate the name
@@ -71,9 +71,10 @@ where
         })?;
 
     // Ingest the path into blob and directory service.
-    let root_node = tvix_castore::import::ingest_path(blob_service, directory_service, &path)
-        .await
-        .expect("failed to ingest path");
+    let root_node =
+        tvix_castore::import::ingest_path(blob_service, &directory_service.deref(), &path)
+            .await
+            .expect("failed to ingest path");
 
     debug!(root_node =?root_node, "import successful");
 
-- 
cgit 1.4.1