From e591c22f48308cd66fa8ebdf26ab18e350e40df8 Mon Sep 17 00:00:00 2001 From: ghostlyzsh Date: Wed, 28 Jun 2023 22:00:12 -0500 Subject: [PATCH] cargo fix --- server/src/handler.rs | 14 +++++++------- server/src/main.rs | 4 ++-- server/src/manager.rs | 18 +++++++++--------- server/src/module.rs | 4 ++-- server/src/planet.rs | 2 +- server/src/timer.rs | 4 ++-- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/server/src/handler.rs b/server/src/handler.rs index a20a687ff2f074ff747a66cb9115e9a64aecf337..df82955c288fa700530be8f524c16b9d9e1165c2 100644 --- a/server/src/handler.rs +++ b/server/src/handler.rs @@ -3,15 +3,15 @@ use crate::entity::{get_entity_id, Entity, EntityHandler}; use crate::manager::{ ClientHandlerMessage, ClientManager, Player, PhysicsData, }; -use crate::module::{AttachedModule, ModuleTemplate, Module, Attachment}; +use crate::module::{AttachedModule, Module}; use crate::{recv, send, SCALE}; use async_std::net::TcpStream; use async_std::{channel::Receiver, sync::RwLock}; use async_tungstenite::WebSocketStream; use futures::stream::{SplitSink, SplitStream}; use futures::{FutureExt, SinkExt, StreamExt}; -use log::{debug, error, info, warn, trace}; -use nalgebra::{point, vector, Matrix, Vector2}; +use log::{error, info, warn}; +use nalgebra::{point, vector, Vector2}; use rand::Rng; use rapier2d_f64::prelude::{ Collider, ColliderBuilder, MassProperties, RigidBodyBuilder, RigidBodyType, Isometry, @@ -21,7 +21,7 @@ use starkingdoms_protocol::message_s2c::{ MessageS2CChat, MessageS2CGoodbye, MessageS2CHello, MessageS2CModulesUpdate, MessageS2CPlanetData, MessageS2CPlayersUpdate, MessageS2CPong, MessageS2CModuleAdd, MessageS2CModuleTreeUpdate, MessageS2CModuleRemove, }; -use starkingdoms_protocol::module::ModuleType; + use starkingdoms_protocol::state::State; use starkingdoms_protocol::{MessageC2S, MessageS2C, PROTOCOL_VERSION}; use std::error::Error; @@ -441,13 +441,13 @@ pub async fn handle_client( } } } - MessageC2S::MouseInput(p) => { + MessageC2S::MouseInput(_p) => { //debug!("[{}] player input: {:?}", remote_addr, p); } MessageC2S::ModuleDetach(p) => { let mut entities = entities.write().await; let mut data_handle = data.write().await; - let mut module: Option = None; + let module: Option; //debug!("[{}] detach: {:?}", remote_addr, p); //debug!("[{}] {:?}", remote_addr, entities.entities); @@ -481,7 +481,7 @@ pub async fn handle_client( send!(client_tx, msg).await?; } MessageC2S::ModuleGrabBegin(p) => { - if let Entity::Module(module) = entities.write().await.entities.get_mut(&p.module_id).unwrap() { + if let Entity::Module(_module) = entities.write().await.entities.get_mut(&p.module_id).unwrap() { //debug!("[{}] grab begin: {:?}, flags: {}", remote_addr, p, module.flags); } } diff --git a/server/src/main.rs b/server/src/main.rs index 862dfc0247413b8628bba4b5e545bfa05afe76f3..02212b8fe25104f229196d410c56804d7508a392 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -9,12 +9,12 @@ use async_std::sync::RwLock; use entity::EntityHandler; use futures::StreamExt; use lazy_static::lazy_static; -use log::{error, info, warn, Level, debug}; +use log::{error, info, warn, Level}; use manager::PhysicsData; use nalgebra::vector; use rapier2d_f64::prelude::{ BroadPhase, CCDSolver, ColliderSet, ImpulseJointSet, IntegrationParameters, IslandManager, - MultibodyJointSet, NarrowPhase, RigidBodySet, Real, + MultibodyJointSet, NarrowPhase, RigidBodySet, }; use serde::{Deserialize, Serialize}; use starkingdoms_protocol::PROTOCOL_VERSION; diff --git a/server/src/manager.rs b/server/src/manager.rs index c6463ba67b86d66190a5f4c3b80620464c91d6dd..80b68e7ad594e0b051195410ff49025f83c46d12 100644 --- a/server/src/manager.rs +++ b/server/src/manager.rs @@ -1,23 +1,23 @@ use async_std::channel::Sender; use async_std::sync::RwLock; -use log::debug; -use nalgebra::{point, vector}; + + use rapier2d_f64::na::Vector2; use rapier2d_f64::prelude::{ - BroadPhase, CCDSolver, ColliderBuilder, ColliderSet, FixedJointBuilder, ImpulseJointHandle, - ImpulseJointSet, IntegrationParameters, IslandManager, Isometry, MassProperties, - MultibodyJointSet, NarrowPhase, PhysicsPipeline, Real, RigidBodyBuilder, RigidBodyHandle, + BroadPhase, CCDSolver, ColliderSet, + ImpulseJointSet, IntegrationParameters, IslandManager, + MultibodyJointSet, NarrowPhase, PhysicsPipeline, RigidBodyHandle, RigidBodySet, }; use starkingdoms_protocol::api::APISavedPlayerData; -use starkingdoms_protocol::module::ModuleType; + use std::collections::HashMap; -use std::f64::consts::PI; + use std::net::SocketAddr; use std::sync::Arc; -use crate::entity::{get_entity_id, Entity, EntityHandler, EntityId}; -use crate::SCALE; +use crate::entity::{Entity, EntityHandler, EntityId}; + use crate::module::{Attachment, AttachedModule}; #[derive(Clone)] diff --git a/server/src/module.rs b/server/src/module.rs index d52646386176e37d86e71f1e879011d5013e61bb..e6a859ecb4aa56a44ccbd1887c8ad6a884e92d3a 100644 --- a/server/src/module.rs +++ b/server/src/module.rs @@ -1,7 +1,7 @@ use std::f64::consts::PI; -use log::debug; -use nalgebra::{Vector2, point, vector, Isometry, Isometry2, Complex, Unit}; + +use nalgebra::{Vector2, point, vector, Isometry2, Unit}; use rapier2d_f64::prelude::{RigidBodyHandle, Real, MassProperties, ColliderBuilder, RigidBodyBuilder, FixedJointBuilder, ImpulseJointHandle, RigidBodySet}; use starkingdoms_protocol::module::ModuleType; diff --git a/server/src/planet.rs b/server/src/planet.rs index ca998c2ac517f78167d33d83f825fa980b841700..ee692c953947dd8939ba7d7c8b71076a08d7041a 100644 --- a/server/src/planet.rs +++ b/server/src/planet.rs @@ -1,4 +1,4 @@ -use log::debug; + use nalgebra::{vector, Vector2}; use rapier2d_f64::prelude::{ ColliderBuilder, ColliderSet, RigidBodyBuilder, RigidBodyHandle, RigidBodySet, diff --git a/server/src/timer.rs b/server/src/timer.rs index 1b95a51c5fca3c3311bcd29578e0d7502adc8f77..abf3aa1fb16dbfe86e587e91ab4eee3f03e525d8 100644 --- a/server/src/timer.rs +++ b/server/src/timer.rs @@ -12,11 +12,11 @@ use crate::{ }; use async_std::sync::RwLock; use async_std::task::sleep; -use log::{info, warn, debug}; +use log::{warn}; use nalgebra::{point, vector}; use rand::Rng; use rapier2d_f64::prelude::{ - ColliderBuilder, MassProperties, PhysicsPipeline, RigidBodyBuilder, RigidBodyHandle, + ColliderBuilder, MassProperties, PhysicsPipeline, RigidBodyBuilder, }; use starkingdoms_protocol::{module::ModuleType, planet::PlanetType, player::Player}; use std::{f64::consts::PI, sync::Arc, time::Duration};