From 0a75df36c49fdefd362a84383756b520ade1ad58 Mon Sep 17 00:00:00 2001 From: core Date: Mon, 10 Apr 2023 15:24:50 -0400 Subject: [PATCH] fixup --- client/src/chat.rs | 2 ++ server/src/macros.rs | 5 ----- server/src/main.rs | 12 ++++++------ 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/client/src/chat.rs b/client/src/chat.rs index 774be725b000f32d038103f652bda7288a4fff28..ae60dfb23baafaf2cc043bbd497d0430a580f3ef 100644 --- a/client/src/chat.rs +++ b/client/src/chat.rs @@ -4,6 +4,8 @@ use crate::CLIENT; use futures::SinkExt; #[wasm_bindgen] +// TODO: Switch to async-aware mutexes +#[allow(clippy::await_holding_lock)] pub async fn send_chat(message: &str) -> Result<(), JsError> { let client_data = &mut CLIENT.write()?.client_data; diff --git a/server/src/macros.rs b/server/src/macros.rs index 7bbd2936069085b940627272274a29806e2c4998..c4420ece3ab21070aba3f4be1bcb1946db4b8799 100644 --- a/server/src/macros.rs +++ b/server/src/macros.rs @@ -1,9 +1,4 @@ - - -use futures::{FutureExt, StreamExt}; - use serde::{Serialize}; - use tungstenite::Message; #[macro_export] diff --git a/server/src/main.rs b/server/src/main.rs index e732e7dfb0992ebe4779901094d39947ab0d9e64..4fe6bc0dfa30c099eeee5c6ed6e1062d34d76823 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -28,7 +28,7 @@ async fn handle_request(mut request: Request, remote_addr: SocketAddr, mgr info!("received connection from {}", remote_addr); //assume request is a handshake, so create the handshake response let response = - match handshake::server::create_response_with_body(&request, || Body::empty()) { + match handshake::server::create_response_with_body(&request, Body::empty) { Ok(response) => { //in case the handshake response creation succeeds, //spawn a task to handle the websocket connection @@ -105,12 +105,12 @@ async fn handle_request(mut request: Request, remote_addr: SocketAddr, mgr number: env!("STK_VERSION").to_string(), // Set by build.rs protocol: PROTOCOL_VERSION, }, - players: cmgr.usernames.read().await.len() as u32, + players: CMGR.usernames.read().await.len() as u32, description: env!("STK_SLP_DESCRIPTION").to_string(), }).unwrap() )).unwrap()) }, - (_url@_, false) => { + (_url, false) => { // typical HTTP file request // TODO Ok(Response::new(Body::empty())) @@ -123,7 +123,7 @@ async fn handle_request(mut request: Request, remote_addr: SocketAddr, mgr } lazy_static! { - static ref cmgr: ClientManager = ClientManager { + static ref CMGR: ClientManager = ClientManager { handlers: Arc::new(RwLock::new(Default::default())), usernames: Arc::new(RwLock::new(Default::default())), }; @@ -143,13 +143,13 @@ async fn main() { async move { Ok::<_, Infallible>(service_fn({ move |request: Request| { - handle_request(request, remote_addr, cmgr.clone()) + handle_request(request, remote_addr, CMGR.clone()) } })) } }); - let mgr_timer = cmgr.clone(); + let mgr_timer = CMGR.clone(); let _timer_thread = tokio::spawn(async move { timer_main(mgr_timer).await; });