From 86b5267a242522eba67eb71d8f16e334f1be5de4 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sun, 30 Mar 2025 17:59:17 -0400 Subject: [PATCH] Fix various Clippy warnings --- src/bin/kawari-world.rs | 17 ++++------------- src/world/connection.rs | 2 +- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/bin/kawari-world.rs b/src/bin/kawari-world.rs index a6ae881..5d70d0f 100644 --- a/src/bin/kawari-world.rs +++ b/src/bin/kawari-world.rs @@ -1,5 +1,4 @@ use std::collections::HashMap; -use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::{Arc, Mutex}; use kawari::common::custom_ipc::{CustomIpcData, CustomIpcSegment, CustomIpcType}; @@ -30,14 +29,10 @@ use kawari::world::{ }, }; use mlua::{Function, Lua}; -use std::net::SocketAddr; use tokio::io::AsyncReadExt; use tokio::join; -use tokio::net::tcp::WriteHalf; -use tokio::net::{TcpListener, TcpStream}; -use tokio::sync::mpsc::{ - Receiver, Sender, UnboundedReceiver, UnboundedSender, channel, unbounded_channel, -}; +use tokio::net::TcpListener; +use tokio::sync::mpsc::{Receiver, UnboundedReceiver, UnboundedSender, channel, unbounded_channel}; use tokio::sync::oneshot; use tokio::task::JoinHandle; @@ -49,7 +44,6 @@ struct ExtraLuaState { #[derive(Default, Debug)] struct Data { clients: HashMap, - actors: Vec, } async fn main_loop(mut recv: Receiver) -> Result<(), std::io::Error> { @@ -181,9 +175,8 @@ async fn start_client(my_handle: oneshot::Receiver, mut data: Clie }; data.handle.send(ToServer::NewClient(my_handle)).await; - let mut connection = data.connection; + let connection = data.connection; let recv = data.recv; - let (_, write) = &connection.socket.split(); // communication channel between client_loop and client_server_loop let (internal_send, internal_recv) = unbounded_channel(); @@ -1107,7 +1100,7 @@ async fn main() { .unwrap(); } - let (handle, join) = spawn_main_loop(); + let (handle, _) = spawn_main_loop(); loop { let (socket, ip) = listener.accept().await.unwrap(); @@ -1137,6 +1130,4 @@ async fn main() { gamedata: game_data.clone(), }); } - - join.await.unwrap(); } diff --git a/src/world/connection.rs b/src/world/connection.rs index 1e065a4..4e77c07 100644 --- a/src/world/connection.rs +++ b/src/world/connection.rs @@ -9,7 +9,7 @@ use std::{ use tokio::{net::TcpStream, sync::mpsc::Sender, task::JoinHandle}; use crate::{ - common::{GameData, ObjectId, ObjectTypeId, Position, timestamp_secs}, + common::{GameData, ObjectId, Position, timestamp_secs}, opcodes::ServerZoneIpcType, packet::{ CompressionType, ConnectionType, PacketSegment, PacketState, SegmentType, parse_packet,