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

3 files changed, 17 insertions, 19 deletions

diff --git a/azalea-world/Cargo.toml b/azalea-world/Cargo.toml
index b208fe12..c69bff4c 100644
--- a/azalea-world/Cargo.toml
+++ b/azalea-world/Cargo.toml
@@ -9,28 +9,26 @@ version = "0.10.3+mc1.21.1"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-simdnbt = "0.6"
 azalea-block = { path = "../azalea-block", default-features = false, version = "0.10.0" }
 azalea-buf = { path = "../azalea-buf", version = "0.10.0" }
-azalea-core = { path = "../azalea-core", version = "0.10.0", features = [
-	"bevy_ecs",
-] }
+azalea-core = { path = "../azalea-core", version = "0.10.0", features = ["bevy_ecs"] }
 azalea-registry = { path = "../azalea-registry", version = "0.10.0" }
-bevy_ecs = "0.13.0"
-derive_more = { version = "0.99.18", features = ["deref", "deref_mut"] }
-tracing = "0.1.40"
-nohash-hasher = "0.2.0"
-once_cell = "1.19.0"
-parking_lot = "^0.12.3"
-thiserror = "1.0.61"
-uuid = "1.9.1"
-serde_json = "1.0.120"
-serde = "1.0.203"
-rustc-hash = "2.0.0"
+bevy_ecs = { workspace = true }
+derive_more = { workspace = true, features = ["deref", "deref_mut"] }
+nohash-hasher = { workspace = true }
+#once_cell = { workspace = true }
+parking_lot = { workspace = true }
+rustc-hash = { workspace = true }
+#serde = { workspace = true }
+#serde_json = { workspace = true }
+simdnbt = { workspace = true }
+thiserror = { workspace = true }
+tracing = { workspace = true }
+#uuid = { workspace = true }
 
 [dev-dependencies]
 azalea-client = { path = "../azalea-client" }
-criterion = "0.5.1"
+criterion = { workspace = true }
 
 [[bench]]
 name = "chunks"
diff --git a/azalea-world/src/bit_storage.rs b/azalea-world/src/bit_storage.rs
index 0456d727..cf3ee7e4 100755
--- a/azalea-world/src/bit_storage.rs
+++ b/azalea-world/src/bit_storage.rs
@@ -119,7 +119,7 @@ impl BitStorage {
         let values_per_long = 64 / bits;
         let magic_index = values_per_long - 1;
         let (divide_mul, divide_add, divide_shift) = MAGIC[magic_index];
-        let calculated_length = (size + values_per_long - 1) / values_per_long;
+        let calculated_length = size.div_ceil(values_per_long);
 
         let mask = (1 << bits) - 1;
 
@@ -228,7 +228,7 @@ pub struct BitStorageIter<'a> {
     index: usize,
 }
 
-impl<'a> Iterator for BitStorageIter<'a> {
+impl Iterator for BitStorageIter<'_> {
     type Item = u64;
 
     fn next(&mut self) -> Option<Self::Item> {
diff --git a/azalea-world/src/find_blocks.rs b/azalea-world/src/find_blocks.rs
index 39f57eec..ff69dd2f 100644
--- a/azalea-world/src/find_blocks.rs
+++ b/azalea-world/src/find_blocks.rs
@@ -155,7 +155,7 @@ impl<'a> FindBlocks<'a> {
     }
 }
 
-impl<'a> Iterator for FindBlocks<'a> {
+impl Iterator for FindBlocks<'_> {
     type Item = BlockPos;
 
     fn next(&mut self) -> Option<Self::Item> {