mirror of
https://github.com/mat-1/azalea.git
synced 2025-08-02 14:26:04 +00:00
fix some clippy warnings
This commit is contained in:
parent
af28b0e57a
commit
1a961d968b
14 changed files with 7 additions and 20 deletions
|
@ -13,7 +13,7 @@ const MAX_STRING_LENGTH: u16 = 32767;
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
pub trait Writable {
|
pub trait Writable {
|
||||||
fn write_list<F, T>(&mut self, list: &Vec<T>, writer: F) -> Result<(), std::io::Error>
|
fn write_list<F, T>(&mut self, list: &[T], writer: F) -> Result<(), std::io::Error>
|
||||||
where
|
where
|
||||||
F: FnOnce(&mut Self, &T) -> Result<(), std::io::Error> + Copy,
|
F: FnOnce(&mut Self, &T) -> Result<(), std::io::Error> + Copy,
|
||||||
T: Sized,
|
T: Sized,
|
||||||
|
@ -49,7 +49,7 @@ pub trait Writable {
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl Writable for Vec<u8> {
|
impl Writable for Vec<u8> {
|
||||||
fn write_list<F, T>(&mut self, list: &Vec<T>, writer: F) -> Result<(), std::io::Error>
|
fn write_list<F, T>(&mut self, list: &[T], writer: F) -> Result<(), std::io::Error>
|
||||||
where
|
where
|
||||||
F: FnOnce(&mut Self, &T) -> Result<(), std::io::Error> + Copy,
|
F: FnOnce(&mut Self, &T) -> Result<(), std::io::Error> + Copy,
|
||||||
Self: Sized,
|
Self: Sized,
|
||||||
|
@ -215,7 +215,7 @@ where
|
||||||
}
|
}
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
return 5;
|
5
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_varlong_size(&mut self, value: i32) -> u8 {
|
fn get_varlong_size(&mut self, value: i32) -> u8 {
|
||||||
|
@ -225,7 +225,7 @@ where
|
||||||
}
|
}
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
return 10;
|
10
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn read_byte_array(&mut self) -> Result<Vec<u8>, String> {
|
async fn read_byte_array(&mut self) -> Result<Vec<u8>, String> {
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
use super::GamePacket;
|
use super::GamePacket;
|
||||||
use crate::mc_buf::{Readable, Writable};
|
use crate::mc_buf::{Readable, Writable};
|
||||||
use azalea_core::{game_type::GameType, resource_location::ResourceLocation};
|
use azalea_core::{game_type::GameType, resource_location::ResourceLocation};
|
||||||
use tokio::io::AsyncReadExt;
|
|
||||||
|
|
||||||
#[derive(Clone, Debug)]
|
#[derive(Clone, Debug)]
|
||||||
pub struct ClientboundLoginPacket {
|
pub struct ClientboundLoginPacket {
|
||||||
|
|
|
@ -3,7 +3,6 @@ pub mod clientbound_login_packet;
|
||||||
use super::ProtocolPacket;
|
use super::ProtocolPacket;
|
||||||
use crate::connect::PacketFlow;
|
use crate::connect::PacketFlow;
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use tokio::io::BufReader;
|
|
||||||
|
|
||||||
#[derive(Clone, Debug)]
|
#[derive(Clone, Debug)]
|
||||||
pub enum GamePacket
|
pub enum GamePacket
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
use std::hash::Hash;
|
use std::hash::Hash;
|
||||||
|
|
||||||
use tokio::io::BufReader;
|
|
||||||
|
|
||||||
use crate::{mc_buf::Writable, packets::ConnectionProtocol};
|
use crate::{mc_buf::Writable, packets::ConnectionProtocol};
|
||||||
|
|
||||||
use super::HandshakePacket;
|
use super::HandshakePacket;
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
pub mod client_intention_packet;
|
pub mod client_intention_packet;
|
||||||
|
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use tokio::io::BufReader;
|
|
||||||
|
|
||||||
use crate::connect::PacketFlow;
|
use crate::connect::PacketFlow;
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@ use super::LoginPacket;
|
||||||
use crate::mc_buf::{Readable, Writable};
|
use crate::mc_buf::{Readable, Writable};
|
||||||
use azalea_auth::game_profile::GameProfile;
|
use azalea_auth::game_profile::GameProfile;
|
||||||
use azalea_core::serializable_uuid::SerializableUuid;
|
use azalea_core::serializable_uuid::SerializableUuid;
|
||||||
use tokio::io::BufReader;
|
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
#[derive(Clone, Debug)]
|
#[derive(Clone, Debug)]
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
use std::hash::Hash;
|
use std::hash::Hash;
|
||||||
use tokio::io::BufReader;
|
|
||||||
|
|
||||||
use crate::mc_buf::Readable;
|
use crate::mc_buf::Readable;
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
use std::hash::Hash;
|
use std::hash::Hash;
|
||||||
use tokio::io::BufReader;
|
|
||||||
|
|
||||||
use crate::mc_buf::{Readable, Writable};
|
use crate::mc_buf::{Readable, Writable};
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
use std::hash::Hash;
|
use std::hash::Hash;
|
||||||
use tokio::io::BufReader;
|
|
||||||
|
|
||||||
use crate::mc_buf::Writable;
|
use crate::mc_buf::Writable;
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,6 @@ pub mod login;
|
||||||
pub mod status;
|
pub mod status;
|
||||||
|
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use tokio::io::BufReader;
|
|
||||||
|
|
||||||
use crate::connect::PacketFlow;
|
use crate::connect::PacketFlow;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
use azalea_chat::component::Component;
|
use azalea_chat::component::Component;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use serde_json::Value;
|
use serde_json::Value;
|
||||||
use tokio::io::BufReader;
|
|
||||||
|
|
||||||
use crate::mc_buf::Readable;
|
use crate::mc_buf::Readable;
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@ pub mod clientbound_status_response_packet;
|
||||||
pub mod serverbound_status_request_packet;
|
pub mod serverbound_status_request_packet;
|
||||||
|
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use tokio::io::BufReader;
|
|
||||||
|
|
||||||
use crate::connect::PacketFlow;
|
use crate::connect::PacketFlow;
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
use std::hash::Hash;
|
use std::hash::Hash;
|
||||||
use tokio::io::BufReader;
|
|
||||||
|
|
||||||
use super::StatusPacket;
|
use super::StatusPacket;
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ where
|
||||||
|
|
||||||
Ok(buf)
|
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
|
n, compression_threshold
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
if n > MAXIMUM_UNCOMPRESSED_LENGTH.into() {
|
if n > MAXIMUM_UNCOMPRESSED_LENGTH {
|
||||||
return Err(format!(
|
return Err(format!(
|
||||||
"Badly compressed packet - size of {} is larger than protocol maximum of {}",
|
"Badly compressed packet - size of {} is larger than protocol maximum of {}",
|
||||||
n, MAXIMUM_UNCOMPRESSED_LENGTH
|
n, MAXIMUM_UNCOMPRESSED_LENGTH
|
||||||
|
@ -104,5 +104,5 @@ where
|
||||||
}
|
}
|
||||||
let packet = packet_decoder(&mut buf.as_slice(), flow).await?;
|
let packet = packet_decoder(&mut buf.as_slice(), flow).await?;
|
||||||
|
|
||||||
return Ok(packet);
|
Ok(packet)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue