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/src/nearest_entity.rs        | 2 +-
 azalea/src/pathfinder/simulation.rs | 3 +--
 azalea/src/swarm/mod.rs             | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'azalea/src')

diff --git a/azalea/src/nearest_entity.rs b/azalea/src/nearest_entity.rs
index 415c7266..867e3fe8 100644
--- a/azalea/src/nearest_entity.rs
+++ b/azalea/src/nearest_entity.rs
@@ -57,7 +57,7 @@ where
     >,
 }
 
-impl<'w, 's, 'a, F> EntityFinder<'w, 's, F>
+impl<'a, F> EntityFinder<'_, '_, F>
 where
     F: QueryFilter + 'static,
 {
diff --git a/azalea/src/pathfinder/simulation.rs b/azalea/src/pathfinder/simulation.rs
index a24a1acb..ae76896c 100644
--- a/azalea/src/pathfinder/simulation.rs
+++ b/azalea/src/pathfinder/simulation.rs
@@ -154,8 +154,7 @@ impl Simulation {
     pub fn is_mining(&self) -> bool {
         // return true if the component is present and Some
         self.get_component::<azalea_client::mining::MineBlockPos>()
-            .map(|c| *c)
-            .flatten()
+            .and_then(|c| *c)
             .is_some()
     }
 }
diff --git a/azalea/src/swarm/mod.rs b/azalea/src/swarm/mod.rs
index e9644799..31f018cf 100644
--- a/azalea/src/swarm/mod.rs
+++ b/azalea/src/swarm/mod.rs
@@ -562,7 +562,6 @@ pub type BoxSwarmHandleFn<SS> =
 ///     }
 ///     Ok(())
 /// }
-
 impl Swarm {
     /// Add a new account to the swarm. You can remove it later by calling
     /// [`Client::disconnect`].
-- 
cgit v1.2.3