From 4e3a45c2f795404e4c8325008f082c4d70522649 Mon Sep 17 00:00:00 2001 From: Billy Chan Date: Tue, 31 Jan 2023 15:52:57 +0800 Subject: [PATCH] Fix clippy warnings (#1436) --- examples/actix3_example/api/src/lib.rs | 8 ++--- examples/actix_example/api/src/lib.rs | 8 ++--- examples/axum_example/api/src/lib.rs | 8 ++--- examples/basic/src/main.rs | 2 +- examples/basic/src/operation.rs | 12 +++---- examples/basic/src/select.rs | 32 +++++++++---------- .../graphql_example/migration/src/main.rs | 4 +-- examples/jsonrpsee_example/api/src/lib.rs | 4 +-- examples/poem_example/api/src/lib.rs | 8 ++--- examples/rocket_example/api/src/lib.rs | 2 +- examples/rocket_okapi_example/api/src/lib.rs | 7 ++-- examples/salvo_example/api/src/lib.rs | 6 ++-- examples/tonic_example/api/src/lib.rs | 2 +- examples/tonic_example/src/client.rs | 2 +- tests/enum_primary_key_tests.rs | 3 -- tests/uuid_fmt_tests.rs | 2 +- 16 files changed, 53 insertions(+), 57 deletions(-) diff --git a/examples/actix3_example/api/src/lib.rs b/examples/actix3_example/api/src/lib.rs index e35d88d2..32f6f5f5 100644 --- a/examples/actix3_example/api/src/lib.rs +++ b/examples/actix3_example/api/src/lib.rs @@ -109,7 +109,7 @@ async fn edit(data: web::Data, id: web::Path) -> Result std::io::Result<()> { let db_url = env::var("DATABASE_URL").expect("DATABASE_URL is not set in .env file"); let host = env::var("HOST").expect("HOST is not set in .env file"); let port = env::var("PORT").expect("PORT is not set in .env file"); - let server_url = format!("{}:{}", host, port); + let server_url = format!("{host}:{port}"); // create post table if not exists let conn = Database::connect(&db_url).await.unwrap(); @@ -195,7 +195,7 @@ async fn start() -> std::io::Result<()> { None => server.bind(&server_url)?, }; - println!("Starting server at {}", server_url); + println!("Starting server at {server_url}"); server.run().await?; Ok(()) @@ -214,6 +214,6 @@ pub fn main() { let result = start(); if let Some(err) = result.err() { - println!("Error: {}", err) + println!("Error: {err}") } } diff --git a/examples/actix_example/api/src/lib.rs b/examples/actix_example/api/src/lib.rs index 64a909a9..83cfa17f 100644 --- a/examples/actix_example/api/src/lib.rs +++ b/examples/actix_example/api/src/lib.rs @@ -98,7 +98,7 @@ async fn edit(data: web::Data, id: web::Path) -> Result std::io::Result<()> { let db_url = env::var("DATABASE_URL").expect("DATABASE_URL is not set in .env file"); let host = env::var("HOST").expect("HOST is not set in .env file"); let port = env::var("PORT").expect("PORT is not set in .env file"); - let server_url = format!("{}:{}", host, port); + let server_url = format!("{host}:{port}"); // establish connection to database and apply migrations // -> create post table if not exists @@ -191,7 +191,7 @@ async fn start() -> std::io::Result<()> { None => server.bind(&server_url)?, }; - println!("Starting server at {}", server_url); + println!("Starting server at {server_url}"); server.run().await?; Ok(()) @@ -210,6 +210,6 @@ pub fn main() { let result = start(); if let Some(err) = result.err() { - println!("Error: {}", err); + println!("Error: {err}"); } } diff --git a/examples/axum_example/api/src/lib.rs b/examples/axum_example/api/src/lib.rs index ea4cd2c9..a77a14b7 100644 --- a/examples/axum_example/api/src/lib.rs +++ b/examples/axum_example/api/src/lib.rs @@ -30,7 +30,7 @@ async fn start() -> anyhow::Result<()> { let db_url = env::var("DATABASE_URL").expect("DATABASE_URL is not set in .env file"); let host = env::var("HOST").expect("HOST is not set in .env file"); let port = env::var("PORT").expect("PORT is not set in .env file"); - let server_url = format!("{}:{}", host, port); + let server_url = format!("{host}:{port}"); let conn = Database::connect(db_url) .await @@ -56,7 +56,7 @@ async fn start() -> anyhow::Result<()> { .handle_error(|error: std::io::Error| async move { ( StatusCode::INTERNAL_SERVER_ERROR, - format!("Unhandled internal error: {}", error), + format!("Unhandled internal error: {error}"), ) }), ) @@ -153,7 +153,7 @@ async fn edit_post( let post: post::Model = QueryCore::find_post_by_id(&state.conn, id) .await .expect("could not find post") - .unwrap_or_else(|| panic!("could not find post with id {}", id)); + .unwrap_or_else(|| panic!("could not find post with id {id}")); let mut ctx = tera::Context::new(); ctx.insert("post", &post); @@ -207,6 +207,6 @@ pub fn main() { let result = start(); if let Some(err) = result.err() { - println!("Error: {}", err); + println!("Error: {err}"); } } diff --git a/examples/basic/src/main.rs b/examples/basic/src/main.rs index 5db015f2..ca2aee11 100644 --- a/examples/basic/src/main.rs +++ b/examples/basic/src/main.rs @@ -22,7 +22,7 @@ async fn main() { .await .unwrap(); - println!("{:?}\n", db); + println!("{db:?}\n"); println!("===== =====\n"); diff --git a/examples/basic/src/operation.rs b/examples/basic/src/operation.rs index cc4aee4a..55558e65 100644 --- a/examples/basic/src/operation.rs +++ b/examples/basic/src/operation.rs @@ -28,7 +28,7 @@ pub async fn insert_and_update(db: &DbConn) -> Result<(), DbErr> { let pear: Option = Fruit::find_by_id(res.last_insert_id).one(db).await?; println!(); - println!("Pear: {:?}\n", pear); + println!("Pear: {pear:?}\n"); let mut pear: fruit::ActiveModel = pear.unwrap().into(); pear.name = Set("Sweet pear".to_owned()); @@ -36,7 +36,7 @@ pub async fn insert_and_update(db: &DbConn) -> Result<(), DbErr> { let pear: fruit::Model = pear.update(db).await?; println!(); - println!("Updated: {:?}\n", pear); + println!("Updated: {pear:?}\n"); Ok(()) } @@ -49,19 +49,19 @@ pub async fn save_active_model(db: &DbConn) -> Result<(), DbErr> { let mut banana: fruit::ActiveModel = banana.save(db).await?; println!(); - println!("Inserted: {:?}\n", banana); + println!("Inserted: {banana:?}\n"); banana.name = Set("Banana Mongo".to_owned()); let banana: fruit::ActiveModel = banana.save(db).await?; println!(); - println!("Updated: {:?}\n", banana); + println!("Updated: {banana:?}\n"); let result = banana.delete(db).await?; println!(); - println!("Deleted: {:?}\n", result); + println!("Deleted: {result:?}\n"); Ok(()) } @@ -85,7 +85,7 @@ async fn save_custom_active_model(db: &DbConn) -> Result<(), DbErr> { let pineapple = pineapple.save(db).await?; println!(); - println!("Saved: {:?}\n", pineapple); + println!("Saved: {pineapple:?}\n"); Ok(()) } diff --git a/examples/basic/src/select.rs b/examples/basic/src/select.rs index 947a2511..220920ce 100644 --- a/examples/basic/src/select.rs +++ b/examples/basic/src/select.rs @@ -48,7 +48,7 @@ async fn find_all(db: &DbConn) -> Result<(), DbErr> { println!(); for cc in cakes.iter() { - println!("{:?}\n", cc); + println!("{cc:?}\n"); } print!("find all fruits: "); @@ -57,7 +57,7 @@ async fn find_all(db: &DbConn) -> Result<(), DbErr> { println!(); for ff in fruits.iter() { - println!("{:?}\n", ff); + println!("{ff:?}\n"); } Ok(()) @@ -71,7 +71,7 @@ async fn find_together(db: &DbConn) -> Result<(), DbErr> { println!(); for bb in both.iter() { - println!("{:?}\n", bb); + println!("{bb:?}\n"); } Ok(()) @@ -90,7 +90,7 @@ async fn find_one(db: &DbConn) -> Result<(), DbErr> { let cheese = cheese.unwrap(); println!(); - println!("{:?}", cheese); + println!("{cheese:?}"); println!(); print!("find one by name: "); @@ -98,7 +98,7 @@ async fn find_one(db: &DbConn) -> Result<(), DbErr> { let chocolate = Cake::find_by_name("chocolate").one(db).await?; println!(); - println!("{:?}", chocolate); + println!("{chocolate:?}"); println!(); print!("find models belong to: "); @@ -107,7 +107,7 @@ async fn find_one(db: &DbConn) -> Result<(), DbErr> { println!(); for ff in fruits.iter() { - println!("{:?}\n", ff); + println!("{ff:?}\n"); } Ok(()) @@ -133,7 +133,7 @@ async fn count_fruits_by_cake(db: &DbConn) -> Result<(), DbErr> { println!(); for rr in results.iter() { - println!("{:?}\n", rr); + println!("{rr:?}\n"); } Ok(()) @@ -147,7 +147,7 @@ async fn find_many_to_many(db: &DbConn) -> Result<(), DbErr> { println!(); for bb in both.iter() { - println!("{:?}\n", bb); + println!("{bb:?}\n"); } print!("find fillings for cheese cake: "); @@ -159,7 +159,7 @@ async fn find_many_to_many(db: &DbConn) -> Result<(), DbErr> { println!(); for ff in fillings.iter() { - println!("{:?}\n", ff); + println!("{ff:?}\n"); } } @@ -172,7 +172,7 @@ async fn find_many_to_many(db: &DbConn) -> Result<(), DbErr> { println!(); for cc in cakes.iter() { - println!("{:?}\n", cc); + println!("{cc:?}\n"); } } @@ -253,7 +253,7 @@ async fn find_all_stream(db: &DbConn) -> Result<(), DbErr> { let mut cake_paginator = cake::Entity::find().paginate(db, 2); while let Some(cake_res) = cake_paginator.fetch_and_next().await? { for cake in cake_res { - println!("{:?}", cake); + println!("{cake:?}"); } } @@ -262,7 +262,7 @@ async fn find_all_stream(db: &DbConn) -> Result<(), DbErr> { let mut fruit_paginator = fruit::Entity::find().paginate(db, 2); while let Some(fruit_res) = fruit_paginator.fetch_and_next().await? { for fruit in fruit_res { - println!("{:?}", fruit); + println!("{fruit:?}"); } } @@ -271,7 +271,7 @@ async fn find_all_stream(db: &DbConn) -> Result<(), DbErr> { let mut fruit_stream = fruit::Entity::find().paginate(db, 2).into_stream(); while let Some(fruits) = fruit_stream.try_next().await? { for fruit in fruits { - println!("{:?}", fruit); + println!("{fruit:?}"); } sleep(Duration::from_millis(250)).await; } @@ -284,7 +284,7 @@ async fn find_all_stream(db: &DbConn) -> Result<(), DbErr> { .into_stream(); while let Some(jsons) = json_stream.try_next().await? { for json in jsons { - println!("{:?}", json); + println!("{json:?}"); } sleep(Duration::from_millis(250)).await; } @@ -296,7 +296,7 @@ async fn find_first_page(db: &DbConn) -> Result<(), DbErr> { println!("fruits first page: "); let page = fruit::Entity::find().paginate(db, 2).fetch_page(0).await?; for fruit in page { - println!("{:?}", fruit); + println!("{fruit:?}"); } Ok(()) @@ -305,7 +305,7 @@ async fn find_first_page(db: &DbConn) -> Result<(), DbErr> { async fn find_num_pages(db: &DbConn) -> Result<(), DbErr> { println!("fruits number of page: "); let num_pages = fruit::Entity::find().paginate(db, 2).num_pages().await?; - println!("{:?}", num_pages); + println!("{num_pages:?}"); Ok(()) } diff --git a/examples/graphql_example/migration/src/main.rs b/examples/graphql_example/migration/src/main.rs index 8678e0ad..89075f81 100644 --- a/examples/graphql_example/migration/src/main.rs +++ b/examples/graphql_example/migration/src/main.rs @@ -12,11 +12,11 @@ async fn main() { match std::env::var("DATABASE_URL") { Ok(val) => { - println!("Using DATABASE_URL: {}", val); + println!("Using DATABASE_URL: {val}"); } Err(_) => { std::env::set_var("DATABASE_URL", fallback); - println!("Set DATABASE_URL: {}", fallback); + println!("Set DATABASE_URL: {fallback}"); } }; diff --git a/examples/jsonrpsee_example/api/src/lib.rs b/examples/jsonrpsee_example/api/src/lib.rs index 584c5065..5eace0d1 100644 --- a/examples/jsonrpsee_example/api/src/lib.rs +++ b/examples/jsonrpsee_example/api/src/lib.rs @@ -106,7 +106,7 @@ async fn start() -> std::io::Result<()> { let db_url = env::var("DATABASE_URL").expect("DATABASE_URL is not set in .env file"); let host = env::var("HOST").expect("HOST is not set in .env file"); let port = env::var("PORT").expect("PORT is not set in .env file"); - let server_url = format!("{}:{}", host, port); + let server_url = format!("{host}:{port}"); // create post table if not exists let conn = Database::connect(&db_url).await.unwrap(); @@ -138,6 +138,6 @@ pub fn main() { let result = start(); if let Some(err) = result.err() { - println!("Error: {}", err); + println!("Error: {err}"); } } diff --git a/examples/poem_example/api/src/lib.rs b/examples/poem_example/api/src/lib.rs index 34eacdcd..02c7ba76 100644 --- a/examples/poem_example/api/src/lib.rs +++ b/examples/poem_example/api/src/lib.rs @@ -130,7 +130,7 @@ async fn start() -> std::io::Result<()> { let db_url = env::var("DATABASE_URL").expect("DATABASE_URL is not set in .env file"); let host = env::var("HOST").expect("HOST is not set in .env file"); let port = env::var("PORT").expect("PORT is not set in .env file"); - let server_url = format!("{}:{}", host, port); + let server_url = format!("{host}:{port}"); // create post table if not exists let conn = Database::connect(&db_url).await.unwrap(); @@ -138,7 +138,7 @@ async fn start() -> std::io::Result<()> { let templates = Tera::new(concat!(env!("CARGO_MANIFEST_DIR"), "/templates/**/*")).unwrap(); let state = AppState { templates, conn }; - println!("Starting server at {}", server_url); + println!("Starting server at {server_url}"); let app = Route::new() .at("/", post(create).get(list)) @@ -150,7 +150,7 @@ async fn start() -> std::io::Result<()> { StaticFilesEndpoint::new(concat!(env!("CARGO_MANIFEST_DIR"), "/static")), ) .data(state); - let server = Server::new(TcpListener::bind(format!("{}:{}", host, port))); + let server = Server::new(TcpListener::bind(format!("{host}:{port}"))); server.run(app).await } @@ -158,6 +158,6 @@ pub fn main() { let result = start(); if let Some(err) = result.err() { - println!("Error: {}", err); + println!("Error: {err}"); } } diff --git a/examples/rocket_example/api/src/lib.rs b/examples/rocket_example/api/src/lib.rs index 51918c7a..29eb621d 100644 --- a/examples/rocket_example/api/src/lib.rs +++ b/examples/rocket_example/api/src/lib.rs @@ -166,6 +166,6 @@ pub fn main() { println!("Rocket: deorbit."); if let Some(err) = result.err() { - println!("Error: {}", err); + println!("Error: {err}"); } } diff --git a/examples/rocket_okapi_example/api/src/lib.rs b/examples/rocket_okapi_example/api/src/lib.rs index 03cf66b2..1f82656b 100644 --- a/examples/rocket_okapi_example/api/src/lib.rs +++ b/examples/rocket_okapi_example/api/src/lib.rs @@ -75,7 +75,7 @@ fn cors() -> Cors { let allowed_origins = AllowedOrigins::some_exact(&["http://localhost:8000", "http://127.0.0.1:8000"]); - let cors = rocket_cors::CorsOptions { + rocket_cors::CorsOptions { allowed_origins, allowed_methods: vec![Method::Get, Method::Post, Method::Delete] .into_iter() @@ -86,8 +86,7 @@ fn cors() -> Cors { ..Default::default() } .to_cors() - .unwrap(); - cors + .unwrap() } fn custom_openapi_spec() -> OpenApi { @@ -134,6 +133,6 @@ pub fn main() { println!("Rocket: deorbit."); if let Some(err) = result.err() { - println!("Error: {}", err); + println!("Error: {err}"); } } diff --git a/examples/salvo_example/api/src/lib.rs b/examples/salvo_example/api/src/lib.rs index 70a74e31..3b7da0ba 100644 --- a/examples/salvo_example/api/src/lib.rs +++ b/examples/salvo_example/api/src/lib.rs @@ -152,7 +152,7 @@ pub async fn main() { let db_url = env::var("DATABASE_URL").expect("DATABASE_URL is not set in .env file"); let host = env::var("HOST").expect("HOST is not set in .env file"); let port = env::var("PORT").expect("PORT is not set in .env file"); - let server_url = format!("{}:{}", host, port); + let server_url = format!("{host}:{port}"); // create post table if not exists let conn = Database::connect(&db_url).await.unwrap(); @@ -160,7 +160,7 @@ pub async fn main() { let templates = Tera::new(concat!(env!("CARGO_MANIFEST_DIR"), "/templates/**/*")).unwrap(); let state = AppState { templates, conn }; - println!("Starting server at {}", server_url); + println!("Starting server at {server_url}"); let router = Router::new() .hoop(affix::inject(state)) @@ -176,7 +176,7 @@ pub async fn main() { ))), ); - Server::new(TcpListener::bind(&format!("{}:{}", host, port))) + Server::new(TcpListener::bind(&format!("{host}:{port}"))) .serve(router) .await; } diff --git a/examples/tonic_example/api/src/lib.rs b/examples/tonic_example/api/src/lib.rs index 9b3e2582..32d97981 100644 --- a/examples/tonic_example/api/src/lib.rs +++ b/examples/tonic_example/api/src/lib.rs @@ -138,6 +138,6 @@ pub fn main() { let result = start(); if let Some(err) = result.err() { - println!("Error: {}", err); + println!("Error: {err}"); } } diff --git a/examples/tonic_example/src/client.rs b/examples/tonic_example/src/client.rs index f63ad46a..f7026e37 100644 --- a/examples/tonic_example/src/client.rs +++ b/examples/tonic_example/src/client.rs @@ -21,7 +21,7 @@ async fn main() -> Result<(), Box> { let response = client.get_posts(request).await?; for post in response.into_inner().post.iter() { - println!("{:?}", post); + println!("{post:?}"); } Ok(()) diff --git a/tests/enum_primary_key_tests.rs b/tests/enum_primary_key_tests.rs index 837e0d1f..ce487bbc 100644 --- a/tests/enum_primary_key_tests.rs +++ b/tests/enum_primary_key_tests.rs @@ -39,7 +39,6 @@ pub async fn insert_teas(db: &DatabaseConnection) -> Result<(), DbErr> { id: Set(Tea::EverydayTea), category: Set(None), color: Set(None), - ..Default::default() } .insert(db) .await? @@ -61,7 +60,6 @@ pub async fn insert_teas(db: &DatabaseConnection) -> Result<(), DbErr> { id: Set(Tea::EverydayTea), category: Set(Some(Category::Big)), color: Set(Some(Color::Black)), - ..Default::default() } .insert(db) .await @@ -72,7 +70,6 @@ pub async fn insert_teas(db: &DatabaseConnection) -> Result<(), DbErr> { id: Set(Tea::EverydayTea), category: Set(Some(Category::Big)), color: Set(Some(Color::Black)), - ..Default::default() }) .exec(db) .await diff --git a/tests/uuid_fmt_tests.rs b/tests/uuid_fmt_tests.rs index a99f35ba..49dd99f5 100644 --- a/tests/uuid_fmt_tests.rs +++ b/tests/uuid_fmt_tests.rs @@ -24,7 +24,7 @@ pub async fn insert_uuid_fmt(db: &DatabaseConnection) -> Result<(), DbErr> { let uuid_fmt = uuid_fmt::Model { id: 1, - uuid: uuid, + uuid, uuid_braced: uuid.braced(), uuid_hyphenated: uuid.hyphenated(), uuid_simple: uuid.simple(),