about summary refs log tree commit diff
path: root/tvix/castore/src/import.rs
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2024-01-04T17·18+0200
committerclbot <clbot@tvl.fyi>2024-01-05T16·43+0000
commitf20969de9b42527518b27e3fb78b6d487780baff (patch)
tree6e3c009731b68f6d8d6ba951017ce68139018f57 /tvix/castore/src/import.rs
parent3297843bf144d2f5abfe44a1858db37720e80054 (diff)
refactor(tvix/castore): relax trait bounds for DS r/7346
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>
Diffstat (limited to 'tvix/castore/src/import.rs')
-rw-r--r--tvix/castore/src/import.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/tvix/castore/src/import.rs b/tvix/castore/src/import.rs
index 1b8c4ec5a5..4545f35fc3 100644
--- a/tvix/castore/src/import.rs
+++ b/tvix/castore/src/import.rs
@@ -149,7 +149,7 @@ where
 /// It's up to the caller to possibly register it somewhere (and potentially
 /// rename it based on some naming scheme)
 #[instrument(skip(blob_service, directory_service), fields(path=?p), err)]
-pub async fn ingest_path<BS, DS, P>(
+pub async fn ingest_path<'a, BS, DS, P>(
     blob_service: BS,
     directory_service: DS,
     p: P,
@@ -157,7 +157,7 @@ pub async fn ingest_path<BS, DS, P>(
 where
     P: AsRef<Path> + Debug,
     BS: Deref<Target = dyn BlobService> + Clone,
-    DS: Deref<Target = dyn DirectoryService>,
+    DS: Deref<Target = &'a dyn DirectoryService>,
 {
     let mut directories: HashMap<PathBuf, Directory> = HashMap::default();