From f8f3d128fd93e8bf8eff4c0609038088715ac6b5 Mon Sep 17 00:00:00 2001
From: Billy Chan <ccw.billy.123@gmail.com>
Date: Wed, 30 Jun 2021 22:50:01 +0800
Subject: [PATCH] Fix clippy warming

---
 sea-orm-codegen/src/entity/column.rs      | 20 ++++++++++----------
 sea-orm-codegen/src/entity/transformer.rs |  2 +-
 src/database/connection.rs                |  4 ++--
 src/database/mod.rs                       |  6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/sea-orm-codegen/src/entity/column.rs b/sea-orm-codegen/src/entity/column.rs
index e8a0b543..e077c0a6 100644
--- a/sea-orm-codegen/src/entity/column.rs
+++ b/sea-orm-codegen/src/entity/column.rs
@@ -61,21 +61,21 @@ impl Column {
                 None => quote! { ColumnType::String(None).def() },
             },
             ColumnType::Text => quote! { ColumnType::Text.def() },
-            ColumnType::TinyInteger(s) => quote! { ColumnType::TinyInteger.def() },
-            ColumnType::SmallInteger(s) => quote! { ColumnType::SmallInteger.def() },
-            ColumnType::Integer(s) => quote! { ColumnType::Integer.def() },
-            ColumnType::BigInteger(s) => quote! { ColumnType::BigInteger.def() },
-            ColumnType::Float(s) => quote! { ColumnType::Float.def() },
-            ColumnType::Double(s) => quote! { ColumnType::Double.def() },
+            ColumnType::TinyInteger(_) => quote! { ColumnType::TinyInteger.def() },
+            ColumnType::SmallInteger(_) => quote! { ColumnType::SmallInteger.def() },
+            ColumnType::Integer(_) => quote! { ColumnType::Integer.def() },
+            ColumnType::BigInteger(_) => quote! { ColumnType::BigInteger.def() },
+            ColumnType::Float(_) => quote! { ColumnType::Float.def() },
+            ColumnType::Double(_) => quote! { ColumnType::Double.def() },
             ColumnType::Decimal(s) => match s {
                 Some((s1, s2)) => quote! { ColumnType::Decimal(Some((#s1, #s2))).def() },
                 None => quote! { ColumnType::Decimal(None).def() },
             },
-            ColumnType::DateTime(s) => quote! { ColumnType::DateTime.def() },
-            ColumnType::Timestamp(s) => quote! { ColumnType::Timestamp.def() },
-            ColumnType::Time(s) => quote! { ColumnType::Time.def() },
+            ColumnType::DateTime(_) => quote! { ColumnType::DateTime.def() },
+            ColumnType::Timestamp(_) => quote! { ColumnType::Timestamp.def() },
+            ColumnType::Time(_) => quote! { ColumnType::Time.def() },
             ColumnType::Date => quote! { ColumnType::Date.def() },
-            ColumnType::Binary(s) => quote! { ColumnType::Binary.def() },
+            ColumnType::Binary(_) => quote! { ColumnType::Binary.def() },
             ColumnType::Boolean => quote! { ColumnType::Boolean.def() },
             ColumnType::Money(s) => match s {
                 Some((s1, s2)) => quote! { ColumnType::Money(Some((#s1, #s2))).def() },
diff --git a/sea-orm-codegen/src/entity/transformer.rs b/sea-orm-codegen/src/entity/transformer.rs
index 02c7fb82..c49a871e 100644
--- a/sea-orm-codegen/src/entity/transformer.rs
+++ b/sea-orm-codegen/src/entity/transformer.rs
@@ -1,7 +1,7 @@
 use crate::{Column, Entity, EntityWriter, Error, PrimaryKey, Relation, RelationType};
 use sea_query::TableStatement;
 use sea_schema::mysql::def::Schema;
-use std::{collections::HashMap, mem::swap};
+use std::collections::HashMap;
 
 #[derive(Clone, Debug)]
 pub struct EntityTransformer {
diff --git a/src/database/connection.rs b/src/database/connection.rs
index 6336db48..58a5bba8 100644
--- a/src/database/connection.rs
+++ b/src/database/connection.rs
@@ -1,4 +1,4 @@
-use crate::{error::*, ExecResult, QueryResult, Statement, Transaction};
+use crate::{error::*, ExecResult, QueryResult, Statement};
 use sea_query::{
     MysqlQueryBuilder, PostgresQueryBuilder, QueryStatementBuilder, SchemaStatementBuilder,
     SqliteQueryBuilder,
@@ -127,7 +127,7 @@ impl DatabaseConnection {
     }
 
     #[cfg(feature = "mock")]
-    pub fn into_transaction_log(self) -> Vec<Transaction> {
+    pub fn into_transaction_log(self) -> Vec<crate::Transaction> {
         let mut mocker = self.as_mock_connection().get_mocker_mutex().lock().unwrap();
         mocker.drain_transaction_log()
     }
diff --git a/src/database/mod.rs b/src/database/mod.rs
index f461df3d..dd5fc5ea 100644
--- a/src/database/mod.rs
+++ b/src/database/mod.rs
@@ -19,15 +19,15 @@ impl Database {
     pub async fn connect(string: &str) -> Result<DatabaseConnection, DbErr> {
         #[cfg(feature = "sqlx-mysql")]
         if crate::SqlxMySqlConnector::accepts(string) {
-            return Ok(crate::SqlxMySqlConnector::connect(string).await?);
+            return crate::SqlxMySqlConnector::connect(string).await;
         }
         #[cfg(feature = "sqlx-sqlite")]
         if crate::SqlxSqliteConnector::accepts(string) {
-            return Ok(crate::SqlxSqliteConnector::connect(string).await?);
+            return crate::SqlxSqliteConnector::connect(string).await;
         }
         #[cfg(feature = "mock")]
         if crate::MockDatabaseConnector::accepts(string) {
-            return Ok(crate::MockDatabaseConnector::connect(string).await?);
+            return crate::MockDatabaseConnector::connect(string).await;
         }
         Err(DbErr::Conn)
     }