diff options
Diffstat (limited to 'tvix/castore')
-rw-r--r-- | tvix/castore/src/blobservice/from_addr.rs | 3 | ||||
-rw-r--r-- | tvix/castore/src/blobservice/sled.rs | 4 | ||||
-rw-r--r-- | tvix/castore/src/directoryservice/from_addr.rs | 2 | ||||
-rw-r--r-- | tvix/castore/src/directoryservice/sled.rs | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/tvix/castore/src/blobservice/from_addr.rs b/tvix/castore/src/blobservice/from_addr.rs index 106edce04d1a..97e185464d3c 100644 --- a/tvix/castore/src/blobservice/from_addr.rs +++ b/tvix/castore/src/blobservice/from_addr.rs @@ -44,8 +44,7 @@ pub async fn from_addr(uri: &str) -> Result<Arc<dyn BlobService>, crate::Error> )); } return Ok(Arc::new( - SledBlobService::new(url.path().into()) - .map_err(|e| Error::StorageError(e.to_string()))?, + SledBlobService::new(url.path()).map_err(|e| Error::StorageError(e.to_string()))?, )); } else if url.scheme().starts_with("grpc+") { // schemes starting with grpc+ go to the GRPCPathInfoService. diff --git a/tvix/castore/src/blobservice/sled.rs b/tvix/castore/src/blobservice/sled.rs index a6fdbac499b0..f7bf33e8c50f 100644 --- a/tvix/castore/src/blobservice/sled.rs +++ b/tvix/castore/src/blobservice/sled.rs @@ -2,7 +2,7 @@ use super::{BlobReader, BlobService, BlobWriter}; use crate::{B3Digest, Error}; use std::{ io::{self, Cursor, Write}, - path::PathBuf, + path::Path, task::Poll, }; use tonic::async_trait; @@ -14,7 +14,7 @@ pub struct SledBlobService { } impl SledBlobService { - pub fn new(p: PathBuf) -> Result<Self, sled::Error> { + pub fn new<P: AsRef<Path>>(p: P) -> Result<Self, sled::Error> { let config = sled::Config::default() .use_compression(false) // is a required parameter .path(p); diff --git a/tvix/castore/src/directoryservice/from_addr.rs b/tvix/castore/src/directoryservice/from_addr.rs index 8f79fa6158cc..bd1bf584cf29 100644 --- a/tvix/castore/src/directoryservice/from_addr.rs +++ b/tvix/castore/src/directoryservice/from_addr.rs @@ -51,7 +51,7 @@ pub async fn from_addr(uri: &str) -> Result<Arc<dyn DirectoryService>, crate::Er )); } return Ok(Arc::new( - SledDirectoryService::new(url.path().into()) + SledDirectoryService::new(url.path()) .map_err(|e| Error::StorageError(e.to_string()))?, )); } else if url.scheme().starts_with("grpc+") { diff --git a/tvix/castore/src/directoryservice/sled.rs b/tvix/castore/src/directoryservice/sled.rs index 50e58e7e768c..9e6749a753c2 100644 --- a/tvix/castore/src/directoryservice/sled.rs +++ b/tvix/castore/src/directoryservice/sled.rs @@ -3,7 +3,7 @@ use crate::proto::Directory; use crate::{proto, B3Digest, Error}; use futures::Stream; use prost::Message; -use std::path::PathBuf; +use std::path::Path; use std::pin::Pin; use tonic::async_trait; use tracing::{instrument, warn}; @@ -17,7 +17,7 @@ pub struct SledDirectoryService { } impl SledDirectoryService { - pub fn new(p: PathBuf) -> Result<Self, sled::Error> { + pub fn new<P: AsRef<Path>>(p: P) -> Result<Self, sled::Error> { let config = sled::Config::default() .use_compression(false) // is a required parameter .path(p); |