From aa626fc1fddcaec4351d52eebd30b8d412b1c87e Mon Sep 17 00:00:00 2001 From: Billy Chan Date: Mon, 6 May 2024 13:53:41 +0800 Subject: [PATCH] clippy --- sea-orm-codegen/src/tests_cfg/mod.rs | 2 ++ src/executor/query.rs | 1 - src/tests_cfg/mod.rs | 2 ++ tests/active_enum_tests.rs | 2 ++ tests/basic.rs | 2 ++ tests/bits_tests.rs | 2 ++ tests/byte_primary_key_tests.rs | 2 ++ tests/collection_tests.rs | 2 ++ tests/connection_tests.rs | 7 ++----- tests/crud_tests.rs | 2 ++ tests/cursor_tests.rs | 7 ++----- tests/delete_by_id_tests.rs | 2 ++ tests/derive_iden_tests.rs | 2 ++ tests/dyn_table_name_tests.rs | 2 ++ tests/empty_insert_tests.rs | 2 ++ tests/enum_primary_key_tests.rs | 2 ++ tests/event_trigger_tests.rs | 2 ++ tests/execute_unprepared_tests.rs | 2 ++ tests/insert_default_tests.rs | 2 ++ tests/json_struct_tests.rs | 2 ++ tests/json_vec_tests.rs | 2 ++ tests/loader_tests.rs | 7 ++----- tests/parallel_tests.rs | 2 ++ tests/partial_model_tests.rs | 7 ++----- tests/pi_tests.rs | 7 ++----- tests/query_tests.rs | 2 ++ tests/relational_tests.rs | 7 ++----- tests/returning_tests.rs | 7 ++----- tests/self_join_tests.rs | 7 ++----- tests/sequential_op_tests.rs | 17 +++++++---------- tests/sql_err_tests.rs | 2 ++ tests/stream_tests.rs | 2 ++ tests/string_primary_key_tests.rs | 2 ++ tests/time_crate_tests.rs | 7 ++----- tests/timestamp_tests.rs | 2 ++ tests/transaction_tests.rs | 7 ++----- tests/type_tests.rs | 2 ++ tests/upsert_tests.rs | 2 ++ tests/uuid_fmt_tests.rs | 2 ++ tests/uuid_tests.rs | 2 ++ tests/value_type_tests.rs | 2 ++ 41 files changed, 85 insertions(+), 61 deletions(-) diff --git a/sea-orm-codegen/src/tests_cfg/mod.rs b/sea-orm-codegen/src/tests_cfg/mod.rs index 8032c760..5299b470 100644 --- a/sea-orm-codegen/src/tests_cfg/mod.rs +++ b/sea-orm-codegen/src/tests_cfg/mod.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod duplicated_many_to_many_paths; pub mod many_to_many; pub mod many_to_many_multiple; diff --git a/src/executor/query.rs b/src/executor/query.rs index 712e33f5..bd8f7a13 100644 --- a/src/executor/query.rs +++ b/src/executor/query.rs @@ -1298,7 +1298,6 @@ mod tests { use sea_query::Value; use super::*; - use crate::error::*; #[test] fn from_try_get_error() { diff --git a/src/tests_cfg/mod.rs b/src/tests_cfg/mod.rs index a83475eb..c1a610c7 100644 --- a/src/tests_cfg/mod.rs +++ b/src/tests_cfg/mod.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + //! Configurations for test cases and examples. Not intended for actual use. pub mod cake; diff --git a/tests/active_enum_tests.rs b/tests/active_enum_tests.rs index 45610eb0..443d358e 100644 --- a/tests/active_enum_tests.rs +++ b/tests/active_enum_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; use active_enum::Entity as ActiveEnumEntity; diff --git a/tests/basic.rs b/tests/basic.rs index 54a9f47c..e0a7449f 100644 --- a/tests/basic.rs +++ b/tests/basic.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; pub use sea_orm::{entity::*, error::*, query::*, sea_query, tests_cfg::*, Database, DbConn}; diff --git a/tests/bits_tests.rs b/tests/bits_tests.rs index 3ef12b9a..a2b52ee4 100644 --- a/tests/bits_tests.rs +++ b/tests/bits_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; use common::features::*; diff --git a/tests/byte_primary_key_tests.rs b/tests/byte_primary_key_tests.rs index 8fef3ff2..6c6d4466 100644 --- a/tests/byte_primary_key_tests.rs +++ b/tests/byte_primary_key_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{features::*, setup::*, TestContext}; diff --git a/tests/collection_tests.rs b/tests/collection_tests.rs index 8bd0eafb..0cf47288 100644 --- a/tests/collection_tests.rs +++ b/tests/collection_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{features::*, setup::*, TestContext}; diff --git a/tests/connection_tests.rs b/tests/connection_tests.rs index ac0a1527..0838086f 100644 --- a/tests/connection_tests.rs +++ b/tests/connection_tests.rs @@ -1,8 +1,5 @@ -#![cfg(any( - feature = "sqlx-mysql", - feature = "sqlx-sqlite", - feature = "sqlx-postgres" -))] +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{bakery_chain::*, setup::*, TestContext}; diff --git a/tests/crud_tests.rs b/tests/crud_tests.rs index 8f670810..48b73fcc 100644 --- a/tests/crud_tests.rs +++ b/tests/crud_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; mod crud; diff --git a/tests/cursor_tests.rs b/tests/cursor_tests.rs index 488818f8..91e81dd5 100644 --- a/tests/cursor_tests.rs +++ b/tests/cursor_tests.rs @@ -1,8 +1,5 @@ -#![cfg(any( - feature = "sqlx-mysql", - feature = "sqlx-sqlite", - feature = "sqlx-postgres" -))] +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{features::*, setup::*, TestContext}; diff --git a/tests/delete_by_id_tests.rs b/tests/delete_by_id_tests.rs index 0f8791cf..fa4d73f4 100644 --- a/tests/delete_by_id_tests.rs +++ b/tests/delete_by_id_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{features::*, setup::*, TestContext}; use sea_orm::{entity::prelude::*, DatabaseConnection, IntoActiveModel}; diff --git a/tests/derive_iden_tests.rs b/tests/derive_iden_tests.rs index 12dd6fe0..d345b8de 100644 --- a/tests/derive_iden_tests.rs +++ b/tests/derive_iden_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{features::*, setup::*, TestContext}; use sea_orm::entity::prelude::*; diff --git a/tests/dyn_table_name_tests.rs b/tests/dyn_table_name_tests.rs index 99cb2b22..7b451840 100644 --- a/tests/dyn_table_name_tests.rs +++ b/tests/dyn_table_name_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{features::*, setup::*, TestContext}; diff --git a/tests/empty_insert_tests.rs b/tests/empty_insert_tests.rs index abac775c..46642fa2 100644 --- a/tests/empty_insert_tests.rs +++ b/tests/empty_insert_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; mod crud; diff --git a/tests/enum_primary_key_tests.rs b/tests/enum_primary_key_tests.rs index b897c3ca..d958ecf5 100644 --- a/tests/enum_primary_key_tests.rs +++ b/tests/enum_primary_key_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{features::*, setup::*, TestContext}; diff --git a/tests/event_trigger_tests.rs b/tests/event_trigger_tests.rs index 2d8712c5..6b65c2d2 100644 --- a/tests/event_trigger_tests.rs +++ b/tests/event_trigger_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{ diff --git a/tests/execute_unprepared_tests.rs b/tests/execute_unprepared_tests.rs index 1f8aabb6..6e9862da 100644 --- a/tests/execute_unprepared_tests.rs +++ b/tests/execute_unprepared_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{features::*, setup::*, TestContext}; diff --git a/tests/insert_default_tests.rs b/tests/insert_default_tests.rs index a3959694..310f4338 100644 --- a/tests/insert_default_tests.rs +++ b/tests/insert_default_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{features::*, setup::*, TestContext}; diff --git a/tests/json_struct_tests.rs b/tests/json_struct_tests.rs index 6ba00f7f..8f49ce90 100644 --- a/tests/json_struct_tests.rs +++ b/tests/json_struct_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{features::*, setup::*, TestContext}; diff --git a/tests/json_vec_tests.rs b/tests/json_vec_tests.rs index d26e166b..13b233d6 100644 --- a/tests/json_vec_tests.rs +++ b/tests/json_vec_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{features::*, setup::*, TestContext}; diff --git a/tests/loader_tests.rs b/tests/loader_tests.rs index e11bb325..6e97727a 100644 --- a/tests/loader_tests.rs +++ b/tests/loader_tests.rs @@ -1,8 +1,5 @@ -#![cfg(any( - feature = "sqlx-mysql", - feature = "sqlx-sqlite", - feature = "sqlx-postgres" -))] +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{bakery_chain::*, setup::*, TestContext}; diff --git a/tests/parallel_tests.rs b/tests/parallel_tests.rs index c228c2b1..591f81b8 100644 --- a/tests/parallel_tests.rs +++ b/tests/parallel_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{features::*, setup::*, TestContext}; diff --git a/tests/partial_model_tests.rs b/tests/partial_model_tests.rs index f59747ba..fb4721ce 100644 --- a/tests/partial_model_tests.rs +++ b/tests/partial_model_tests.rs @@ -1,8 +1,5 @@ -#![cfg(any( - feature = "sqlx-mysql", - feature = "sqlx-sqlite", - feature = "sqlx-postgres" -))] +#![allow(unused_imports, dead_code)] + use entity::{Column, Entity}; use sea_orm::{ColumnTrait, DerivePartialModel, EntityTrait, FromQueryResult, ModelTrait}; use sea_query::Expr; diff --git a/tests/pi_tests.rs b/tests/pi_tests.rs index 299380c9..ccf35f3a 100644 --- a/tests/pi_tests.rs +++ b/tests/pi_tests.rs @@ -1,8 +1,5 @@ -#![cfg(any( - feature = "sqlx-mysql", - feature = "sqlx-sqlite", - feature = "sqlx-postgres" -))] +#![allow(unused_imports, dead_code)] + pub mod common; use common::{features::*, setup::*, TestContext}; diff --git a/tests/query_tests.rs b/tests/query_tests.rs index 28c6be4a..e6aa4a39 100644 --- a/tests/query_tests.rs +++ b/tests/query_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{bakery_chain::*, setup::*, TestContext}; diff --git a/tests/relational_tests.rs b/tests/relational_tests.rs index 8d22b1d9..29b041c7 100644 --- a/tests/relational_tests.rs +++ b/tests/relational_tests.rs @@ -1,8 +1,5 @@ -#![cfg(any( - feature = "sqlx-mysql", - feature = "sqlx-sqlite", - feature = "sqlx-postgres" -))] +#![allow(unused_imports, dead_code)] + pub mod common; pub use chrono::offset::Utc; diff --git a/tests/returning_tests.rs b/tests/returning_tests.rs index 536cba0b..0f7958a4 100644 --- a/tests/returning_tests.rs +++ b/tests/returning_tests.rs @@ -1,8 +1,5 @@ -#![cfg(any( - feature = "sqlx-mysql", - feature = "sqlx-sqlite", - feature = "sqlx-postgres" -))] +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{bakery_chain::*, setup::*, TestContext}; diff --git a/tests/self_join_tests.rs b/tests/self_join_tests.rs index 1191b63d..dd3fe904 100644 --- a/tests/self_join_tests.rs +++ b/tests/self_join_tests.rs @@ -1,8 +1,5 @@ -#![cfg(any( - feature = "sqlx-mysql", - feature = "sqlx-sqlite", - feature = "sqlx-postgres" -))] +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{features::*, setup::*, TestContext}; diff --git a/tests/sequential_op_tests.rs b/tests/sequential_op_tests.rs index c3adb9da..5b96139f 100644 --- a/tests/sequential_op_tests.rs +++ b/tests/sequential_op_tests.rs @@ -1,15 +1,12 @@ -#![cfg(any( - feature = "sqlx-mysql", - feature = "sqlx-sqlite", - feature = "sqlx-postgres" -))] +#![allow(unused_imports, dead_code)] + pub mod common; -pub use chrono::offset::Utc; -pub use common::{bakery_chain::*, setup::*, TestContext}; -pub use rust_decimal::prelude::*; -pub use sea_orm::{entity::*, query::*, DatabaseConnection, FromQueryResult}; -pub use uuid::Uuid; +use chrono::offset::Utc; +use common::{bakery_chain::*, setup::*, TestContext}; +use rust_decimal::prelude::*; +use sea_orm::{entity::*, query::*, DatabaseConnection, FromQueryResult}; +use uuid::Uuid; // Run the test locally: // DATABASE_URL="mysql://root:@localhost" cargo test --features sqlx-mysql,runtime-async-std --test sequential_op_tests diff --git a/tests/sql_err_tests.rs b/tests/sql_err_tests.rs index 5034b05d..8b346228 100644 --- a/tests/sql_err_tests.rs +++ b/tests/sql_err_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{bakery_chain::*, setup::*, TestContext}; pub use sea_orm::{ diff --git a/tests/stream_tests.rs b/tests/stream_tests.rs index e89fd6ac..4ec59cc6 100644 --- a/tests/stream_tests.rs +++ b/tests/stream_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{bakery_chain::*, setup::*, TestContext}; diff --git a/tests/string_primary_key_tests.rs b/tests/string_primary_key_tests.rs index c2de1350..60b8e1db 100644 --- a/tests/string_primary_key_tests.rs +++ b/tests/string_primary_key_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{features::*, setup::*, TestContext}; diff --git a/tests/time_crate_tests.rs b/tests/time_crate_tests.rs index f29e2c87..20116f24 100644 --- a/tests/time_crate_tests.rs +++ b/tests/time_crate_tests.rs @@ -1,8 +1,5 @@ -#![cfg(any( - feature = "sqlx-mysql", - feature = "sqlx-sqlite", - feature = "sqlx-postgres" -))] +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{features::*, setup::*, TestContext}; use pretty_assertions::assert_eq; diff --git a/tests/timestamp_tests.rs b/tests/timestamp_tests.rs index 6fa801e3..f2be8414 100644 --- a/tests/timestamp_tests.rs +++ b/tests/timestamp_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{features::*, setup::*, TestContext}; use pretty_assertions::assert_eq; diff --git a/tests/transaction_tests.rs b/tests/transaction_tests.rs index 00c5d7d2..1bddf9e2 100644 --- a/tests/transaction_tests.rs +++ b/tests/transaction_tests.rs @@ -1,8 +1,5 @@ -#![cfg(any( - feature = "sqlx-mysql", - feature = "sqlx-sqlite", - feature = "sqlx-postgres" -))] +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{bakery_chain::*, setup::*, TestContext}; diff --git a/tests/type_tests.rs b/tests/type_tests.rs index 0c936130..252f74a7 100644 --- a/tests/type_tests.rs +++ b/tests/type_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; use sea_orm::{IntoActiveValue, TryFromU64, TryGetable, Value}; diff --git a/tests/upsert_tests.rs b/tests/upsert_tests.rs index ff3e381f..4879e478 100644 --- a/tests/upsert_tests.rs +++ b/tests/upsert_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{features::*, setup::*, TestContext}; diff --git a/tests/uuid_fmt_tests.rs b/tests/uuid_fmt_tests.rs index 62b9b782..c5425f24 100644 --- a/tests/uuid_fmt_tests.rs +++ b/tests/uuid_fmt_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{features::*, setup::*, TestContext}; diff --git a/tests/uuid_tests.rs b/tests/uuid_tests.rs index e4ff1534..fddd1338 100644 --- a/tests/uuid_tests.rs +++ b/tests/uuid_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; pub use common::{features::*, setup::*, TestContext}; diff --git a/tests/value_type_tests.rs b/tests/value_type_tests.rs index 0e78092a..62e9632d 100644 --- a/tests/value_type_tests.rs +++ b/tests/value_type_tests.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports, dead_code)] + pub mod common; use std::sync::Arc;