From fcf11fac6274b9315cf26a49d3f07ffa421693b0 Mon Sep 17 00:00:00 2001
From: Goran Brkuljan <goran.brkuljan@gmail.com>
Date: Sat, 28 Dec 2024 10:02:29 +0100
Subject: [PATCH] lint: add lint for rendudant clones

---
 Cargo.toml                                 |  3 +++
 charybdis-macros/Cargo.toml                |  5 ++++-
 charybdis-migrate/Cargo.toml               |  3 +++
 charybdis-migrate/src/model/runner.rs      |  2 +-
 charybdis-parser/Cargo.toml                |  3 +++
 charybdis-parser/src/fields.rs             |  2 +-
 charybdis-parser/src/schema/code_schema.rs | 13 ++++---------
 charybdis-parser/src/schema/db_schema.rs   |  2 +-
 charybdis/Cargo.toml                       |  3 +++
 9 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 9bc9b04..93234bf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,3 +6,6 @@ members = [
     "charybdis-macros",
     "charybdis-parser",
 ]
+
+[workspace.lints.clippy]
+redundant_clone = "deny"
diff --git a/charybdis-macros/Cargo.toml b/charybdis-macros/Cargo.toml
index a62f9a0..6bba332 100644
--- a/charybdis-macros/Cargo.toml
+++ b/charybdis-macros/Cargo.toml
@@ -20,4 +20,7 @@ quote = "1.0.36"
 [dev-dependencies]
 charybdis = "0.7.2"
 scylla = "0.15.1"
-chrono = "0.4.38"
\ No newline at end of file
+chrono = "0.4.38"
+
+[lints]
+workspace = true
\ No newline at end of file
diff --git a/charybdis-migrate/Cargo.toml b/charybdis-migrate/Cargo.toml
index b63d848..73fe00c 100644
--- a/charybdis-migrate/Cargo.toml
+++ b/charybdis-migrate/Cargo.toml
@@ -25,3 +25,6 @@ path = "src/lib.rs"
 [[bin]]
 name = "migrate"
 path = "src/migrate.rs"
+
+[lints]
+workspace = true
\ No newline at end of file
diff --git a/charybdis-migrate/src/model/runner.rs b/charybdis-migrate/src/model/runner.rs
index 01a7f8e..6a2f446 100644
--- a/charybdis-migrate/src/model/runner.rs
+++ b/charybdis-migrate/src/model/runner.rs
@@ -343,7 +343,7 @@ impl<'a> ModelRunner<'a> {
                 return None;
             }
 
-            Some(alter_table_options.to_string())
+            Some(alter_table_options)
         } else {
             None
         }
diff --git a/charybdis-parser/Cargo.toml b/charybdis-parser/Cargo.toml
index 82daaab..60ccef1 100644
--- a/charybdis-parser/Cargo.toml
+++ b/charybdis-parser/Cargo.toml
@@ -20,3 +20,6 @@ walkdir = "2.5.0"
 darling = "0.20.8"
 strum = "0.26"
 strum_macros = "0.26"
+
+[lints]
+workspace = true
\ No newline at end of file
diff --git a/charybdis-parser/src/fields.rs b/charybdis-parser/src/fields.rs
index c358c6f..83c1067 100644
--- a/charybdis-parser/src/fields.rs
+++ b/charybdis-parser/src/fields.rs
@@ -111,7 +111,7 @@ impl<'a> Field<'a> {
 
                 Field {
                     name: ident.to_string(),
-                    ident: ident.clone(),
+                    ident,
                     ty: field.ty.clone(),
                     ty_path: match &field.ty {
                         Type::Path(type_path) => type_path.clone(),
diff --git a/charybdis-parser/src/schema/code_schema.rs b/charybdis-parser/src/schema/code_schema.rs
index 8bcdb3a..7caed17 100644
--- a/charybdis-parser/src/schema/code_schema.rs
+++ b/charybdis-parser/src/schema/code_schema.rs
@@ -80,9 +80,8 @@ impl CodeSchema {
         let schema_objects: Vec<SchemaObject> = parser::parse_charybdis_model_def(ast, ModelMacro::MaterializedView);
 
         schema_objects.into_iter().for_each(|schema_object| {
-            let table_name = schema_object.table_name.clone();
-
-            self.materialized_views.insert(table_name, schema_object);
+            self.materialized_views
+                .insert(schema_object.table_name.clone(), schema_object);
         });
     }
 
@@ -90,9 +89,7 @@ impl CodeSchema {
         let schema_objects: Vec<SchemaObject> = parser::parse_charybdis_model_def(ast, ModelMacro::Udt);
 
         schema_objects.into_iter().for_each(|schema_object| {
-            let type_name = schema_object.type_name.to_lowercase().clone();
-
-            self.udts.insert(type_name, schema_object);
+            self.udts.insert(schema_object.type_name.to_lowercase(), schema_object);
         });
     }
 
@@ -100,9 +97,7 @@ impl CodeSchema {
         let schema_object: Vec<SchemaObject> = parser::parse_charybdis_model_def(ast, ModelMacro::Table);
 
         schema_object.into_iter().for_each(|schema_object| {
-            let table_name = schema_object.table_name.clone();
-
-            self.tables.insert(table_name, schema_object);
+            self.tables.insert(schema_object.table_name.clone(), schema_object);
         });
     }
 }
diff --git a/charybdis-parser/src/schema/db_schema.rs b/charybdis-parser/src/schema/db_schema.rs
index 214f1c1..d14aeff 100644
--- a/charybdis-parser/src/schema/db_schema.rs
+++ b/charybdis-parser/src/schema/db_schema.rs
@@ -317,7 +317,7 @@ impl DbSchema {
         &mut self,
         view_name: &String,
         session: &Session,
-    ) -> Result<(), DbSchemaParserError> {
+    ) -> Result<(), crate::errors::DbSchemaParserError> {
         let cql = r#"
             SELECT column_name
             FROM system_schema.columns
diff --git a/charybdis/Cargo.toml b/charybdis/Cargo.toml
index 9f2ce48..dbaac4c 100644
--- a/charybdis/Cargo.toml
+++ b/charybdis/Cargo.toml
@@ -27,3 +27,6 @@ migrate = ["charybdis-migrate"]
 
 [dev-dependencies]
 tokio = "1.42.0"
+
+[lints]
+workspace = true