From 93c7851edd39c151b43e6354ae76e1f1c1825105 Mon Sep 17 00:00:00 2001 From: michael-bailey Date: Thu, 19 Jan 2023 21:27:14 +0000 Subject: [PATCH] fixing lints --- server/src/network/connection/actor.rs | 16 +++++++--------- server/src/network/connection/messages.rs | 6 +----- server/src/rhai/rhai_manager.rs | 2 +- server/src/scripting/scriptable_server.rs | 15 +++------------ 4 files changed, 12 insertions(+), 27 deletions(-) diff --git a/server/src/network/connection/actor.rs b/server/src/network/connection/actor.rs index 461196a..cc10b54 100644 --- a/server/src/network/connection/actor.rs +++ b/server/src/network/connection/actor.rs @@ -1,9 +1,4 @@ -use std::{ - io::Write, - net::SocketAddr, - pin::Pin, - sync::{Arc, Weak}, -}; +use std::{io::Write, net::SocketAddr, pin::Pin, sync::Arc}; use actix::{ fut::wrap_future, @@ -14,7 +9,6 @@ use actix::{ AsyncContext, Context, Handler, - Running, SpawnHandle, WeakRecipient, }; @@ -135,7 +129,7 @@ impl Handler> for Connection { &mut self, msg: ObservableMessage, _ctx: &mut Self::Context, - ) -> >>::Result { + ) -> >>::Result{ use ObservableMessage::{Subscribe, Unsubscribe}; match msg { Subscribe(r) => { @@ -158,7 +152,11 @@ impl Handler> for Connection { impl Handler for Connection { type Result = (); - fn handle(&mut self, msg: ConnectionMessage, ctx: &mut Self::Context) -> Self::Result { + fn handle( + &mut self, + msg: ConnectionMessage, + ctx: &mut Self::Context, + ) -> Self::Result { use ConnectionMessage::{CloseConnection, SendData}; let writer = Arc::downgrade(&self.write_half); diff --git a/server/src/network/connection/messages.rs b/server/src/network/connection/messages.rs index 35912f2..56e9d07 100644 --- a/server/src/network/connection/messages.rs +++ b/server/src/network/connection/messages.rs @@ -1,10 +1,6 @@ use std::net::SocketAddr; -use actix::{Addr, Message, WeakAddr}; -use tokio::{ - io::BufReader, - net::{tcp::ReadHalf, TcpStream}, -}; +use actix::{Message, WeakAddr}; use crate::prelude::actors::Connection; diff --git a/server/src/rhai/rhai_manager.rs b/server/src/rhai/rhai_manager.rs index 1a7d0f7..cf1e75d 100644 --- a/server/src/rhai/rhai_manager.rs +++ b/server/src/rhai/rhai_manager.rs @@ -1,4 +1,4 @@ -use actix::{Actor, Addr, Context, WeakAddr}; +use actix::{Actor, Context, WeakAddr}; use rhai::{Engine, Scope}; use crate::{ diff --git a/server/src/scripting/scriptable_server.rs b/server/src/scripting/scriptable_server.rs index 9d2f5ee..02265b4 100644 --- a/server/src/scripting/scriptable_server.rs +++ b/server/src/scripting/scriptable_server.rs @@ -1,16 +1,7 @@ -use actix::{Addr, WeakAddr}; -use mlua::{Error, UserData, UserDataMethods, Value::Nil}; +use actix::WeakAddr; +use mlua::{Error, UserData, UserDataMethods}; -use crate::{ - scripting::{ - scriptable_client_manager::ScriptableClientManager, - scriptable_network_manager::ScriptableNetworkManager, - }, - server::{ - ServerDataResponse::{ClientManager, Name, NetworkManager, Owner}, - *, - }, -}; +use crate::server::{ServerDataResponse::Name, *}; #[derive(Clone)] pub(crate) struct ScriptableServer {