Fix clippy warnings - 1 (#967)

* Fix clippy warnings * cargo fmt * Fix clippy warnings * cargo fmt
SeaQL · Aug 12, 2022 · 43495de · 43495de
1 parent 0d94941
commit 43495de
Show file tree

Hide file tree

Showing 58 changed files with 107 additions and 85 deletions.
diff --git a/build-tools/rustclippy.sh b/build-tools/rustclippy.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+set -e
+if [ -d ./build-tools ]; then
+    targets=(
+        "Cargo.toml"
+        "sea-orm-cli/Cargo.toml"
+        "sea-orm-codegen/Cargo.toml"
+        "sea-orm-macros/Cargo.toml"
+        "sea-orm-migration/Cargo.toml"
+        "sea-orm-rocket/Cargo.toml"
+    )
+
+    for target in "${targets[@]}"; do
+        echo "cargo clippy --manifest-path ${target} --fix --allow-dirty --allow-staged"
+        cargo clippy --manifest-path "${target}" --fix --allow-dirty --allow-staged
+    done
+
+    examples=(`find examples -type f -name 'Cargo.toml'`)
+    for example in "${examples[@]}"; do
+        echo "cargo clippy --manifest-path ${example} --fix --allow-dirty --allow-staged"
+        cargo clippy --manifest-path "${example}" --fix --allow-dirty --allow-staged
+    done
+else
+    echo "Please execute this script from the repository root."
+fi
diff --git a/examples/actix3_example/entity/src/post.rs b/examples/actix3_example/entity/src/post.rs
@@ -1,7 +1,7 @@
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Deserialize, Serialize)]
+#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Deserialize, Serialize)]
 #[sea_orm(table_name = "posts")]
 pub struct Model {
     #[sea_orm(primary_key)]

diff --git a/examples/actix_example/entity/src/post.rs b/examples/actix_example/entity/src/post.rs
@@ -1,7 +1,7 @@
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Deserialize, Serialize)]
+#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Deserialize, Serialize)]
 #[sea_orm(table_name = "posts")]
 pub struct Model {
     #[sea_orm(primary_key)]

diff --git a/examples/axum_example/entity/src/post.rs b/examples/axum_example/entity/src/post.rs
@@ -3,7 +3,7 @@
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Deserialize)]
 #[sea_orm(table_name = "posts")]
 pub struct Model {
     #[sea_orm(primary_key)]

diff --git a/examples/basic/src/example_cake.rs b/examples/basic/src/example_cake.rs
@@ -1,6 +1,6 @@
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
+#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
 #[sea_orm(table_name = "cake")]
 pub struct Model {
     #[sea_orm(primary_key)]

diff --git a/examples/basic/src/example_cake_filling.rs b/examples/basic/src/example_cake_filling.rs
@@ -9,7 +9,7 @@ impl EntityName for Entity {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, DeriveModel, DeriveActiveModel)]
+#[derive(Clone, Debug, PartialEq, Eq, DeriveModel, DeriveActiveModel)]
 pub struct Model {
     pub cake_id: i32,
     pub filling_id: i32,

diff --git a/examples/basic/src/example_filling.rs b/examples/basic/src/example_filling.rs
@@ -9,7 +9,7 @@ impl EntityName for Entity {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, DeriveModel, DeriveActiveModel)]
+#[derive(Clone, Debug, PartialEq, Eq, DeriveModel, DeriveActiveModel)]
 pub struct Model {
     pub id: i32,
     pub name: String,

diff --git a/examples/basic/src/example_fruit.rs b/examples/basic/src/example_fruit.rs
@@ -9,7 +9,7 @@ impl EntityName for Entity {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, DeriveModel, DeriveActiveModel)]
+#[derive(Clone, Debug, PartialEq, Eq, DeriveModel, DeriveActiveModel)]
 pub struct Model {
     pub id: i32,
     pub name: String,

diff --git a/examples/basic/src/operation.rs b/examples/basic/src/operation.rs
@@ -71,7 +71,7 @@ mod form {
     use sea_orm::entity::prelude::*;
 
     #[derive(
-        Clone, Debug, PartialEq, DeriveModel, DeriveActiveModel, DeriveActiveModelBehavior,
+        Clone, Debug, PartialEq, Eq, DeriveModel, DeriveActiveModel, DeriveActiveModelBehavior,
     )]
     pub struct Model {
         pub id: i32,

diff --git a/examples/basic/src/select.rs b/examples/basic/src/select.rs
@@ -28,15 +28,15 @@ pub async fn all_about_select(db: &DbConn) -> Result<(), DbErr> {
 
     println!("===== =====\n");
 
-    find_all_stream(&db).await.unwrap();
+    find_all_stream(db).await.unwrap();
 
     println!("===== =====\n");
 
-    find_first_page(&db).await.unwrap();
+    find_first_page(db).await.unwrap();
 
     println!("===== =====\n");
 
-    find_num_pages(&db).await.unwrap();
+    find_num_pages(db).await.unwrap();
 
     Ok(())
 }
@@ -180,15 +180,15 @@ async fn find_many_to_many(db: &DbConn) -> Result<(), DbErr> {
 }
 
 async fn all_about_select_json(db: &DbConn) -> Result<(), DbErr> {
-    find_all_json(&db).await?;
+    find_all_json(db).await?;
 
     println!("===== =====\n");
 
-    find_together_json(&db).await?;
+    find_together_json(db).await?;
 
     println!("===== =====\n");
 
-    count_fruits_by_cake_json(&db).await?;
+    count_fruits_by_cake_json(db).await?;
 
     Ok(())
 }

diff --git a/examples/graphql_example/entity/src/note.rs b/examples/graphql_example/entity/src/note.rs
@@ -2,7 +2,7 @@ use async_graphql::*;
 use sea_orm::{entity::prelude::*, DeleteMany};
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Serialize, Deserialize, SimpleObject)]
+#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Deserialize, SimpleObject)]
 #[sea_orm(table_name = "notes")]
 #[graphql(concrete(name = "Note", params()))]
 pub struct Model {

diff --git a/examples/graphql_example/migration/src/main.rs b/examples/graphql_example/migration/src/main.rs
@@ -1,5 +1,4 @@
 use sea_orm_migration::prelude::*;
-use std::path::PathBuf;
 
 #[cfg(debug_assertions)]
 use dotenv::dotenv;

diff --git a/examples/jsonrpsee_example/entity/src/post.rs b/examples/jsonrpsee_example/entity/src/post.rs
@@ -1,7 +1,7 @@
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Deserialize, Serialize)]
+#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Deserialize, Serialize)]
 #[sea_orm(table_name = "posts")]
 pub struct Model {
     #[sea_orm(primary_key)]

diff --git a/examples/poem_example/entity/src/post.rs b/examples/poem_example/entity/src/post.rs
@@ -1,7 +1,7 @@
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Deserialize, Serialize)]
+#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Deserialize, Serialize)]
 #[sea_orm(table_name = "posts")]
 pub struct Model {
     #[sea_orm(primary_key)]

diff --git a/examples/rocket_example/entity/src/post.rs b/examples/rocket_example/entity/src/post.rs
@@ -1,7 +1,7 @@
 use rocket::serde::{Deserialize, Serialize};
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Deserialize, Serialize, FromForm)]
+#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Deserialize, Serialize, FromForm)]
 #[serde(crate = "rocket::serde")]
 #[sea_orm(table_name = "posts")]
 pub struct Model {

diff --git a/examples/salvo_example/entity/src/post.rs b/examples/salvo_example/entity/src/post.rs
@@ -1,7 +1,7 @@
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Deserialize, Serialize)]
+#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Deserialize, Serialize)]
 #[sea_orm(table_name = "posts")]
 pub struct Model {
     #[sea_orm(primary_key)]

diff --git a/examples/tonic_example/entity/src/post.rs b/examples/tonic_example/entity/src/post.rs
@@ -1,7 +1,7 @@
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Deserialize, Serialize)]
+#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Deserialize, Serialize)]
 #[sea_orm(table_name = "posts")]
 pub struct Model {
     #[sea_orm(primary_key)]

diff --git a/sea-orm-cli/src/cli.rs b/sea-orm-cli/src/cli.rs
@@ -10,7 +10,7 @@ pub struct Cli {
     pub command: Commands,
 }
 
-#[derive(Subcommand, PartialEq, Debug)]
+#[derive(Subcommand, PartialEq, Eq, Debug)]
 pub enum Commands {
     #[clap(about = "Codegen related commands")]
     #[clap(arg_required_else_help = true)]
@@ -35,7 +35,7 @@ pub enum Commands {
     },
 }
 
-#[derive(Subcommand, PartialEq, Debug)]
+#[derive(Subcommand, PartialEq, Eq, Debug)]
 pub enum MigrateSubcommands {
     #[clap(about = "Initialize migration directory")]
     Init,
@@ -81,7 +81,7 @@ pub enum MigrateSubcommands {
     },
 }
 
-#[derive(Subcommand, PartialEq, Debug)]
+#[derive(Subcommand, PartialEq, Eq, Debug)]
 pub enum GenerateSubcommands {
     #[clap(about = "Generate entity")]
     #[clap(arg_required_else_help = true)]
@@ -190,7 +190,7 @@ pub enum GenerateSubcommands {
     },
 }
 
-#[derive(ArgEnum, Copy, Clone, Debug, PartialEq)]
+#[derive(ArgEnum, Copy, Clone, Debug, PartialEq, Eq)]
 pub enum DateTimeCrate {
     Chrono,
     Time,

diff --git a/sea-orm-codegen/src/entity/writer.rs b/sea-orm-codegen/src/entity/writer.rs
@@ -21,7 +21,7 @@ pub struct OutputFile {
     pub content: String,
 }
 
-#[derive(PartialEq, Debug)]
+#[derive(PartialEq, Eq, Debug)]
 pub enum WithSerde {
     None,
     Serialize,

diff --git a/sea-orm-migration/src/migrator.rs b/sea-orm-migration/src/migrator.rs
@@ -12,7 +12,7 @@ use sea_schema::{mysql::MySql, postgres::Postgres, probe::SchemaProbe, sqlite::S
 
 use super::{seaql_migrations, MigrationTrait, SchemaManager};
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 /// Status of migration
 pub enum MigrationStatus {
     /// Not yet applied

diff --git a/sea-orm-migration/src/seaql_migrations.rs b/sea-orm-migration/src/seaql_migrations.rs
@@ -1,6 +1,6 @@
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
+#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
 #[sea_orm(table_name = "seaql_migrations")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]

diff --git a/sea-orm-migration/tests/migrator/m20220118_000003_seed_cake_table.rs b/sea-orm-migration/tests/migrator/m20220118_000003_seed_cake_table.rs
@@ -34,7 +34,7 @@ impl MigrationTrait for Migration {
 mod cake {
     use sea_orm_migration::sea_orm::entity::prelude::*;
 
-    #[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
+    #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
     #[sea_orm(table_name = "cake")]
     pub struct Model {
         #[sea_orm(primary_key)]

diff --git a/sea-orm-rocket/lib/src/config.rs b/sea-orm-rocket/lib/src/config.rs
@@ -47,7 +47,7 @@ use rocket::serde::{Deserialize, Serialize};
 /// For general information on configuration in Rocket, see [`rocket::config`].
 /// For higher-level details on configuring a database, see the [crate-level
 /// docs](crate#configuration).
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
 #[serde(crate = "rocket::serde")]
 pub struct Config {
     /// Database-specific connection and configuration URL.

diff --git a/src/database/db_connection.rs b/src/database/db_connection.rs
@@ -38,7 +38,7 @@ pub type DbConn = DatabaseConnection;
 
 /// The type of database backend for real world databases.
 /// This is enabled by feature flags as specified in the crate documentation
-#[derive(Debug, Copy, Clone, PartialEq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub enum DatabaseBackend {
     /// A MySQL backend
     MySql,

diff --git a/src/database/mock.rs b/src/database/mock.rs
@@ -349,7 +349,7 @@ mod tests {
     };
     use pretty_assertions::assert_eq;
 
-    #[derive(Debug, PartialEq)]
+    #[derive(Debug, PartialEq, Eq)]
     pub struct MyErr(String);
 
     impl std::error::Error for MyErr {}

diff --git a/src/entity/active_enum.rs b/src/entity/active_enum.rs
@@ -139,7 +139,7 @@ mod tests {
 
     #[test]
     fn active_enum_string() {
-        #[derive(Debug, PartialEq, EnumIter)]
+        #[derive(Debug, PartialEq, Eq, EnumIter)]
         pub enum Category {
             Big,
             Small,
@@ -176,7 +176,7 @@ mod tests {
             }
         }
 
-        #[derive(Debug, PartialEq, EnumIter, DeriveActiveEnum)]
+        #[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
         #[sea_orm(
             rs_type = "String",
             db_type = "String(Some(1))",
@@ -234,7 +234,7 @@ mod tests {
     fn active_enum_derive_signed_integers() {
         macro_rules! test_num_value_int {
             ($ident: ident, $rs_type: expr, $db_type: expr, $col_def: ident) => {
-                #[derive(Debug, PartialEq, EnumIter, DeriveActiveEnum)]
+                #[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
                 #[sea_orm(rs_type = $rs_type, db_type = $db_type)]
                 pub enum $ident {
                     #[sea_orm(num_value = -10)]
@@ -251,7 +251,7 @@ mod tests {
 
         macro_rules! test_fallback_int {
             ($ident: ident, $fallback_type: ident, $rs_type: expr, $db_type: expr, $col_def: ident) => {
-                #[derive(Debug, PartialEq, EnumIter, DeriveActiveEnum)]
+                #[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
                 #[sea_orm(rs_type = $rs_type, db_type = $db_type)]
                 #[repr(i32)]
                 pub enum $ident {
@@ -300,7 +300,7 @@ mod tests {
     fn active_enum_derive_unsigned_integers() {
         macro_rules! test_num_value_uint {
             ($ident: ident, $rs_type: expr, $db_type: expr, $col_def: ident) => {
-                #[derive(Debug, PartialEq, EnumIter, DeriveActiveEnum)]
+                #[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
                 #[sea_orm(rs_type = $rs_type, db_type = $db_type)]
                 pub enum $ident {
                     #[sea_orm(num_value = 1)]
@@ -315,7 +315,7 @@ mod tests {
 
         macro_rules! test_fallback_uint {
             ($ident: ident, $fallback_type: ident, $rs_type: expr, $db_type: expr, $col_def: ident) => {
-                #[derive(Debug, PartialEq, EnumIter, DeriveActiveEnum)]
+                #[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
                 #[sea_orm(rs_type = $rs_type, db_type = $db_type)]
                 #[repr($fallback_type)]
                 pub enum $ident {

diff --git a/src/entity/base_entity.rs b/src/entity/base_entity.rs
@@ -872,7 +872,7 @@ mod tests {
             use crate as sea_orm;
             use crate::entity::prelude::*;
 
-            #[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
+            #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
             #[sea_orm(table_name = "hello")]
             pub struct Model {
                 #[sea_orm(primary_key)]
@@ -898,7 +898,7 @@ mod tests {
             use crate as sea_orm;
             use crate::entity::prelude::*;
 
-            #[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
+            #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
             #[sea_orm(table_name = "hello", schema_name = "world")]
             pub struct Model {
                 #[sea_orm(primary_key)]