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

4 files changed, 24 insertions, 26 deletions

diff --git a/azalea/Cargo.toml b/azalea/Cargo.toml
index 55749888..2e2dd345 100644
--- a/azalea/Cargo.toml
+++ b/azalea/Cargo.toml
@@ -12,8 +12,8 @@ pre-release-replacements = [
 ]
 
 [dependencies]
-anyhow = "^1.0.86"
-async-trait = "0.1.80"
+anyhow = { workspace = true }
+#async-trait = { workspace = true }
 azalea-auth = { version = "0.10.0", path = "../azalea-auth" }
 azalea-block = { version = "0.10.0", path = "../azalea-block" }
 azalea-brigadier = { version = "0.10.0", path = "../azalea-brigadier" }
@@ -27,28 +27,28 @@ azalea-physics = { version = "0.10.0", path = "../azalea-physics" }
 azalea-protocol = { version = "0.10.0", path = "../azalea-protocol" }
 azalea-registry = { version = "0.10.0", path = "../azalea-registry" }
 azalea-world = { version = "0.10.0", path = "../azalea-world" }
-bevy_app = "0.13.0"
-bevy_ecs = "0.13.0"
-bevy_log = "0.13.0"
-bevy_tasks = { version = "0.13.0", features = ["multi-threaded"] }
-bevy_time = "0.13.0"
-derive_more = { version = "0.99.18", features = ["deref", "deref_mut"] }
-futures = "0.3.30"
-futures-lite = "2.3.0"
-nohash-hasher = "0.2.0"
-num-traits = "0.2.19"
-parking_lot = { version = "^0.12.3", features = ["deadlock_detection"] }
-priority-queue = "2.0.3"
-rustc-hash = "2.0.0"
-serde = { version = "1", optional = true }
-thiserror = "^1.0.61"
-tokio = "^1.38.0"
-tracing = "0.1.40"
-uuid = "1.9.1"
+bevy_app = { workspace = true }
+bevy_ecs = { workspace = true }
+bevy_log = { workspace = true }
+bevy_tasks = { workspace = true, features = ["multi-threaded"] }
+#bevy_time = { workspace = true }
+derive_more = { workspace = true, features = ["deref", "deref_mut"] }
+futures = { workspace = true }
+futures-lite = { workspace = true }
+nohash-hasher = { workspace = true }
+num-traits = { workspace = true }
+parking_lot = { workspace = true, features = ["deadlock_detection"] }
+priority-queue = { workspace = true }
+rustc-hash = { workspace = true }
+serde = { workspace = true, optional = true }
+thiserror = { workspace = true }
+tokio = { workspace = true }
+tracing = { workspace = true }
+uuid = { workspace = true }
 
 [dev-dependencies]
-criterion = "0.5.1"
-rand = "0.8.5"
+criterion = { workspace = true }
+rand = { workspace = true }
 
 [features]
 default = ["log", "serde"]
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`].