diff options
author | Florian Klink <flokli@flokli.de> | 2024-01-04T17·18+0200 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2024-01-05T16·43+0000 |
commit | f20969de9b42527518b27e3fb78b6d487780baff (patch) | |
tree | 6e3c009731b68f6d8d6ba951017ce68139018f57 /tvix/store/src/utils.rs | |
parent | 3297843bf144d2f5abfe44a1858db37720e80054 (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/store/src/utils.rs')
-rw-r--r-- | tvix/store/src/utils.rs | 9 |
1 files changed, 5 insertions, 4 deletions
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"); |