From 7d410d53274fdd6840261c286bc2785222256436 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Mon, 18 Mar 2024 10:46:39 +0100
Subject: clippy

---
 server/src/assets.rs | 4 +---
 server/src/idgen.rs  | 9 +--------
 server/src/logic.rs  | 5 +++--
 server/src/main.rs   | 8 ++++++--
 4 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'server')

diff --git a/server/src/assets.rs b/server/src/assets.rs
index d4c1ded..4ddb3a5 100644
--- a/server/src/assets.rs
+++ b/server/src/assets.rs
@@ -63,9 +63,7 @@ struct GrassFs;
 #[cfg(debug_assertions)]
 impl GrassFs {
     pub fn map(p: &std::path::Path) -> std::path::PathBuf {
-        std::path::PathBuf::try_from("../client-web/style")
-            .unwrap()
-            .join(p.file_name().unwrap())
+        std::path::PathBuf::from("../client-web/style").join(p.file_name().unwrap())
     }
 }
 #[cfg(debug_assertions)]
diff --git a/server/src/idgen.rs b/server/src/idgen.rs
index 216b682..ac40b93 100644
--- a/server/src/idgen.rs
+++ b/server/src/idgen.rs
@@ -5,17 +5,10 @@
 */
 use tokio::sync::RwLock;
 
+#[derive(Default)]
 pub struct IdGenerator {
     x: RwLock<u64>,
 }
-
-impl Default for IdGenerator {
-    fn default() -> Self {
-        Self {
-            x: Default::default(),
-        }
-    }
-}
 impl IdGenerator {
     pub async fn generate(&self) -> u64 {
         // TODO: dummy implementation; ideal would be encrypting the counter
diff --git a/server/src/logic.rs b/server/src/logic.rs
index b16e605..b660914 100644
--- a/server/src/logic.rs
+++ b/server/src/logic.rs
@@ -17,6 +17,7 @@ use std::{
 use tokio::sync::{mpsc::Sender, RwLock};
 use warp::ws::WebSocket;
 
+#[allow(clippy::redundant_closure)]
 static CLIENTS: LazyLock<RwLock<HashMap<Client, Sender<ClientboundPacket>>>> =
     LazyLock::new(|| Default::default());
 
@@ -141,7 +142,7 @@ impl State {
                 let mut w = self.watches.write().await;
                 let r = self.rooms.read().await;
 
-                for e in list.to_owned() {
+                for e in list.iter().cloned() {
                     w.entry(e.to_string()).or_default().insert(client);
                     if let Some(r) = r.get(&e) {
                         client
@@ -170,7 +171,7 @@ impl State {
 
 impl Client {
     pub async fn send(&self, packet: ClientboundPacket) {
-        if let Some(s) = CLIENTS.read().await.get(&self) {
+        if let Some(s) = CLIENTS.read().await.get(self) {
             s.send(packet).await.unwrap();
         } else {
             warn!("invalid recipient {self:?}")
diff --git a/server/src/main.rs b/server/src/main.rs
index 306aa98..56566db 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -4,6 +4,7 @@
     Copyright (C) 2023 metamuffin <metamuffin.org>
 */
 #![feature(lazy_cell)]
+#![allow(clippy::let_with_type_underscore)]
 pub mod assets;
 pub mod config;
 pub mod idgen;
@@ -137,9 +138,12 @@ async fn run() {
 async fn handle_rejection(err: Rejection) -> Result<impl Reply, Infallible> {
     let code = if err.is_not_found() {
         StatusCode::NOT_FOUND
-    } else if let Some(_) = err.find::<warp::filters::body::BodyDeserializeError>() {
+    } else if err
+        .find::<warp::filters::body::BodyDeserializeError>()
+        .is_some()
+    {
         StatusCode::BAD_REQUEST
-    } else if let Some(_) = err.find::<warp::reject::MethodNotAllowed>() {
+    } else if err.find::<warp::reject::MethodNotAllowed>().is_some() {
         StatusCode::METHOD_NOT_ALLOWED
     } else {
         error!("unhandled rejection: {:?}", err);
-- 
cgit v1.2.3-70-g09d2