From dfdc3144b61b6750ad62fb493b7c00c6c820c90b Mon Sep 17 00:00:00 2001 From: Shayne Hartford Date: Sat, 23 Nov 2024 03:29:30 -0500 Subject: Update and merge the dependencies (#187) * Add rust rover to .gitignore * Fold dependency feature lists * Sort dependencies alphabetically * Update dependencies * Upgrade dependencies * Comment out unused dependencies * Nightly is broken right now :) * Fix conflict with derive_more * cargo autoinherit to merge dependencies * Fix clippy lints --- azalea-protocol/src/lib.rs | 2 +- azalea-protocol/src/read.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'azalea-protocol/src') diff --git a/azalea-protocol/src/lib.rs b/azalea-protocol/src/lib.rs index 0b2db1cf..1bbb80d4 100644 --- a/azalea-protocol/src/lib.rs +++ b/azalea-protocol/src/lib.rs @@ -40,7 +40,7 @@ pub struct ServerAddress { pub port: u16, } -impl<'a> TryFrom<&'a str> for ServerAddress { +impl TryFrom<&'_ str> for ServerAddress { type Error = String; /// Convert a Minecraft server address (host:port, the port is optional) to diff --git a/azalea-protocol/src/read.rs b/azalea-protocol/src/read.rs index 558e1072..67ea9aee 100755 --- a/azalea-protocol/src/read.rs +++ b/azalea-protocol/src/read.rs @@ -209,8 +209,8 @@ pub fn compression_decoder( /// The current protocol state must be passed as a generic. /// /// For the non-waiting version, see [`try_read_packet`]. -pub async fn read_packet<'a, P: ProtocolPacket + Debug, R>( - stream: &'a mut R, +pub async fn read_packet( + stream: &mut R, buffer: &mut BytesMut, compression_threshold: Option, cipher: &mut Option, @@ -242,8 +242,8 @@ where Ok(Some(packet)) } -pub async fn read_raw_packet<'a, R>( - stream: &'a mut R, +pub async fn read_raw_packet( + stream: &mut R, buffer: &mut BytesMut, compression_threshold: Option, // this has to be a &mut Option instead of an Option<&mut T> because -- cgit v1.2.3