From 1a961d968b80b720ef2d3900c0b95e1c16a0089e Mon Sep 17 00:00:00 2001 From: mat Date: Sun, 26 Dec 2021 14:17:01 -0600 Subject: [PATCH] fix some clippy warnings --- azalea-protocol/src/mc_buf.rs | 8 ++++---- .../src/packets/game/clientbound_login_packet.rs | 1 - azalea-protocol/src/packets/game/mod.rs | 1 - .../src/packets/handshake/client_intention_packet.rs | 2 -- azalea-protocol/src/packets/handshake/mod.rs | 1 - .../src/packets/login/clientbound_game_profile_packet.rs | 1 - .../src/packets/login/clientbound_hello_packet.rs | 1 - .../packets/login/clientbound_login_compression_packet.rs | 1 - .../src/packets/login/serverbound_hello_packet.rs | 1 - azalea-protocol/src/packets/mod.rs | 1 - .../packets/status/clientbound_status_response_packet.rs | 1 - azalea-protocol/src/packets/status/mod.rs | 1 - .../packets/status/serverbound_status_request_packet.rs | 1 - azalea-protocol/src/read.rs | 6 +++--- 14 files changed, 7 insertions(+), 20 deletions(-) diff --git a/azalea-protocol/src/mc_buf.rs b/azalea-protocol/src/mc_buf.rs index 04857235..538fc212 100644 --- a/azalea-protocol/src/mc_buf.rs +++ b/azalea-protocol/src/mc_buf.rs @@ -13,7 +13,7 @@ const MAX_STRING_LENGTH: u16 = 32767; #[async_trait] pub trait Writable { - fn write_list(&mut self, list: &Vec, writer: F) -> Result<(), std::io::Error> + fn write_list(&mut self, list: &[T], writer: F) -> Result<(), std::io::Error> where F: FnOnce(&mut Self, &T) -> Result<(), std::io::Error> + Copy, T: Sized, @@ -49,7 +49,7 @@ pub trait Writable { #[async_trait] impl Writable for Vec { - fn write_list(&mut self, list: &Vec, writer: F) -> Result<(), std::io::Error> + fn write_list(&mut self, list: &[T], writer: F) -> Result<(), std::io::Error> where F: FnOnce(&mut Self, &T) -> Result<(), std::io::Error> + Copy, Self: Sized, @@ -215,7 +215,7 @@ where } return i; } - return 5; + 5 } fn get_varlong_size(&mut self, value: i32) -> u8 { @@ -225,7 +225,7 @@ where } return i; } - return 10; + 10 } async fn read_byte_array(&mut self) -> Result, String> { diff --git a/azalea-protocol/src/packets/game/clientbound_login_packet.rs b/azalea-protocol/src/packets/game/clientbound_login_packet.rs index 1b90ce14..9043fa1a 100644 --- a/azalea-protocol/src/packets/game/clientbound_login_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_login_packet.rs @@ -1,7 +1,6 @@ use super::GamePacket; use crate::mc_buf::{Readable, Writable}; use azalea_core::{game_type::GameType, resource_location::ResourceLocation}; -use tokio::io::AsyncReadExt; #[derive(Clone, Debug)] pub struct ClientboundLoginPacket { diff --git a/azalea-protocol/src/packets/game/mod.rs b/azalea-protocol/src/packets/game/mod.rs index 5697a0ad..00fa1d75 100644 --- a/azalea-protocol/src/packets/game/mod.rs +++ b/azalea-protocol/src/packets/game/mod.rs @@ -3,7 +3,6 @@ pub mod clientbound_login_packet; use super::ProtocolPacket; use crate::connect::PacketFlow; use async_trait::async_trait; -use tokio::io::BufReader; #[derive(Clone, Debug)] pub enum GamePacket diff --git a/azalea-protocol/src/packets/handshake/client_intention_packet.rs b/azalea-protocol/src/packets/handshake/client_intention_packet.rs index 5b50c7cc..939a695e 100644 --- a/azalea-protocol/src/packets/handshake/client_intention_packet.rs +++ b/azalea-protocol/src/packets/handshake/client_intention_packet.rs @@ -1,7 +1,5 @@ use std::hash::Hash; -use tokio::io::BufReader; - use crate::{mc_buf::Writable, packets::ConnectionProtocol}; use super::HandshakePacket; diff --git a/azalea-protocol/src/packets/handshake/mod.rs b/azalea-protocol/src/packets/handshake/mod.rs index 70e1a90d..1d753645 100644 --- a/azalea-protocol/src/packets/handshake/mod.rs +++ b/azalea-protocol/src/packets/handshake/mod.rs @@ -1,7 +1,6 @@ pub mod client_intention_packet; use async_trait::async_trait; -use tokio::io::BufReader; use crate::connect::PacketFlow; diff --git a/azalea-protocol/src/packets/login/clientbound_game_profile_packet.rs b/azalea-protocol/src/packets/login/clientbound_game_profile_packet.rs index da51f115..1a752c1a 100644 --- a/azalea-protocol/src/packets/login/clientbound_game_profile_packet.rs +++ b/azalea-protocol/src/packets/login/clientbound_game_profile_packet.rs @@ -2,7 +2,6 @@ use super::LoginPacket; use crate::mc_buf::{Readable, Writable}; use azalea_auth::game_profile::GameProfile; use azalea_core::serializable_uuid::SerializableUuid; -use tokio::io::BufReader; use uuid::Uuid; #[derive(Clone, Debug)] diff --git a/azalea-protocol/src/packets/login/clientbound_hello_packet.rs b/azalea-protocol/src/packets/login/clientbound_hello_packet.rs index 46ca1301..e0b865be 100644 --- a/azalea-protocol/src/packets/login/clientbound_hello_packet.rs +++ b/azalea-protocol/src/packets/login/clientbound_hello_packet.rs @@ -1,5 +1,4 @@ use std::hash::Hash; -use tokio::io::BufReader; use crate::mc_buf::Readable; diff --git a/azalea-protocol/src/packets/login/clientbound_login_compression_packet.rs b/azalea-protocol/src/packets/login/clientbound_login_compression_packet.rs index e5009985..af355192 100644 --- a/azalea-protocol/src/packets/login/clientbound_login_compression_packet.rs +++ b/azalea-protocol/src/packets/login/clientbound_login_compression_packet.rs @@ -1,5 +1,4 @@ use std::hash::Hash; -use tokio::io::BufReader; use crate::mc_buf::{Readable, Writable}; diff --git a/azalea-protocol/src/packets/login/serverbound_hello_packet.rs b/azalea-protocol/src/packets/login/serverbound_hello_packet.rs index 011cc590..0039cbce 100644 --- a/azalea-protocol/src/packets/login/serverbound_hello_packet.rs +++ b/azalea-protocol/src/packets/login/serverbound_hello_packet.rs @@ -1,5 +1,4 @@ use std::hash::Hash; -use tokio::io::BufReader; use crate::mc_buf::Writable; diff --git a/azalea-protocol/src/packets/mod.rs b/azalea-protocol/src/packets/mod.rs index 08c94509..e065b65c 100644 --- a/azalea-protocol/src/packets/mod.rs +++ b/azalea-protocol/src/packets/mod.rs @@ -4,7 +4,6 @@ pub mod login; pub mod status; use async_trait::async_trait; -use tokio::io::BufReader; use crate::connect::PacketFlow; diff --git a/azalea-protocol/src/packets/status/clientbound_status_response_packet.rs b/azalea-protocol/src/packets/status/clientbound_status_response_packet.rs index 35f913ff..38270ad1 100644 --- a/azalea-protocol/src/packets/status/clientbound_status_response_packet.rs +++ b/azalea-protocol/src/packets/status/clientbound_status_response_packet.rs @@ -1,7 +1,6 @@ use azalea_chat::component::Component; use serde::Deserialize; use serde_json::Value; -use tokio::io::BufReader; use crate::mc_buf::Readable; diff --git a/azalea-protocol/src/packets/status/mod.rs b/azalea-protocol/src/packets/status/mod.rs index 9531111a..6383bae8 100644 --- a/azalea-protocol/src/packets/status/mod.rs +++ b/azalea-protocol/src/packets/status/mod.rs @@ -2,7 +2,6 @@ pub mod clientbound_status_response_packet; pub mod serverbound_status_request_packet; use async_trait::async_trait; -use tokio::io::BufReader; use crate::connect::PacketFlow; diff --git a/azalea-protocol/src/packets/status/serverbound_status_request_packet.rs b/azalea-protocol/src/packets/status/serverbound_status_request_packet.rs index dce9b93a..3a25ac42 100644 --- a/azalea-protocol/src/packets/status/serverbound_status_request_packet.rs +++ b/azalea-protocol/src/packets/status/serverbound_status_request_packet.rs @@ -1,5 +1,4 @@ use std::hash::Hash; -use tokio::io::BufReader; use super::StatusPacket; diff --git a/azalea-protocol/src/read.rs b/azalea-protocol/src/read.rs index 3d6a41d6..ed36d6b6 100644 --- a/azalea-protocol/src/read.rs +++ b/azalea-protocol/src/read.rs @@ -19,7 +19,7 @@ where Ok(buf) } - Err(e) => Err("length wider than 21-bit".to_string()), + Err(_) => Err("length wider than 21-bit".to_string()), } } @@ -66,7 +66,7 @@ where n, compression_threshold )); } - if n > MAXIMUM_UNCOMPRESSED_LENGTH.into() { + if n > MAXIMUM_UNCOMPRESSED_LENGTH { return Err(format!( "Badly compressed packet - size of {} is larger than protocol maximum of {}", n, MAXIMUM_UNCOMPRESSED_LENGTH @@ -104,5 +104,5 @@ where } let packet = packet_decoder(&mut buf.as_slice(), flow).await?; - return Ok(packet); + Ok(packet) }