diff options
Diffstat (limited to 'tvix/castore')
-rw-r--r-- | tvix/castore/src/import/archive.rs | 2 | ||||
-rw-r--r-- | tvix/castore/src/import/fs.rs | 2 | ||||
-rw-r--r-- | tvix/castore/src/import/mod.rs | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tvix/castore/src/import/archive.rs b/tvix/castore/src/import/archive.rs index fb8ef9a50b48..0d21481d40e7 100644 --- a/tvix/castore/src/import/archive.rs +++ b/tvix/castore/src/import/archive.rs @@ -84,7 +84,7 @@ pub async fn ingest_archive<BS, DS, R>( ) -> Result<Node, IngestionError<Error>> where BS: BlobService + Clone + 'static, - DS: AsRef<dyn DirectoryService>, + DS: DirectoryService, R: AsyncRead + Unpin, { // Since tarballs can have entries in any arbitrary order, we need to diff --git a/tvix/castore/src/import/fs.rs b/tvix/castore/src/import/fs.rs index b8cfac86f87c..9d3ecfe6ab7a 100644 --- a/tvix/castore/src/import/fs.rs +++ b/tvix/castore/src/import/fs.rs @@ -35,7 +35,7 @@ pub async fn ingest_path<BS, DS, P>( where P: AsRef<std::path::Path> + std::fmt::Debug, BS: BlobService + Clone, - DS: AsRef<dyn DirectoryService>, + DS: DirectoryService, { let iter = WalkDir::new(path.as_ref()) .follow_links(false) diff --git a/tvix/castore/src/import/mod.rs b/tvix/castore/src/import/mod.rs index 53ebc2b339c7..7b42644a2779 100644 --- a/tvix/castore/src/import/mod.rs +++ b/tvix/castore/src/import/mod.rs @@ -49,7 +49,7 @@ pub async fn ingest_entries<DS, S, E>( mut entries: S, ) -> Result<Node, IngestionError<E>> where - DS: AsRef<dyn DirectoryService>, + DS: DirectoryService, S: Stream<Item = Result<IngestionEntry, E>> + Send + std::marker::Unpin, E: std::error::Error, { @@ -90,7 +90,7 @@ where // If we don't have one yet (as that's the first one to upload), // initialize the putter. maybe_directory_putter - .get_or_insert_with(|| directory_service.as_ref().put_multiple_start()) + .get_or_insert_with(|| directory_service.put_multiple_start()) .put(directory) .await .map_err(|e| { |