From c663cfb10a36ba2fca8fc9450ebb14e3deb20e2e Mon Sep 17 00:00:00 2001 From: c0repwn3r Date: Mon, 10 Apr 2023 13:40:34 -0400 Subject: [PATCH] cleanup --- client/src/lib.rs | 8 ++++---- client/src/macros.rs | 10 +++++----- server/src/client_handler.rs | 4 ++-- server/src/handler.rs | 8 ++++---- server/src/macros.rs | 12 ++++++------ server/src/main.rs | 8 ++++---- server/src/timer.rs | 8 ++++---- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/client/src/lib.rs b/client/src/lib.rs index 97e5035c179cf7696aac325d1acba51e80ac99dd..ce6e33551852676723366e6d4e281a3e93038f19 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -1,7 +1,7 @@ use std::error::Error; use futures::stream::{SplitSink, SplitStream}; use futures::StreamExt; -use log::{debug, error, info, Level, trace, warn}; +use log::{error, info, Level, trace, warn}; use wasm_bindgen::prelude::*; use ws_stream_wasm::{WsErr, WsMessage, WsMeta, WsStream}; use protocol::State; @@ -12,11 +12,11 @@ use futures::SinkExt; use lazy_static::lazy_static; use std::sync::Arc; use std::sync::RwLock; -use std::thread; -use std::time::Duration; + + use async_recursion::async_recursion; use futures::FutureExt; -use js_sys::Math::sqrt; + use wasm_bindgen_futures::JsFuture; use web_sys::Window; diff --git a/client/src/macros.rs b/client/src/macros.rs index 10fecc85fe369fa4a2d45a3c72cae622b2448a17..a4496e2d7b1cbeb278b12af616d0146b9f884db4 100644 --- a/client/src/macros.rs +++ b/client/src/macros.rs @@ -1,8 +1,8 @@ -use std::error::Error; -use std::io; -use futures::{AsyncRead, AsyncWrite, FutureExt, Stream, StreamExt}; -use futures::stream::SplitStream; -use serde::{Deserialize, Serialize}; + + +use futures::{FutureExt, StreamExt}; + +use serde::{Serialize}; use ws_stream_wasm::WsMessage; #[macro_export] diff --git a/server/src/client_handler.rs b/server/src/client_handler.rs index 7d15034ccc867d9e6e332a0da7b445ab782a89d0..f6885082787f2e57f7617549e3b6092e4473fd87 100644 --- a/server/src/client_handler.rs +++ b/server/src/client_handler.rs @@ -7,7 +7,7 @@ use log::{error, info}; use tokio::sync::mpsc::Receiver; use tokio_tungstenite::WebSocketStream; use tungstenite::Message; -use protocol::{GoodbyeReason, MessageC2S, MessageS2C, PROTOCOL_VERSION, ps2c, State}; +use protocol::{GoodbyeReason, MessageC2S, MessageS2C, PROTOCOL_VERSION, State}; use crate::handler::{ClientHandlerMessage, ClientManager}; use crate::{send, recv}; @@ -109,7 +109,7 @@ pub async fn handle_client(mgr: ClientManager, remote_addr: SocketAddr, mut rx: MessageC2S::Chat { message } => { info!("[{}] CHAT: [{}] {}", remote_addr, username, message); - for (addr, client_thread) in mgr.handlers.read().await.iter() { + for (_addr, client_thread) in mgr.handlers.read().await.iter() { match client_thread.tx.send(ClientHandlerMessage::ChatMessage { from: username.clone(), message: message.clone() }).await { Ok(_) => (), Err(e) => { diff --git a/server/src/handler.rs b/server/src/handler.rs index b98dd16581373c2f1e76af03f2a2d5c457a928a1..c16eace098da679b422aca619c71486b6eed5c3c 100644 --- a/server/src/handler.rs +++ b/server/src/handler.rs @@ -1,12 +1,12 @@ use std::collections::HashMap; -use std::error::Error; + use std::net::SocketAddr; use std::sync::Arc; -use serde::Serialize; + use tokio::sync::mpsc::Sender; use tokio::sync::RwLock; -use tungstenite::Message; -use protocol::State; + + #[derive(Clone)] pub struct ClientManager { diff --git a/server/src/macros.rs b/server/src/macros.rs index 9f256295255f4006167fd6140a2daadf63f1643d..7bbd2936069085b940627272274a29806e2c4998 100644 --- a/server/src/macros.rs +++ b/server/src/macros.rs @@ -1,9 +1,9 @@ -use std::error::Error; -use std::io; -use futures::{AsyncRead, AsyncWrite, FutureExt, Stream, StreamExt}; -use futures::stream::SplitStream; -use serde::{Deserialize, Serialize}; -use tokio_tungstenite::WebSocketStream; + + +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 e48032c7ce113a5fd1b1081edcb003e389b025fc..076d1cdbf71557f03dff91f07fed894f296455f1 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -4,12 +4,12 @@ use std::sync::Arc; use hyper::{Body, header, Request, Response, Server, server::conn::AddrStream, StatusCode, upgrade}; use hyper::service::{make_service_fn, service_fn}; use tokio_tungstenite::WebSocketStream; -use tungstenite::{Error, handshake}; +use tungstenite::{handshake}; use futures::stream::StreamExt; use lazy_static::lazy_static; use log::{error, info, Level}; use tokio::sync::RwLock; -use protocol::State; + use crate::handler::{ClientHandler, ClientManager}; use crate::client_handler::handle_client; use crate::timer::timer_main; @@ -96,7 +96,7 @@ async fn handle_request(mut request: Request, remote_addr: SocketAddr, mgr ("/ws", false) => { Ok(Response::builder().status(400).body(Body::from("Connection-Upgrade header missing")).unwrap()) }, - (url@_, false) => { + (_url@_, false) => { // typical HTTP file request // TODO Ok(Response::new(Body::empty())) @@ -136,7 +136,7 @@ async fn main() { }); let mgr_timer = cmgr.clone(); - let timer_thread = tokio::spawn(async move { + let _timer_thread = tokio::spawn(async move { timer_main(mgr_timer).await; }); diff --git a/server/src/timer.rs b/server/src/timer.rs index 8e45af9c59982895e5d83a85ead66567a582633c..6e891b015a64984558bffe5500432f2a2a5355d7 100644 --- a/server/src/timer.rs +++ b/server/src/timer.rs @@ -1,7 +1,7 @@ -use std::error::Error; + use std::time::Duration; -use log::{error, trace}; -use tokio::sync::mpsc::Receiver; +use log::{error}; + use tokio::time::sleep; use crate::handler::{ClientHandlerMessage, ClientManager}; @@ -9,7 +9,7 @@ pub async fn timer_main(mgr: ClientManager) { loop { sleep(Duration::from_millis(5)).await; - for (addr, client_thread) in mgr.handlers.read().await.iter() { + for (_addr, client_thread) in mgr.handlers.read().await.iter() { match client_thread.tx.send(ClientHandlerMessage::Tick).await { Ok(_) => (), Err(e) => {