From 6db54b237aff9fd473aabf6a02b7f178a61d2ef3 Mon Sep 17 00:00:00 2001 From: Anna Date: Thu, 4 Apr 2024 14:53:49 -0400 Subject: [PATCH] refactor(server): apply clippy suggestions --- server/src/handlers/disband.rs | 2 +- server/src/handlers/register.rs | 2 +- server/src/handlers/update.rs | 2 +- server/src/updater.rs | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/src/handlers/disband.rs b/server/src/handlers/disband.rs index d1a3713..72314b0 100644 --- a/server/src/handlers/disband.rs +++ b/server/src/handlers/disband.rs @@ -9,7 +9,7 @@ use crate::util::send; pub async fn disband(state: Arc>, client_state: Arc>, conn: &mut WsStream, number: u32, req: DisbandRequest) -> Result<()> { match client_state.read().await.get_rank(req.channel, &state).await? { - Some(rank) if rank == Rank::Admin => {} + Some(Rank::Admin) => {} _ => return send(conn, number, ErrorResponse::new(req.channel, "not in channel/not enough permissions")).await, } diff --git a/server/src/handlers/register.rs b/server/src/handlers/register.rs index 3803681..dd03fd8 100644 --- a/server/src/handlers/register.rs +++ b/server/src/handlers/register.rs @@ -66,7 +66,7 @@ pub async fn register(state: Arc>, _client_state: Arc { let mut rand_bytes = [0; 32]; rand::thread_rng().fill_bytes(&mut rand_bytes); - let challenge = hex::encode(&rand_bytes); + let challenge = hex::encode(rand_bytes); sqlx::query!( // language=sqlite diff --git a/server/src/handlers/update.rs b/server/src/handlers/update.rs index 24cdcf6..7387789 100644 --- a/server/src/handlers/update.rs +++ b/server/src/handlers/update.rs @@ -9,7 +9,7 @@ use crate::util::send; pub async fn update(state: Arc>, client_state: Arc>, conn: &mut WsStream, number: u32, req: UpdateRequest) -> Result<()> { match client_state.read().await.get_rank(req.channel, &state).await? { - Some(rank) if rank == Rank::Admin => {} + Some(Rank::Admin) => {} _ => return send(conn, number, ErrorResponse::new(req.channel, "not in that channel")).await, } diff --git a/server/src/updater.rs b/server/src/updater.rs index 07efae9..5465b22 100644 --- a/server/src/updater.rs +++ b/server/src/updater.rs @@ -32,7 +32,7 @@ pub fn spawn(state: Arc>, mut rx: UnboundedReceiver) -> JoinH tokio::time::sleep(left).await; } - match update(&*state, &lodestone, id).await { + match update(&state, &lodestone, id).await { Ok(()) => debug!("updated user {}", id), Err(e) => error!("error updating user {}: {:?}", id, e), } @@ -66,11 +66,11 @@ async fn update(state: &RwLock, lodestone: &LodestoneScraper, lodestone_i if let Some(user) = client_state { trace!(" [updater] before user write"); if let Some(user) = user.write().await.user.as_mut() { - user.name = info.name.clone(); + user.name = info.name; user.world = info.world; } trace!(" [updater] after user write"); } Ok(()) -} \ No newline at end of file +}