Fix clippy warnings (#1436)

This commit is contained in:
Billy Chan 2023-01-31 15:52:57 +08:00 committed by GitHub
parent 7fcfb3a78f
commit 4e3a45c2f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 53 additions and 57 deletions

View File

@ -109,7 +109,7 @@ async fn edit(data: web::Data<AppState>, id: web::Path<i32>) -> Result<HttpRespo
let post: post::Model = Query::find_post_by_id(conn, id) let post: post::Model = Query::find_post_by_id(conn, id)
.await .await
.expect("could not find post") .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(); let mut ctx = tera::Context::new();
ctx.insert("post", &post); ctx.insert("post", &post);
@ -172,7 +172,7 @@ async fn start() -> std::io::Result<()> {
let db_url = env::var("DATABASE_URL").expect("DATABASE_URL is not set in .env file"); 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 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 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 // create post table if not exists
let conn = Database::connect(&db_url).await.unwrap(); let conn = Database::connect(&db_url).await.unwrap();
@ -195,7 +195,7 @@ async fn start() -> std::io::Result<()> {
None => server.bind(&server_url)?, None => server.bind(&server_url)?,
}; };
println!("Starting server at {}", server_url); println!("Starting server at {server_url}");
server.run().await?; server.run().await?;
Ok(()) Ok(())
@ -214,6 +214,6 @@ pub fn main() {
let result = start(); let result = start();
if let Some(err) = result.err() { if let Some(err) = result.err() {
println!("Error: {}", err) println!("Error: {err}")
} }
} }

View File

@ -98,7 +98,7 @@ async fn edit(data: web::Data<AppState>, id: web::Path<i32>) -> Result<HttpRespo
let post: post::Model = Query::find_post_by_id(conn, id) let post: post::Model = Query::find_post_by_id(conn, id)
.await .await
.expect("could not find post") .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(); let mut ctx = tera::Context::new();
ctx.insert("post", &post); ctx.insert("post", &post);
@ -164,7 +164,7 @@ async fn start() -> std::io::Result<()> {
let db_url = env::var("DATABASE_URL").expect("DATABASE_URL is not set in .env file"); 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 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 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 // establish connection to database and apply migrations
// -> create post table if not exists // -> create post table if not exists
@ -191,7 +191,7 @@ async fn start() -> std::io::Result<()> {
None => server.bind(&server_url)?, None => server.bind(&server_url)?,
}; };
println!("Starting server at {}", server_url); println!("Starting server at {server_url}");
server.run().await?; server.run().await?;
Ok(()) Ok(())
@ -210,6 +210,6 @@ pub fn main() {
let result = start(); let result = start();
if let Some(err) = result.err() { if let Some(err) = result.err() {
println!("Error: {}", err); println!("Error: {err}");
} }
} }

View File

@ -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 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 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 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) let conn = Database::connect(db_url)
.await .await
@ -56,7 +56,7 @@ async fn start() -> anyhow::Result<()> {
.handle_error(|error: std::io::Error| async move { .handle_error(|error: std::io::Error| async move {
( (
StatusCode::INTERNAL_SERVER_ERROR, 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) let post: post::Model = QueryCore::find_post_by_id(&state.conn, id)
.await .await
.expect("could not find post") .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(); let mut ctx = tera::Context::new();
ctx.insert("post", &post); ctx.insert("post", &post);
@ -207,6 +207,6 @@ pub fn main() {
let result = start(); let result = start();
if let Some(err) = result.err() { if let Some(err) = result.err() {
println!("Error: {}", err); println!("Error: {err}");
} }
} }

View File

@ -22,7 +22,7 @@ async fn main() {
.await .await
.unwrap(); .unwrap();
println!("{:?}\n", db); println!("{db:?}\n");
println!("===== =====\n"); println!("===== =====\n");

View File

@ -28,7 +28,7 @@ pub async fn insert_and_update(db: &DbConn) -> Result<(), DbErr> {
let pear: Option<fruit::Model> = Fruit::find_by_id(res.last_insert_id).one(db).await?; let pear: Option<fruit::Model> = Fruit::find_by_id(res.last_insert_id).one(db).await?;
println!(); println!();
println!("Pear: {:?}\n", pear); println!("Pear: {pear:?}\n");
let mut pear: fruit::ActiveModel = pear.unwrap().into(); let mut pear: fruit::ActiveModel = pear.unwrap().into();
pear.name = Set("Sweet pear".to_owned()); 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?; let pear: fruit::Model = pear.update(db).await?;
println!(); println!();
println!("Updated: {:?}\n", pear); println!("Updated: {pear:?}\n");
Ok(()) Ok(())
} }
@ -49,19 +49,19 @@ pub async fn save_active_model(db: &DbConn) -> Result<(), DbErr> {
let mut banana: fruit::ActiveModel = banana.save(db).await?; let mut banana: fruit::ActiveModel = banana.save(db).await?;
println!(); println!();
println!("Inserted: {:?}\n", banana); println!("Inserted: {banana:?}\n");
banana.name = Set("Banana Mongo".to_owned()); banana.name = Set("Banana Mongo".to_owned());
let banana: fruit::ActiveModel = banana.save(db).await?; let banana: fruit::ActiveModel = banana.save(db).await?;
println!(); println!();
println!("Updated: {:?}\n", banana); println!("Updated: {banana:?}\n");
let result = banana.delete(db).await?; let result = banana.delete(db).await?;
println!(); println!();
println!("Deleted: {:?}\n", result); println!("Deleted: {result:?}\n");
Ok(()) Ok(())
} }
@ -85,7 +85,7 @@ async fn save_custom_active_model(db: &DbConn) -> Result<(), DbErr> {
let pineapple = pineapple.save(db).await?; let pineapple = pineapple.save(db).await?;
println!(); println!();
println!("Saved: {:?}\n", pineapple); println!("Saved: {pineapple:?}\n");
Ok(()) Ok(())
} }

View File

@ -48,7 +48,7 @@ async fn find_all(db: &DbConn) -> Result<(), DbErr> {
println!(); println!();
for cc in cakes.iter() { for cc in cakes.iter() {
println!("{:?}\n", cc); println!("{cc:?}\n");
} }
print!("find all fruits: "); print!("find all fruits: ");
@ -57,7 +57,7 @@ async fn find_all(db: &DbConn) -> Result<(), DbErr> {
println!(); println!();
for ff in fruits.iter() { for ff in fruits.iter() {
println!("{:?}\n", ff); println!("{ff:?}\n");
} }
Ok(()) Ok(())
@ -71,7 +71,7 @@ async fn find_together(db: &DbConn) -> Result<(), DbErr> {
println!(); println!();
for bb in both.iter() { for bb in both.iter() {
println!("{:?}\n", bb); println!("{bb:?}\n");
} }
Ok(()) Ok(())
@ -90,7 +90,7 @@ async fn find_one(db: &DbConn) -> Result<(), DbErr> {
let cheese = cheese.unwrap(); let cheese = cheese.unwrap();
println!(); println!();
println!("{:?}", cheese); println!("{cheese:?}");
println!(); println!();
print!("find one by name: "); 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?; let chocolate = Cake::find_by_name("chocolate").one(db).await?;
println!(); println!();
println!("{:?}", chocolate); println!("{chocolate:?}");
println!(); println!();
print!("find models belong to: "); print!("find models belong to: ");
@ -107,7 +107,7 @@ async fn find_one(db: &DbConn) -> Result<(), DbErr> {
println!(); println!();
for ff in fruits.iter() { for ff in fruits.iter() {
println!("{:?}\n", ff); println!("{ff:?}\n");
} }
Ok(()) Ok(())
@ -133,7 +133,7 @@ async fn count_fruits_by_cake(db: &DbConn) -> Result<(), DbErr> {
println!(); println!();
for rr in results.iter() { for rr in results.iter() {
println!("{:?}\n", rr); println!("{rr:?}\n");
} }
Ok(()) Ok(())
@ -147,7 +147,7 @@ async fn find_many_to_many(db: &DbConn) -> Result<(), DbErr> {
println!(); println!();
for bb in both.iter() { for bb in both.iter() {
println!("{:?}\n", bb); println!("{bb:?}\n");
} }
print!("find fillings for cheese cake: "); print!("find fillings for cheese cake: ");
@ -159,7 +159,7 @@ async fn find_many_to_many(db: &DbConn) -> Result<(), DbErr> {
println!(); println!();
for ff in fillings.iter() { 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!(); println!();
for cc in cakes.iter() { 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); let mut cake_paginator = cake::Entity::find().paginate(db, 2);
while let Some(cake_res) = cake_paginator.fetch_and_next().await? { while let Some(cake_res) = cake_paginator.fetch_and_next().await? {
for cake in cake_res { 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); let mut fruit_paginator = fruit::Entity::find().paginate(db, 2);
while let Some(fruit_res) = fruit_paginator.fetch_and_next().await? { while let Some(fruit_res) = fruit_paginator.fetch_and_next().await? {
for fruit in fruit_res { 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(); let mut fruit_stream = fruit::Entity::find().paginate(db, 2).into_stream();
while let Some(fruits) = fruit_stream.try_next().await? { while let Some(fruits) = fruit_stream.try_next().await? {
for fruit in fruits { for fruit in fruits {
println!("{:?}", fruit); println!("{fruit:?}");
} }
sleep(Duration::from_millis(250)).await; sleep(Duration::from_millis(250)).await;
} }
@ -284,7 +284,7 @@ async fn find_all_stream(db: &DbConn) -> Result<(), DbErr> {
.into_stream(); .into_stream();
while let Some(jsons) = json_stream.try_next().await? { while let Some(jsons) = json_stream.try_next().await? {
for json in jsons { for json in jsons {
println!("{:?}", json); println!("{json:?}");
} }
sleep(Duration::from_millis(250)).await; sleep(Duration::from_millis(250)).await;
} }
@ -296,7 +296,7 @@ async fn find_first_page(db: &DbConn) -> Result<(), DbErr> {
println!("fruits first page: "); println!("fruits first page: ");
let page = fruit::Entity::find().paginate(db, 2).fetch_page(0).await?; let page = fruit::Entity::find().paginate(db, 2).fetch_page(0).await?;
for fruit in page { for fruit in page {
println!("{:?}", fruit); println!("{fruit:?}");
} }
Ok(()) Ok(())
@ -305,7 +305,7 @@ async fn find_first_page(db: &DbConn) -> Result<(), DbErr> {
async fn find_num_pages(db: &DbConn) -> Result<(), DbErr> { async fn find_num_pages(db: &DbConn) -> Result<(), DbErr> {
println!("fruits number of page: "); println!("fruits number of page: ");
let num_pages = fruit::Entity::find().paginate(db, 2).num_pages().await?; let num_pages = fruit::Entity::find().paginate(db, 2).num_pages().await?;
println!("{:?}", num_pages); println!("{num_pages:?}");
Ok(()) Ok(())
} }

View File

@ -12,11 +12,11 @@ async fn main() {
match std::env::var("DATABASE_URL") { match std::env::var("DATABASE_URL") {
Ok(val) => { Ok(val) => {
println!("Using DATABASE_URL: {}", val); println!("Using DATABASE_URL: {val}");
} }
Err(_) => { Err(_) => {
std::env::set_var("DATABASE_URL", fallback); std::env::set_var("DATABASE_URL", fallback);
println!("Set DATABASE_URL: {}", fallback); println!("Set DATABASE_URL: {fallback}");
} }
}; };

View File

@ -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 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 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 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 // create post table if not exists
let conn = Database::connect(&db_url).await.unwrap(); let conn = Database::connect(&db_url).await.unwrap();
@ -138,6 +138,6 @@ pub fn main() {
let result = start(); let result = start();
if let Some(err) = result.err() { if let Some(err) = result.err() {
println!("Error: {}", err); println!("Error: {err}");
} }
} }

View File

@ -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 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 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 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 // create post table if not exists
let conn = Database::connect(&db_url).await.unwrap(); 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 templates = Tera::new(concat!(env!("CARGO_MANIFEST_DIR"), "/templates/**/*")).unwrap();
let state = AppState { templates, conn }; let state = AppState { templates, conn };
println!("Starting server at {}", server_url); println!("Starting server at {server_url}");
let app = Route::new() let app = Route::new()
.at("/", post(create).get(list)) .at("/", post(create).get(list))
@ -150,7 +150,7 @@ async fn start() -> std::io::Result<()> {
StaticFilesEndpoint::new(concat!(env!("CARGO_MANIFEST_DIR"), "/static")), StaticFilesEndpoint::new(concat!(env!("CARGO_MANIFEST_DIR"), "/static")),
) )
.data(state); .data(state);
let server = Server::new(TcpListener::bind(format!("{}:{}", host, port))); let server = Server::new(TcpListener::bind(format!("{host}:{port}")));
server.run(app).await server.run(app).await
} }
@ -158,6 +158,6 @@ pub fn main() {
let result = start(); let result = start();
if let Some(err) = result.err() { if let Some(err) = result.err() {
println!("Error: {}", err); println!("Error: {err}");
} }
} }

View File

@ -166,6 +166,6 @@ pub fn main() {
println!("Rocket: deorbit."); println!("Rocket: deorbit.");
if let Some(err) = result.err() { if let Some(err) = result.err() {
println!("Error: {}", err); println!("Error: {err}");
} }
} }

View File

@ -75,7 +75,7 @@ fn cors() -> Cors {
let allowed_origins = let allowed_origins =
AllowedOrigins::some_exact(&["http://localhost:8000", "http://127.0.0.1:8000"]); AllowedOrigins::some_exact(&["http://localhost:8000", "http://127.0.0.1:8000"]);
let cors = rocket_cors::CorsOptions { rocket_cors::CorsOptions {
allowed_origins, allowed_origins,
allowed_methods: vec![Method::Get, Method::Post, Method::Delete] allowed_methods: vec![Method::Get, Method::Post, Method::Delete]
.into_iter() .into_iter()
@ -86,8 +86,7 @@ fn cors() -> Cors {
..Default::default() ..Default::default()
} }
.to_cors() .to_cors()
.unwrap(); .unwrap()
cors
} }
fn custom_openapi_spec() -> OpenApi { fn custom_openapi_spec() -> OpenApi {
@ -134,6 +133,6 @@ pub fn main() {
println!("Rocket: deorbit."); println!("Rocket: deorbit.");
if let Some(err) = result.err() { if let Some(err) = result.err() {
println!("Error: {}", err); println!("Error: {err}");
} }
} }

View File

@ -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 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 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 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 // create post table if not exists
let conn = Database::connect(&db_url).await.unwrap(); 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 templates = Tera::new(concat!(env!("CARGO_MANIFEST_DIR"), "/templates/**/*")).unwrap();
let state = AppState { templates, conn }; let state = AppState { templates, conn };
println!("Starting server at {}", server_url); println!("Starting server at {server_url}");
let router = Router::new() let router = Router::new()
.hoop(affix::inject(state)) .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) .serve(router)
.await; .await;
} }

View File

@ -138,6 +138,6 @@ pub fn main() {
let result = start(); let result = start();
if let Some(err) = result.err() { if let Some(err) = result.err() {
println!("Error: {}", err); println!("Error: {err}");
} }
} }

View File

@ -21,7 +21,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let response = client.get_posts(request).await?; let response = client.get_posts(request).await?;
for post in response.into_inner().post.iter() { for post in response.into_inner().post.iter() {
println!("{:?}", post); println!("{post:?}");
} }
Ok(()) Ok(())

View File

@ -39,7 +39,6 @@ pub async fn insert_teas(db: &DatabaseConnection) -> Result<(), DbErr> {
id: Set(Tea::EverydayTea), id: Set(Tea::EverydayTea),
category: Set(None), category: Set(None),
color: Set(None), color: Set(None),
..Default::default()
} }
.insert(db) .insert(db)
.await? .await?
@ -61,7 +60,6 @@ pub async fn insert_teas(db: &DatabaseConnection) -> Result<(), DbErr> {
id: Set(Tea::EverydayTea), id: Set(Tea::EverydayTea),
category: Set(Some(Category::Big)), category: Set(Some(Category::Big)),
color: Set(Some(Color::Black)), color: Set(Some(Color::Black)),
..Default::default()
} }
.insert(db) .insert(db)
.await .await
@ -72,7 +70,6 @@ pub async fn insert_teas(db: &DatabaseConnection) -> Result<(), DbErr> {
id: Set(Tea::EverydayTea), id: Set(Tea::EverydayTea),
category: Set(Some(Category::Big)), category: Set(Some(Category::Big)),
color: Set(Some(Color::Black)), color: Set(Some(Color::Black)),
..Default::default()
}) })
.exec(db) .exec(db)
.await .await

View File

@ -24,7 +24,7 @@ pub async fn insert_uuid_fmt(db: &DatabaseConnection) -> Result<(), DbErr> {
let uuid_fmt = uuid_fmt::Model { let uuid_fmt = uuid_fmt::Model {
id: 1, id: 1,
uuid: uuid, uuid,
uuid_braced: uuid.braced(), uuid_braced: uuid.braced(),
uuid_hyphenated: uuid.hyphenated(), uuid_hyphenated: uuid.hyphenated(),
uuid_simple: uuid.simple(), uuid_simple: uuid.simple(),