From e68a9eb5e9e15372313f9017be4a2d58fb690bfc Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sat, 11 Oct 2025 00:24:11 +0200 Subject: clippy + fmt; start using if let chains --- server/client-lib/src/network/tokio.rs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'server/client-lib/src/network/tokio.rs') diff --git a/server/client-lib/src/network/tokio.rs b/server/client-lib/src/network/tokio.rs index d42d0fc1..6e7f0902 100644 --- a/server/client-lib/src/network/tokio.rs +++ b/server/client-lib/src/network/tokio.rs @@ -15,21 +15,21 @@ along with this program. If not, see . */ -use anyhow::{anyhow, Result}; +use anyhow::{Result, anyhow}; use futures_util::{ - stream::{SplitSink, SplitStream, StreamExt}, SinkExt, TryStreamExt, + stream::{SplitSink, SplitStream, StreamExt}, }; use hurrycurry_protocol::{PacketC, PacketS, VERSION}; use log::{debug, info, warn}; use std::sync::atomic::{AtomicBool, Ordering}; use tokio::{net::TcpStream, sync::RwLock}; -use tokio_tungstenite::{client_async_tls_with_config, MaybeTlsStream, WebSocketStream}; +use tokio_tungstenite::{MaybeTlsStream, WebSocketStream, client_async_tls_with_config}; use tungstenite::{ - client::{uri_mode, IntoClientRequest}, + Message, + client::{IntoClientRequest, uri_mode}, http::Request, stream::Mode, - Message, }; pub struct Network { @@ -98,11 +98,12 @@ impl Network { major, supports_bincode, } = &packet + && *minor == VERSION.0 + && *major == VERSION.1 + && *supports_bincode { - if *minor == VERSION.0 && *major == VERSION.1 && *supports_bincode { - info!("Binary protocol format enabled."); - self.use_binary.store(true, Ordering::Relaxed); - } + info!("Binary protocol format enabled."); + self.use_binary.store(true, Ordering::Relaxed); } return Ok(Some(packet)); } -- cgit v1.3