From dfdc3144b61b6750ad62fb493b7c00c6c820c90b Mon Sep 17 00:00:00 2001
From: Shayne Hartford <shaybox@shaybox.com>
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 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'azalea-protocol/src/lib.rs')

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
-- 
cgit v1.2.3