fix cargo clippy

nacos-group · Oct 21, 2024 · 9575a57 · 9575a57
1 parent ee94b25
commit 9575a57
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 33 deletions.
diff --git a/src/transfer/sqlite/dao/config.rs b/src/transfer/sqlite/dao/config.rs
@@ -161,16 +161,16 @@ impl<'a> ConfigDao<'a> {
         }
     }
 
-    pub fn execute(&self, sql: &str, args: &Vec<serde_json::Value>) -> anyhow::Result<usize> {
-        sqlite_execute(&self.conn, sql, args)
+    pub fn execute(&self, sql: &str, args: &[serde_json::Value]) -> anyhow::Result<usize> {
+        sqlite_execute(self.conn, sql, args)
     }
 
-    pub fn fetch(&self, sql: &str, args: &Vec<serde_json::Value>) -> anyhow::Result<Vec<ConfigDO>> {
-        sqlite_fetch(&self.conn, sql, args, ConfigDO::from_row)
+    pub fn fetch(&self, sql: &str, args: &[serde_json::Value]) -> anyhow::Result<Vec<ConfigDO>> {
+        sqlite_fetch(self.conn, sql, args, ConfigDO::from_row)
     }
 
-    pub fn fetch_count(&self, sql: &str, args: &Vec<serde_json::Value>) -> anyhow::Result<u64> {
-        sqlite_fetch_count(&self.conn, sql, args)
+    pub fn fetch_count(&self, sql: &str, args: &[serde_json::Value]) -> anyhow::Result<u64> {
+        sqlite_fetch_count(self.conn, sql, args)
     }
 
     pub fn insert(&self, record: &ConfigDO) -> anyhow::Result<usize> {

diff --git a/src/transfer/sqlite/dao/config_history.rs b/src/transfer/sqlite/dao/config_history.rs
@@ -184,20 +184,20 @@ impl<'a> ConfigHistoryDao<'a> {
         }
     }
 
-    pub fn execute(&self, sql: &str, args: &Vec<serde_json::Value>) -> anyhow::Result<usize> {
-        sqlite_execute(&self.conn, sql, args)
+    pub fn execute(&self, sql: &str, args: &[serde_json::Value]) -> anyhow::Result<usize> {
+        sqlite_execute(self.conn, sql, args)
     }
 
     pub fn fetch(
         &self,
         sql: &str,
-        args: &Vec<serde_json::Value>,
+        args: &[serde_json::Value],
     ) -> anyhow::Result<Vec<ConfigHistoryDO>> {
-        sqlite_fetch(&self.conn, sql, args, ConfigHistoryDO::from_row)
+        sqlite_fetch(self.conn, sql, args, ConfigHistoryDO::from_row)
     }
 
-    pub fn fetch_count(&self, sql: &str, args: &Vec<serde_json::Value>) -> anyhow::Result<u64> {
-        sqlite_fetch_count(&self.conn, sql, args)
+    pub fn fetch_count(&self, sql: &str, args: &[serde_json::Value]) -> anyhow::Result<u64> {
+        sqlite_fetch_count(self.conn, sql, args)
     }
 
     pub fn insert(&self, record: &ConfigHistoryDO) -> anyhow::Result<usize> {

diff --git a/src/transfer/sqlite/dao/mod.rs b/src/transfer/sqlite/dao/mod.rs
@@ -1,3 +1,4 @@
+#![allow(clippy::field_reassign_with_default)]
 pub mod config;
 pub mod config_history;
 pub mod tenant;

diff --git a/src/transfer/sqlite/dao/tenant.rs b/src/transfer/sqlite/dao/tenant.rs
@@ -135,16 +135,16 @@ impl<'a> TenantDao<'a> {
         }
     }
 
-    pub fn execute(&self, sql: &str, args: &Vec<serde_json::Value>) -> anyhow::Result<usize> {
-        sqlite_execute(&self.conn, sql, args)
+    pub fn execute(&self, sql: &str, args: &[serde_json::Value]) -> anyhow::Result<usize> {
+        sqlite_execute(self.conn, sql, args)
     }
 
-    pub fn fetch(&self, sql: &str, args: &Vec<serde_json::Value>) -> anyhow::Result<Vec<TenantDO>> {
-        sqlite_fetch(&self.conn, sql, args, TenantDO::from_row)
+    pub fn fetch(&self, sql: &str, args: &[serde_json::Value]) -> anyhow::Result<Vec<TenantDO>> {
+        sqlite_fetch(self.conn, sql, args, TenantDO::from_row)
     }
 
-    pub fn fetch_count(&self, sql: &str, args: &Vec<serde_json::Value>) -> anyhow::Result<u64> {
-        sqlite_fetch_count(&self.conn, sql, args)
+    pub fn fetch_count(&self, sql: &str, args: &[serde_json::Value]) -> anyhow::Result<u64> {
+        sqlite_fetch_count(self.conn, sql, args)
     }
 
     pub fn insert(&self, record: &TenantDO) -> anyhow::Result<usize> {

diff --git a/src/transfer/sqlite/dao/user.rs b/src/transfer/sqlite/dao/user.rs
@@ -169,16 +169,16 @@ impl<'a> UserDao<'a> {
         }
     }
 
-    pub fn execute(&self, sql: &str, args: &Vec<serde_json::Value>) -> anyhow::Result<usize> {
-        sqlite_execute(&self.conn, sql, args)
+    pub fn execute(&self, sql: &str, args: &[serde_json::Value]) -> anyhow::Result<usize> {
+        sqlite_execute(self.conn, sql, args)
     }
 
-    pub fn fetch(&self, sql: &str, args: &Vec<serde_json::Value>) -> anyhow::Result<Vec<UserDO>> {
-        sqlite_fetch(&self.conn, sql, args, UserDO::from_row)
+    pub fn fetch(&self, sql: &str, args: &[serde_json::Value]) -> anyhow::Result<Vec<UserDO>> {
+        sqlite_fetch(self.conn, sql, args, UserDO::from_row)
     }
 
-    pub fn fetch_count(&self, sql: &str, args: &Vec<serde_json::Value>) -> anyhow::Result<u64> {
-        sqlite_fetch_count(&self.conn, sql, args)
+    pub fn fetch_count(&self, sql: &str, args: &[serde_json::Value]) -> anyhow::Result<u64> {
+        sqlite_fetch_count(self.conn, sql, args)
     }
 
     pub fn insert(&self, record: &UserDO) -> anyhow::Result<usize> {

diff --git a/src/transfer/sqlite_to_data.rs b/src/transfer/sqlite_to_data.rs
@@ -63,8 +63,8 @@ fn apply_config(
     table_seq: &mut TableSeq,
     writer_actor: &Addr<TransferWriterActor>,
 ) -> anyhow::Result<()> {
-    let config_dao = ConfigDao::new(&conn);
-    let config_history_dao = ConfigHistoryDao::new(&conn);
+    let config_dao = ConfigDao::new(conn);
+    let config_history_dao = ConfigHistoryDao::new(conn);
     let config_param = ConfigParam::default();
     let mut count = 0;
     //query all config
@@ -120,11 +120,7 @@ fn build_config_record(
         }
     }
     let need_pull_current = if let Some(last_content) = &last_content {
-        if last_content == &current_current {
-            false
-        } else {
-            true
-        }
+        last_content != &current_current
     } else {
         true
     };
@@ -150,7 +146,7 @@ fn build_config_record(
 
 fn apply_tenant(conn: &Connection, writer_actor: &Addr<TransferWriterActor>) -> anyhow::Result<()> {
     let mut count = 0;
-    let tenant_dao = TenantDao::new(&conn);
+    let tenant_dao = TenantDao::new(conn);
     let param = TenantParam::default();
     for item in tenant_dao.query(&param)? {
         let key = if let Some(v) = &item.tenant_id {
@@ -178,7 +174,7 @@ fn apply_tenant(conn: &Connection, writer_actor: &Addr<TransferWriterActor>) ->
 
 fn apply_user(conn: &Connection, writer_actor: &Addr<TransferWriterActor>) -> anyhow::Result<()> {
     let mut count = 0;
-    let user_dao = UserDao::new(&conn);
+    let user_dao = UserDao::new(conn);
     let param = UserParam::default();
     for item in user_dao.query(&param)? {
         let key = if let Some(v) = &item.username {