From b10f008b03f44192cb37cbd6cf1e55b6d03b80fa Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 17 Jun 2023 13:20:41 +0300 Subject: [PATCH] chore(tvix/store/directorysvc): clippy Change-Id: Idf45aaa0f6211ac35a9a41d0f3f60dfbe1009398 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8811 Autosubmit: flokli Tested-by: BuildkiteCI Reviewed-by: tazjin --- tvix/store/src/directoryservice/from_addr.rs | 5 ++--- tvix/store/src/directoryservice/sled.rs | 12 +++++------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/tvix/store/src/directoryservice/from_addr.rs b/tvix/store/src/directoryservice/from_addr.rs index a3e2521e9..776cf0610 100644 --- a/tvix/store/src/directoryservice/from_addr.rs +++ b/tvix/store/src/directoryservice/from_addr.rs @@ -18,9 +18,8 @@ use super::{DirectoryService, GRPCDirectoryService, MemoryDirectoryService, Sled /// - `grpc+http://host:port`, `grpc+https://host:port` /// Connects to a (remote) tvix-store gRPC service. pub fn from_addr(uri: &str) -> Result, 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(MemoryDirectoryService::from_url(&url)?) diff --git a/tvix/store/src/directoryservice/sled.rs b/tvix/store/src/directoryservice/sled.rs index 6dc09ed64..e741434ea 100644 --- a/tvix/store/src/directoryservice/sled.rs +++ b/tvix/store/src/directoryservice/sled.rs @@ -49,14 +49,12 @@ impl DirectoryService for SledDirectoryService { // 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())) } }