clippy fixes

... some are still left, related to rust-lang/rust-clippy#5812
psarna · Jan 2, 2024 · 8d66466 · 8d66466
1 parent fbae239
commit 8d66466
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/libsql-server/src/connection/libsql.rs b/libsql-server/src/connection/libsql.rs
@@ -305,7 +305,7 @@ impl LibSqlConnection<libsql_sys::wal::Sqlite3Wal> {
             Arc::new([]),
             libsql_sys::wal::Sqlite3WalManager::new(),
             Default::default(),
-            MetaStoreHandle::new_test().into(),
+            MetaStoreHandle::new_test(),
             QueryBuilderConfig::default(),
             rcv,
             Default::default(),

diff --git a/libsql-server/src/namespace/fork.rs b/libsql-server/src/namespace/fork.rs
@@ -114,7 +114,7 @@ impl ForkTask<'_> {
                 // PrimaryNamespaceMaker::create ignores
                 // reset_cb param
                 Box::new(|_op| {}),
-                &self.meta_store,
+                self.meta_store,
             )
             .await
             .map_err(|e| ForkError::CreateNamespace(Box::new(e)))

diff --git a/libsql-server/src/namespace/meta_store.rs b/libsql-server/src/namespace/meta_store.rs
@@ -198,7 +198,7 @@ impl MetaStoreHandle {
 
         let config_path = db_path.as_ref().join("config.json");
 
-        let config = match fs::read(&config_path) {
+        let config = match fs::read(config_path) {
             Ok(data) => serde_json::from_slice(&data)?,
             Err(err) if err.kind() == io::ErrorKind::NotFound => DatabaseConfig::default(),
             Err(err) => return Err(Error::IOError(err)),

diff --git a/libsql-server/src/namespace/mod.rs b/libsql-server/src/namespace/mod.rs
@@ -136,6 +136,13 @@ impl<'de> Deserialize<'de> for NamespaceName {
             {
                 NamespaceName::from_string(v).map_err(|e| E::custom(e))
             }
+
+            fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
+            where
+                E: serde::de::Error,
+            {
+                NamespaceName::from_string(v.to_string()).map_err(|e| E::custom(e))
+            }
         }
 
         deserializer.deserialize_string(V)