about summary refs log tree commit diff
path: root/tvix/store/src
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2023-12-11T20·11+0200
committerclbot <clbot@tvl.fyi>2023-12-11T22·46+0000
commitccaf10b4a6f7768294e41fcb6fbcd768a1e1c143 (patch)
tree64e7ee1f57474e04d8854ed85f5255a6f8af99ea /tvix/store/src
parent9748543f1c3edd88e8b05f6a772d6e9be18a7be9 (diff)
refactor(tvix/*store/sled): make ::new() more generic r/7159
We don't really require the Path to be a PathBuf, we don't even require
it to be a Path, we only need it to be AsRef<Path>>.

This removes some conversion in the from_addr cases, which can just
reuse `url.path()` (a `&str`).

Change-Id: I38d536dbaf0b44421e41f211a9ad2b13605179e9
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10258
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/store/src')
-rw-r--r--tvix/store/src/pathinfoservice/from_addr.rs2
-rw-r--r--tvix/store/src/pathinfoservice/sled.rs6
2 files changed, 4 insertions, 4 deletions
diff --git a/tvix/store/src/pathinfoservice/from_addr.rs b/tvix/store/src/pathinfoservice/from_addr.rs
index 1505b3e427ee..35f2bd3730e3 100644
--- a/tvix/store/src/pathinfoservice/from_addr.rs
+++ b/tvix/store/src/pathinfoservice/from_addr.rs
@@ -63,7 +63,7 @@ pub async fn from_addr(
             ));
         }
         return Ok(Arc::new(
-            SledPathInfoService::new(url.path().into(), blob_service, directory_service)
+            SledPathInfoService::new(url.path(), blob_service, directory_service)
                 .map_err(|e| Error::StorageError(e.to_string()))?,
         ));
     } else if url.scheme() == "nix+http" || url.scheme() == "nix+https" {
diff --git a/tvix/store/src/pathinfoservice/sled.rs b/tvix/store/src/pathinfoservice/sled.rs
index 1382c3c29bfd..ff5ebee476b2 100644
--- a/tvix/store/src/pathinfoservice/sled.rs
+++ b/tvix/store/src/pathinfoservice/sled.rs
@@ -3,7 +3,7 @@ use crate::nar::calculate_size_and_sha256;
 use crate::proto::PathInfo;
 use futures::{stream::iter, Stream};
 use prost::Message;
-use std::{path::PathBuf, pin::Pin, sync::Arc};
+use std::{path::Path, pin::Pin, sync::Arc};
 use tonic::async_trait;
 use tracing::warn;
 use tvix_castore::proto as castorepb;
@@ -21,8 +21,8 @@ pub struct SledPathInfoService {
 }
 
 impl SledPathInfoService {
-    pub fn new(
-        p: PathBuf,
+    pub fn new<P: AsRef<Path>>(
+        p: P,
         blob_service: Arc<dyn BlobService>,
         directory_service: Arc<dyn DirectoryService>,
     ) -> Result<Self, sled::Error> {