From 511a104e1235e589db24240a9bc863d1bb48721c Mon Sep 17 00:00:00 2001 From: Joshua Higgins Date: Sun, 15 Mar 2026 04:57:03 +0000 Subject: [PATCH] fix compile errors --- src/lib.rs | 2 +- src/main.rs | 22 +++++++++++++++++++--- src/server.rs | 4 ++-- src/types.rs | 2 +- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index cd7b1bd..937fbe3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,6 +1,6 @@ use std::{collections::HashMap, net::SocketAddr, sync::Arc}; -use rand::Rng; +use rand::RngExt; use tokio::sync::{ mpsc::{error::SendError, UnboundedSender}, RwLock, diff --git a/src/main.rs b/src/main.rs index 7d67bb6..a5af3e0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -49,7 +49,7 @@ async fn handle_connection( let ws_stream = accept_async(stream).await?; let (mut ws_sender, mut ws_receiver) = ws_stream.split(); - let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel(); + let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel::(); // Spawn task to handle outgoing messages let send_task = tokio::spawn(async move { @@ -262,7 +262,15 @@ async fn handle_connection( let player1_username = usernames[0].to_string(); let player2_username = usernames[1].to_string(); - if let Err(e) = sd.handle_reservation_add(tx.clone(), addr, player1_username, player2_username).await { + if let Err(e) = sd + .handle_reservation_add( + tx.clone(), + addr, + player1_username, + player2_username, + ) + .await + { error!("handle_reservation_add: {}", e); let _ = send(&tx, e.to_string().as_str()); } @@ -277,7 +285,15 @@ async fn handle_connection( let player1_username = usernames[0].to_string(); let player2_username = usernames[1].to_string(); - if let Err(e) = sd.handle_reservation_delete(tx.clone(), addr, player1_username, player2_username).await { + if let Err(e) = sd + .handle_reservation_delete( + tx.clone(), + addr, + player1_username, + player2_username, + ) + .await + { error!("handle_reservation_delete: {}", e); let _ = send(&tx, e.to_string().as_str()); } diff --git a/src/server.rs b/src/server.rs index 3254be8..dbed43d 100644 --- a/src/server.rs +++ b/src/server.rs @@ -1,4 +1,5 @@ use anyhow::anyhow; +use rand::RngExt; use std::time::Instant; use crate::{tournaments::*, types::*, *}; @@ -1227,8 +1228,7 @@ impl Server { timeout_thread.abort(); } - self.broadcast_message_all_observers(&format!("GAME:{}:TERMINATED", match_id)) - .await; + self.broadcast_message_all_observers(&format!("GAME:{}:TERMINATED", match_id)).await; let clients_guard = self.clients.read().await; if the_match.player1 != SERVER_PLAYER_ADDR.to_string().parse().unwrap() { diff --git a/src/types.rs b/src/types.rs index c0057e7..4411a97 100644 --- a/src/types.rs +++ b/src/types.rs @@ -1,4 +1,4 @@ -use rand::Rng; +use rand::RngExt; use std::net::SocketAddr; use std::time::Instant; use std::{ops, vec};