about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2023-06-17T10·20+0300
committerclbot <clbot@tvl.fyi>2023-06-19T14·29+0000
commit71093a513a37ee72dc7cbd55af0745e68e9ca265 (patch)
tree868717b46e0114c387f55af7e1aad030419594a4
parentb399dad0ffb9b97ce150b50425d5d97688399d3b (diff)
chore(tvix/store/blobsvc): clippy r/6331
Change-Id: Ie384bdd27e1e9282ceda83edc74ffaad387f352b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8810
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: flokli <flokli@flokli.de>
-rw-r--r--tvix/store/src/blobservice/from_addr.rs5
-rw-r--r--tvix/store/src/blobservice/sled.rs12
2 files changed, 7 insertions, 10 deletions
diff --git a/tvix/store/src/blobservice/from_addr.rs b/tvix/store/src/blobservice/from_addr.rs
index 914e590033bb..bef1a45a1c3c 100644
--- a/tvix/store/src/blobservice/from_addr.rs
+++ b/tvix/store/src/blobservice/from_addr.rs
@@ -12,9 +12,8 @@ use super::{BlobService, GRPCBlobService, MemoryBlobService, SledBlobService};
 ///
 /// See their [from_url] methods for more details about their syntax.
 pub fn from_addr(uri: &str) -> Result<Arc<dyn BlobService>, crate::Error> {
-    let url = Url::parse(uri).map_err(|e| {
-        crate::Error::StorageError(format!("unable to parse url: {}", e.to_string()))
-    })?;
+    let url = Url::parse(uri)
+        .map_err(|e| crate::Error::StorageError(format!("unable to parse url: {}", e)))?;
 
     Ok(if url.scheme() == "memory" {
         Arc::new(MemoryBlobService::from_url(&url)?)
diff --git a/tvix/store/src/blobservice/sled.rs b/tvix/store/src/blobservice/sled.rs
index 6b38a5e0ed81..2b8f9e7bbb13 100644
--- a/tvix/store/src/blobservice/sled.rs
+++ b/tvix/store/src/blobservice/sled.rs
@@ -47,14 +47,12 @@ impl BlobService for SledBlobService {
         // TODO: expose compression and other parameters as URL parameters, drop new and new_temporary?
         if url.path().is_empty() {
             Self::new_temporary().map_err(|e| Error::StorageError(e.to_string()))
+        } else if url.path() == "/" {
+            Err(crate::Error::StorageError(
+                "cowardly refusing to open / with sled".to_string(),
+            ))
         } else {
-            if url.path() == "/" {
-                Err(crate::Error::StorageError(
-                    "cowardly refusing to open / with sled".to_string(),
-                ))
-            } else {
-                Self::new(url.path().into()).map_err(|e| Error::StorageError(e.to_string()))
-            }
+            Self::new(url.path().into()).map_err(|e| Error::StorageError(e.to_string()))
         }
     }