From 298389a10a97683876ef3687d5d8bdd08dd77d3d Mon Sep 17 00:00:00 2001 From: lukas0008 Date: Wed, 7 Aug 2024 17:08:13 +0200 Subject: [PATCH] Clippy + fmt --- pumpkin-protocol/src/bytebuf/deserializer.rs | 62 ++++++++----------- pumpkin-protocol/src/bytebuf/mod.rs | 5 +- .../src/server/config/s_client_information.rs | 2 +- .../src/server/config/s_known_packs.rs | 2 +- .../src/server/config/s_plugin_message.rs | 2 +- .../src/server/login/s_login_response.rs | 2 - .../src/server/login/s_login_start.rs | 2 +- pumpkin-protocol/src/server/play/mod.rs | 4 +- .../src/server/play/s_chat_command.rs | 4 -- .../src/server/play/s_confirm_teleport.rs | 4 +- .../src/server/play/s_player_position.rs | 4 -- .../server/play/s_player_position_rotation.rs | 16 ++--- .../src/server/play/s_player_rotation.rs | 4 -- pumpkin-protocol/src/server/status/mod.rs | 2 - pumpkin/src/client/mod.rs | 50 ++++++++------- pumpkin/src/main.rs | 14 +---- 16 files changed, 75 insertions(+), 104 deletions(-) diff --git a/pumpkin-protocol/src/bytebuf/deserializer.rs b/pumpkin-protocol/src/bytebuf/deserializer.rs index 839eb7912..c2d96839f 100644 --- a/pumpkin-protocol/src/bytebuf/deserializer.rs +++ b/pumpkin-protocol/src/bytebuf/deserializer.rs @@ -1,10 +1,8 @@ -use std::{error, fmt::Display}; +use std::fmt::Display; -use serde::de::{self, DeserializeOwned, DeserializeSeed, SeqAccess}; +use serde::de::{self, DeserializeSeed, SeqAccess}; use thiserror::Error; -use crate::VarInt; - use super::ByteBuffer; pub struct Deserializer<'a> { @@ -34,7 +32,7 @@ impl<'a> Deserializer<'a> { impl<'a, 'de> de::Deserializer<'de> for Deserializer<'a> { type Error = DeserializerError; - fn deserialize_any(self, visitor: V) -> Result + fn deserialize_any(self, _visitor: V) -> Result where V: de::Visitor<'de>, { @@ -43,7 +41,7 @@ impl<'a, 'de> de::Deserializer<'de> for Deserializer<'a> { ) } - fn deserialize_bool(mut self, visitor: V) -> Result + fn deserialize_bool(self, visitor: V) -> Result where V: de::Visitor<'de>, { @@ -120,7 +118,7 @@ impl<'a, 'de> de::Deserializer<'de> for Deserializer<'a> { visitor.visit_f64(self.inner.get_f64()) } - fn deserialize_char(self, visitor: V) -> Result + fn deserialize_char(self, _visitor: V) -> Result where V: de::Visitor<'de>, { @@ -131,10 +129,7 @@ impl<'a, 'de> de::Deserializer<'de> for Deserializer<'a> { where V: de::Visitor<'de>, { - let string = self - .inner - .get_string() - .map_err(|e| DeserializerError::Stdio(e))?; + let string = self.inner.get_string().map_err(DeserializerError::Stdio)?; visitor.visit_str(&string) } @@ -142,35 +137,32 @@ impl<'a, 'de> de::Deserializer<'de> for Deserializer<'a> { where V: de::Visitor<'de>, { - let string = self - .inner - .get_string() - .map_err(|e| DeserializerError::Stdio(e))?; + let string = self.inner.get_string().map_err(DeserializerError::Stdio)?; visitor.visit_str(&string) } - fn deserialize_bytes(self, visitor: V) -> Result + fn deserialize_bytes(self, _visitor: V) -> Result where V: de::Visitor<'de>, { unimplemented!() } - fn deserialize_byte_buf(self, visitor: V) -> Result + fn deserialize_byte_buf(self, _visitor: V) -> Result where V: de::Visitor<'de>, { unimplemented!() } - fn deserialize_option(self, visitor: V) -> Result + fn deserialize_option(self, _visitor: V) -> Result where V: de::Visitor<'de>, { unimplemented!() } - fn deserialize_unit(self, visitor: V) -> Result + fn deserialize_unit(self, _visitor: V) -> Result where V: de::Visitor<'de>, { @@ -179,8 +171,8 @@ impl<'a, 'de> de::Deserializer<'de> for Deserializer<'a> { fn deserialize_unit_struct( self, - name: &'static str, - visitor: V, + _name: &'static str, + _visitor: V, ) -> Result where V: de::Visitor<'de>, @@ -190,8 +182,8 @@ impl<'a, 'de> de::Deserializer<'de> for Deserializer<'a> { fn deserialize_newtype_struct( self, - name: &'static str, - visitor: V, + _name: &'static str, + _visitor: V, ) -> Result where V: de::Visitor<'de>, @@ -217,7 +209,7 @@ impl<'a, 'de> de::Deserializer<'de> for Deserializer<'a> { let value = DeserializeSeed::deserialize( seed, Deserializer { - inner: &mut self.deserializer.inner, + inner: self.deserializer.inner, }, )?; Ok(Some(value)) @@ -252,7 +244,7 @@ impl<'a, 'de> de::Deserializer<'de> for Deserializer<'a> { let value = DeserializeSeed::deserialize( seed, Deserializer { - inner: &mut self.deserializer.inner, + inner: self.deserializer.inner, }, )?; Ok(Some(value)) @@ -272,9 +264,9 @@ impl<'a, 'de> de::Deserializer<'de> for Deserializer<'a> { fn deserialize_tuple_struct( self, - name: &'static str, - len: usize, - visitor: V, + _name: &'static str, + _len: usize, + _visitor: V, ) -> Result where V: de::Visitor<'de>, @@ -282,7 +274,7 @@ impl<'a, 'de> de::Deserializer<'de> for Deserializer<'a> { unimplemented!() } - fn deserialize_map(self, visitor: V) -> Result + fn deserialize_map(self, _visitor: V) -> Result where V: de::Visitor<'de>, { @@ -291,7 +283,7 @@ impl<'a, 'de> de::Deserializer<'de> for Deserializer<'a> { fn deserialize_struct( self, - name: &'static str, + _name: &'static str, fields: &'static [&'static str], visitor: V, ) -> Result @@ -303,9 +295,9 @@ impl<'a, 'de> de::Deserializer<'de> for Deserializer<'a> { fn deserialize_enum( self, - name: &'static str, - variants: &'static [&'static str], - visitor: V, + _name: &'static str, + _variants: &'static [&'static str], + _visitor: V, ) -> Result where V: de::Visitor<'de>, @@ -313,14 +305,14 @@ impl<'a, 'de> de::Deserializer<'de> for Deserializer<'a> { unimplemented!() } - fn deserialize_identifier(self, visitor: V) -> Result + fn deserialize_identifier(self, _visitor: V) -> Result where V: de::Visitor<'de>, { unimplemented!() } - fn deserialize_ignored_any(self, visitor: V) -> Result + fn deserialize_ignored_any(self, _visitor: V) -> Result where V: de::Visitor<'de>, { diff --git a/pumpkin-protocol/src/bytebuf/mod.rs b/pumpkin-protocol/src/bytebuf/mod.rs index 320dbd55a..c070d4cfa 100644 --- a/pumpkin-protocol/src/bytebuf/mod.rs +++ b/pumpkin-protocol/src/bytebuf/mod.rs @@ -308,7 +308,10 @@ impl ByteBuffer { mod test { use serde::{Deserialize, Serialize}; - use crate::{bytebuf::{deserializer, serializer, ByteBuffer}, VarInt}; + use crate::{ + bytebuf::{deserializer, serializer, ByteBuffer}, + VarInt, + }; #[test] fn test_i32_reserialize() { diff --git a/pumpkin-protocol/src/server/config/s_client_information.rs b/pumpkin-protocol/src/server/config/s_client_information.rs index 9e2e9c27a..b5d2cdf73 100644 --- a/pumpkin-protocol/src/server/config/s_client_information.rs +++ b/pumpkin-protocol/src/server/config/s_client_information.rs @@ -1,6 +1,6 @@ use pumpkin_macros::packet; -use crate::{bytebuf::ByteBuffer, Identifier, ServerPacket, VarInt}; +use crate::VarInt; #[derive(serde::Deserialize)] #[packet(0x00)] diff --git a/pumpkin-protocol/src/server/config/s_known_packs.rs b/pumpkin-protocol/src/server/config/s_known_packs.rs index 61fa834af..48670f0b5 100644 --- a/pumpkin-protocol/src/server/config/s_known_packs.rs +++ b/pumpkin-protocol/src/server/config/s_known_packs.rs @@ -1,6 +1,6 @@ use pumpkin_macros::packet; -use crate::{bytebuf::ByteBuffer, Identifier, ServerPacket, VarInt}; +use crate::VarInt; #[derive(serde::Deserialize)] #[packet(0x07)] diff --git a/pumpkin-protocol/src/server/config/s_plugin_message.rs b/pumpkin-protocol/src/server/config/s_plugin_message.rs index 8155e1d99..19e06c853 100644 --- a/pumpkin-protocol/src/server/config/s_plugin_message.rs +++ b/pumpkin-protocol/src/server/config/s_plugin_message.rs @@ -2,7 +2,7 @@ use pumpkin_macros::packet; use crate::{ bytebuf::{ByteBuffer, DeserializerError}, - Identifier, ServerPacket, VarInt, + Identifier, ServerPacket, }; #[packet(0x02)] diff --git a/pumpkin-protocol/src/server/login/s_login_response.rs b/pumpkin-protocol/src/server/login/s_login_response.rs index cccafefa0..d1f302327 100644 --- a/pumpkin-protocol/src/server/login/s_login_response.rs +++ b/pumpkin-protocol/src/server/login/s_login_response.rs @@ -1,7 +1,5 @@ use pumpkin_macros::packet; -use crate::{bytebuf::ByteBuffer, ServerPacket, VarInt}; - // Acknowledgement to the Login Success packet sent to the server. #[derive(serde::Deserialize)] #[packet(0x03)] diff --git a/pumpkin-protocol/src/server/login/s_login_start.rs b/pumpkin-protocol/src/server/login/s_login_start.rs index 95303a100..96bbbac70 100644 --- a/pumpkin-protocol/src/server/login/s_login_start.rs +++ b/pumpkin-protocol/src/server/login/s_login_start.rs @@ -2,7 +2,7 @@ use pumpkin_macros::packet; use crate::{ bytebuf::{ByteBuffer, DeserializerError}, - ServerPacket, VarInt, + ServerPacket, }; #[packet(0x00)] diff --git a/pumpkin-protocol/src/server/play/mod.rs b/pumpkin-protocol/src/server/play/mod.rs index 7c227d8cc..681604145 100644 --- a/pumpkin-protocol/src/server/play/mod.rs +++ b/pumpkin-protocol/src/server/play/mod.rs @@ -1,12 +1,12 @@ -mod s_confirm_teleport; mod s_chat_command; +mod s_confirm_teleport; mod s_player_command; mod s_player_position; mod s_player_position_rotation; mod s_player_rotation; -pub use s_confirm_teleport::*; pub use s_chat_command::*; +pub use s_confirm_teleport::*; pub use s_player_command::*; pub use s_player_position::*; pub use s_player_position_rotation::*; diff --git a/pumpkin-protocol/src/server/play/s_chat_command.rs b/pumpkin-protocol/src/server/play/s_chat_command.rs index 3b6b51aa1..31d07698f 100644 --- a/pumpkin-protocol/src/server/play/s_chat_command.rs +++ b/pumpkin-protocol/src/server/play/s_chat_command.rs @@ -1,9 +1,5 @@ -use num_derive::FromPrimitive; -use num_traits::FromPrimitive; use pumpkin_macros::packet; -use crate::{ServerPacket, VarInt}; - #[derive(serde::Deserialize)] #[packet(0x04)] pub struct SChatCommand { diff --git a/pumpkin-protocol/src/server/play/s_confirm_teleport.rs b/pumpkin-protocol/src/server/play/s_confirm_teleport.rs index 8f7da152b..2ac360011 100644 --- a/pumpkin-protocol/src/server/play/s_confirm_teleport.rs +++ b/pumpkin-protocol/src/server/play/s_confirm_teleport.rs @@ -1,8 +1,6 @@ -use num_derive::FromPrimitive; -use num_traits::FromPrimitive; use pumpkin_macros::packet; -use crate::{ServerPacket, VarInt}; +use crate::VarInt; #[derive(serde::Deserialize)] #[packet(0x00)] diff --git a/pumpkin-protocol/src/server/play/s_player_position.rs b/pumpkin-protocol/src/server/play/s_player_position.rs index 953883e31..dd9f6cd6f 100644 --- a/pumpkin-protocol/src/server/play/s_player_position.rs +++ b/pumpkin-protocol/src/server/play/s_player_position.rs @@ -1,9 +1,5 @@ -use num_derive::FromPrimitive; -use num_traits::FromPrimitive; use pumpkin_macros::packet; -use crate::{ServerPacket, VarInt}; - #[derive(serde::Deserialize)] #[packet(0x1A)] pub struct SPlayerPosition { diff --git a/pumpkin-protocol/src/server/play/s_player_position_rotation.rs b/pumpkin-protocol/src/server/play/s_player_position_rotation.rs index 86574c397..1239c22f2 100644 --- a/pumpkin-protocol/src/server/play/s_player_position_rotation.rs +++ b/pumpkin-protocol/src/server/play/s_player_position_rotation.rs @@ -1,16 +1,12 @@ -use num_derive::FromPrimitive; -use num_traits::FromPrimitive; use pumpkin_macros::packet; -use crate::{ServerPacket, VarInt}; - #[derive(serde::Deserialize)] #[packet(0x1B)] pub struct SPlayerPositionRotation { - pub x: f64, - pub feet_y: f64, - pub z: f64, - pub yaw: f32, - pub pitch: f32, - pub ground: bool, + pub x: f64, + pub feet_y: f64, + pub z: f64, + pub yaw: f32, + pub pitch: f32, + pub ground: bool, } diff --git a/pumpkin-protocol/src/server/play/s_player_rotation.rs b/pumpkin-protocol/src/server/play/s_player_rotation.rs index 03f7f3408..6f6827e5d 100644 --- a/pumpkin-protocol/src/server/play/s_player_rotation.rs +++ b/pumpkin-protocol/src/server/play/s_player_rotation.rs @@ -1,9 +1,5 @@ -use num_derive::FromPrimitive; -use num_traits::FromPrimitive; use pumpkin_macros::packet; -use crate::{ServerPacket, VarInt}; - #[derive(serde::Deserialize)] #[packet(0x1C)] pub struct SPlayerRotation { diff --git a/pumpkin-protocol/src/server/status/mod.rs b/pumpkin-protocol/src/server/status/mod.rs index b73332ff2..fb6b04ab5 100644 --- a/pumpkin-protocol/src/server/status/mod.rs +++ b/pumpkin-protocol/src/server/status/mod.rs @@ -1,5 +1,3 @@ -use crate::{bytebuf::ByteBuffer, ServerPacket, VarInt}; - mod s_ping_request; mod s_status_request; diff --git a/pumpkin/src/client/mod.rs b/pumpkin/src/client/mod.rs index cce2a04b4..604248e3a 100644 --- a/pumpkin/src/client/mod.rs +++ b/pumpkin/src/client/mod.rs @@ -14,11 +14,15 @@ use authentication::GameProfile; use mio::{event::Event, net::TcpStream, Token}; use num_traits::ToPrimitive; use pumpkin_protocol::{ - bytebuf::packet_id::Packet, client::{ + bytebuf::packet_id::Packet, + client::{ config::CConfigDisconnect, login::CLoginDisconnect, play::{CGameEvent, CPlayDisconnect, CSyncPlayerPostion, CSystemChatMessge}, - }, packet_decoder::PacketDecoder, packet_encoder::PacketEncoder, server::{ + }, + packet_decoder::PacketDecoder, + packet_encoder::PacketEncoder, + server::{ config::{SAcknowledgeFinishConfig, SClientInformation, SKnownPacks, SPluginMessage}, handshake::SHandShake, login::{SEncryptionResponse, SLoginAcknowledged, SLoginPluginResponse, SLoginStart}, @@ -27,7 +31,9 @@ use pumpkin_protocol::{ SPlayerPositionRotation, SPlayerRotation, }, status::{SPingRequest, SStatusRequest}, - }, text::TextComponent, ClientPacket, ConnectionState, PacketError, RawPacket, ServerPacket + }, + text::TextComponent, + ClientPacket, ConnectionState, PacketError, RawPacket, ServerPacket, }; use std::io::Read; @@ -165,7 +171,9 @@ impl Client { let bytebuf = &mut packet.bytebuf; match self.connection_state { pumpkin_protocol::ConnectionState::HandShake => match packet.id.0 { - SHandShake::PACKET_ID => self.handle_handshake(server, SHandShake::read(bytebuf).unwrap()), + SHandShake::PACKET_ID => { + self.handle_handshake(server, SHandShake::read(bytebuf).unwrap()) + } _ => log::error!( "Failed to handle packet id {} while in Handshake state", packet.id.0 @@ -187,30 +195,29 @@ impl Client { SLoginStart::PACKET_ID => { self.handle_login_start(server, SLoginStart::read(bytebuf).unwrap()) } - SEncryptionResponse::PACKET_ID => { - self.handle_encryption_response(server, SEncryptionResponse::read(bytebuf).unwrap()) - } - SLoginPluginResponse::PACKET_ID => { - self.handle_plugin_response(server, SLoginPluginResponse::read(bytebuf).unwrap()) - } - SLoginAcknowledged::PACKET_ID => { - self.handle_login_acknowledged(server, SLoginAcknowledged::read(bytebuf).unwrap()) - } + SEncryptionResponse::PACKET_ID => self.handle_encryption_response( + server, + SEncryptionResponse::read(bytebuf).unwrap(), + ), + SLoginPluginResponse::PACKET_ID => self + .handle_plugin_response(server, SLoginPluginResponse::read(bytebuf).unwrap()), + SLoginAcknowledged::PACKET_ID => self + .handle_login_acknowledged(server, SLoginAcknowledged::read(bytebuf).unwrap()), _ => log::error!( "Failed to handle packet id {} while in Login state", packet.id.0 ), }, pumpkin_protocol::ConnectionState::Config => match packet.id.0 { - SClientInformation::PACKET_ID => { - self.handle_client_information(server, SClientInformation::read(bytebuf).unwrap()) - } + SClientInformation::PACKET_ID => self + .handle_client_information(server, SClientInformation::read(bytebuf).unwrap()), SPluginMessage::PACKET_ID => { self.handle_plugin_message(server, SPluginMessage::read(bytebuf).unwrap()) } - SAcknowledgeFinishConfig::PACKET_ID => { - self.handle_config_acknowledged(server, SAcknowledgeFinishConfig::read(bytebuf).unwrap()) - } + SAcknowledgeFinishConfig::PACKET_ID => self.handle_config_acknowledged( + server, + SAcknowledgeFinishConfig::read(bytebuf).unwrap(), + ), SKnownPacks::PACKET_ID => { self.handle_known_packs(server, SKnownPacks::read(bytebuf).unwrap()) } @@ -243,9 +250,8 @@ impl Client { SPlayerPosition::PACKET_ID => { self.handle_position(server, SPlayerPosition::read(bytebuf).unwrap()) } - SPlayerPositionRotation::PACKET_ID => { - self.handle_position_rotation(server, SPlayerPositionRotation::read(bytebuf).unwrap()) - } + SPlayerPositionRotation::PACKET_ID => self + .handle_position_rotation(server, SPlayerPositionRotation::read(bytebuf).unwrap()), SPlayerRotation::PACKET_ID => { self.handle_rotation(server, SPlayerRotation::read(bytebuf).unwrap()) } diff --git a/pumpkin/src/main.rs b/pumpkin/src/main.rs index 967e13622..711700f70 100644 --- a/pumpkin/src/main.rs +++ b/pumpkin/src/main.rs @@ -6,11 +6,7 @@ use client::Client; use commands::handle_command; use configuration::AdvancedConfiguration; -use std::{ - collections::HashMap, - rc::Rc, - thread, -}; +use std::{collections::HashMap, rc::Rc, thread}; use client::interrupted; use configuration::BasicConfiguration; @@ -64,10 +60,7 @@ fn main() -> io::Result<()> { let mut connections: HashMap>> = HashMap::new(); - let mut server = Server::new(( - basic_config, - advanced_configuration, - )); + let mut server = Server::new((basic_config, advanced_configuration)); log::info!("Started Server took {}ms", time.elapsed().as_millis()); log::info!("You now can connect to the server"); @@ -126,8 +119,7 @@ fn main() -> io::Result<()> { connection, addr, ))); - server - .add_client(rc_token, Rc::clone(&client)); + server.add_client(rc_token, Rc::clone(&client)); connections.insert(token, client); },