From 80c9191eeec29ba20ef4084713eca7fe0cab7412 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 30 Sep 2024 00:19:58 +0100 Subject: [PATCH] fmt: more clippy that got missed --- src/commands/role_adder.rs | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/commands/role_adder.rs b/src/commands/role_adder.rs index bb33667..949bf32 100644 --- a/src/commands/role_adder.rs +++ b/src/commands/role_adder.rs @@ -22,7 +22,7 @@ pub mod edit { let role_a = if let CommandDataOptionValue::Role(role) = command .data .options - .get(0) + .first() .expect("Expected role option") .resolved .as_ref() @@ -73,13 +73,8 @@ pub mod edit { if let Some(x) = command.data.options.get(3) { let tmp = x.to_owned(); - if let Some(y) = tmp.resolved { - match y { - CommandDataOptionValue::Boolean(z) => { - delete = z; - } - _ => {} - } + if let Some(CommandDataOptionValue::Boolean(z)) = tmp.resolved { + delete = z; } } @@ -157,9 +152,8 @@ pub mod edit { } async fn add_server(db: &Pool, server: &RoleAdder, delete: bool) -> Result, Error> { - let action; if delete { - action = sqlx::query_as::<_, RoleAdder>( + sqlx::query_as::<_, RoleAdder>( " DELETE FROM roles_adder WHERE server = ?1 AND role_a = ?2 AND role_b = ?3 AND role_c = ?4 @@ -170,9 +164,9 @@ pub mod edit { .bind(*server.role_b.as_u64() as i64) .bind(*server.role_c.as_u64() as i64) .fetch_optional(db) - .await; + .await } else { - action = sqlx::query_as::<_, RoleAdder>( + sqlx::query_as::<_, RoleAdder>( " INSERT OR REPLACE INTO roles_adder (server, role_a, role_b, role_c) VALUES (?1, ?2, ?3, ?4) @@ -183,10 +177,8 @@ pub mod edit { .bind(*server.role_b.as_u64() as i64) .bind(*server.role_c.as_u64() as i64) .fetch_optional(db) - .await; + .await } - - action } }