From dfdc3144b61b6750ad62fb493b7c00c6c820c90b Mon Sep 17 00:00:00 2001 From: Shayne Hartford Date: Sat, 23 Nov 2024 03:29:30 -0500 Subject: [PATCH] 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 --- .gitignore | 7 +- Cargo.lock | 782 ++++++++++++------ Cargo.toml | 88 +- azalea-auth/Cargo.toml | 33 +- azalea-auth/src/auth.rs | 2 +- azalea-block/azalea-block-macros/Cargo.toml | 6 +- azalea-brigadier/Cargo.toml | 6 +- azalea-buf/Cargo.toml | 12 +- azalea-buf/azalea-buf-macros/Cargo.toml | 6 +- azalea-chat/Cargo.toml | 14 +- azalea-client/Cargo.toml | 50 +- azalea-client/src/client.rs | 1 - azalea-client/src/local_player.rs | 1 + azalea-client/src/raw_connection.rs | 1 - azalea-core/Cargo.toml | 16 +- azalea-crypto/Cargo.toml | 20 +- azalea-entity/Cargo.toml | 24 +- azalea-inventory/Cargo.toml | 10 +- .../azalea-inventory-macros/Cargo.toml | 6 +- azalea-language/Cargo.toml | 8 +- azalea-physics/Cargo.toml | 22 +- azalea-protocol/Cargo.toml | 65 +- .../azalea-protocol-macros/Cargo.toml | 6 +- azalea-protocol/src/lib.rs | 2 +- azalea-protocol/src/read.rs | 8 +- azalea-registry/Cargo.toml | 7 +- .../azalea-registry-macros/Cargo.toml | 6 +- azalea-world/Cargo.toml | 30 +- azalea-world/src/bit_storage.rs | 4 +- azalea-world/src/find_blocks.rs | 2 +- azalea/Cargo.toml | 44 +- azalea/src/nearest_entity.rs | 2 +- azalea/src/pathfinder/simulation.rs | 3 +- azalea/src/swarm/mod.rs | 1 - rust-toolchain | 2 +- 35 files changed, 791 insertions(+), 506 deletions(-) diff --git a/.gitignore b/.gitignore index 99c2e43e..c6cf1aef 100755 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ -/target -/doc -.vscode +.idea/ +.vscode/ +doc/ +target/ .cargo/config .cargo/config.toml diff --git a/Cargo.lock b/Cargo.lock index a0afb8c0..49336535 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 4 [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] @@ -52,9 +52,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.18" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" [[package]] name = "android_log-sys" @@ -70,9 +70,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ "anstyle", "anstyle-parse", @@ -85,43 +85,43 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "as-any" @@ -173,9 +173,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", @@ -184,16 +184,15 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "azalea" version = "0.10.3+mc1.21.1" dependencies = [ "anyhow", - "async-trait", "azalea-auth", "azalea-block", "azalea-brigadier", @@ -211,7 +210,6 @@ dependencies = [ "bevy_ecs", "bevy_log", "bevy_tasks", - "bevy_time", "criterion", "derive_more", "futures", @@ -223,7 +221,7 @@ dependencies = [ "rand", "rustc-hash 2.0.0", "serde", - "thiserror", + "thiserror 2.0.3", "tokio", "tracing", "uuid", @@ -239,13 +237,12 @@ dependencies = [ "chrono", "env_logger", "md-5", - "num-bigint", "once_cell", "reqwest", "rsa", "serde", "serde_json", - "thiserror", + "thiserror 2.0.3", "tokio", "tracing", "uuid", @@ -288,7 +285,7 @@ dependencies = [ "byteorder", "serde_json", "simdnbt", - "thiserror", + "thiserror 2.0.3", "tracing", "uuid", ] @@ -321,7 +318,6 @@ name = "azalea-client" version = "0.10.3+mc1.21.1" dependencies = [ "anyhow", - "async-trait", "azalea-auth", "azalea-block", "azalea-buf", @@ -340,17 +336,13 @@ dependencies = [ "bevy_tasks", "bevy_time", "derive_more", - "futures", "minecraft_folder_path", - "nohash-hasher", "once_cell", "parking_lot", "regex", "reqwest", - "serde", - "serde_json", "simdnbt", - "thiserror", + "thiserror 2.0.3", "tokio", "tracing", "uuid", @@ -366,10 +358,8 @@ dependencies = [ "nohash-hasher", "num-traits", "serde", - "serde_json", "simdnbt", "tracing", - "uuid", ] [[package]] @@ -407,7 +397,7 @@ dependencies = [ "nohash-hasher", "parking_lot", "simdnbt", - "thiserror", + "thiserror 2.0.3", "tracing", "uuid", ] @@ -455,12 +445,8 @@ dependencies = [ "azalea-world", "bevy_app", "bevy_ecs", - "bevy_time", - "nohash-hasher", "once_cell", "parking_lot", - "smallvec", - "tracing", "uuid", ] @@ -483,19 +469,17 @@ dependencies = [ "azalea-registry", "azalea-world", "bevy_ecs", - "byteorder", "bytes", "flate2", "futures", "futures-lite", - "futures-util", "log", "once_cell", "serde", "serde_json", "simdnbt", "socks5-impl", - "thiserror", + "thiserror 2.0.3", "tokio", "tokio-util", "tracing", @@ -528,7 +512,6 @@ dependencies = [ name = "azalea-registry-macros" version = "0.10.3+mc1.21.1" dependencies = [ - "proc-macro2", "quote", "syn", ] @@ -546,15 +529,11 @@ dependencies = [ "criterion", "derive_more", "nohash-hasher", - "once_cell", "parking_lot", "rustc-hash 2.0.0", - "serde", - "serde_json", "simdnbt", - "thiserror", + "thiserror 2.0.3", "tracing", - "uuid", ] [[package]] @@ -627,7 +606,7 @@ dependencies = [ "fixedbitset", "rustc-hash 1.1.0", "serde", - "thiserror", + "thiserror 1.0.69", "thread_local", ] @@ -703,7 +682,7 @@ dependencies = [ "glam", "serde", "smol_str", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -744,7 +723,7 @@ dependencies = [ "bevy_reflect", "bevy_utils", "crossbeam-channel", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -756,14 +735,14 @@ dependencies = [ "ahash", "bevy_utils_proc_macros", "getrandom", - "hashbrown", + "hashbrown 0.14.5", "nonmax", "petgraph", "smallvec", - "thiserror", + "thiserror 1.0.69", "tracing", "uuid", - "web-time", + "web-time 0.2.4", ] [[package]] @@ -800,9 +779,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.18.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" [[package]] name = "byteorder" @@ -812,9 +791,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "cast" @@ -824,9 +803,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.1.18" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" dependencies = [ "shlex", ] @@ -852,6 +831,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chrono" version = "0.4.38" @@ -901,18 +886,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.17" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" +checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.17" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" +checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" dependencies = [ "anstyle", "clap_lex", @@ -920,15 +905,15 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "concurrent-queue" @@ -955,17 +940,11 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -1084,14 +1063,21 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.18" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ - "convert_case", "proc-macro2", "quote", - "rustc_version", "syn", ] @@ -1106,6 +1092,17 @@ dependencies = [ "crypto-common", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "downcast-rs" version = "1.2.1" @@ -1192,9 +1189,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" [[package]] name = "fixedbitset" @@ -1204,9 +1201,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", @@ -1229,9 +1226,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -1244,9 +1241,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1254,15 +1251,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -1271,15 +1268,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" -version = "2.3.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1" dependencies = [ "fastrand", "futures-core", @@ -1290,9 +1287,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", @@ -1301,21 +1298,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -1354,9 +1351,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glam" @@ -1389,6 +1386,12 @@ dependencies = [ "serde", ] +[[package]] +name = "hashbrown" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" + [[package]] name = "heck" version = "0.5.0" @@ -1443,9 +1446,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "humantime" @@ -1455,9 +1458,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" dependencies = [ "bytes", "futures-channel", @@ -1492,9 +1495,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", @@ -1505,11 +1508,128 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", - "tower", "tower-service", "tracing", ] +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "idna" version = "0.4.0" @@ -1522,22 +1642,33 @@ dependencies = [ [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] name = "indexmap" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.1", ] [[package]] @@ -1551,9 +1682,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is-terminal" @@ -1583,15 +1714,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -1607,15 +1738,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.158" +version = "0.2.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "linked-hash-map" @@ -1623,6 +1754,12 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +[[package]] +name = "litemap" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" + [[package]] name = "lock_api" version = "0.4.12" @@ -1821,18 +1958,18 @@ dependencies = [ [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.20.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ea5043e58958ee56f3e15a90aee535795cd7dfd319846288d93c5b57d85cbe" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "oorandom" @@ -1903,31 +2040,11 @@ dependencies = [ "indexmap", ] -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -1995,9 +2112,9 @@ dependencies = [ [[package]] name = "priority-queue" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "560bcab673ff7f6ca9e270c17bf3affd8a05e3bd9207f123b0d45076fd8197e8" +checksum = "714c75db297bc88a63783ffc6ab9f830698a6705aa0201416931759ef4c8183d" dependencies = [ "autocfg", "equivalent", @@ -2006,18 +2123,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "quinn" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" dependencies = [ "bytes", "pin-project-lite", @@ -2026,34 +2143,38 @@ dependencies = [ "rustc-hash 2.0.0", "rustls", "socket2", - "thiserror", + "thiserror 2.0.3", "tokio", "tracing", ] [[package]] name = "quinn-proto" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" dependencies = [ "bytes", + "getrandom", "rand", "ring", "rustc-hash 2.0.0", "rustls", + "rustls-pki-types", "slab", - "thiserror", + "thiserror 2.0.3", "tinyvec", "tracing", + "web-time 1.1.0", ] [[package]] name = "quinn-udp" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" +checksum = "7d5a626c6807713b15cac82a6acaccd6043c9a5408c24baae07611fec3f243da" dependencies = [ + "cfg_aliases", "libc", "once_cell", "socket2", @@ -2122,23 +2243,23 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags", ] [[package]] name = "regex" -version = "1.10.6" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", + "regex-automata 0.4.9", + "regex-syntax 0.8.5", ] [[package]] @@ -2152,13 +2273,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", ] [[package]] @@ -2169,15 +2290,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.12.7" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ "base64", "bytes", @@ -2291,9 +2412,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.13" +version = "0.23.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +checksum = "9c9cc1d47e243d655ace55ed38201c19ae02c148ae56412ab8750e8f0166ab7f" dependencies = [ "once_cell", "ring", @@ -2305,19 +2426,21 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" +dependencies = [ + "web-time 1.1.0", +] [[package]] name = "rustls-webpki" @@ -2359,18 +2482,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", @@ -2379,9 +2502,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", "memchr", @@ -2477,7 +2600,7 @@ dependencies = [ "flate2", "simd_cesu8", "simdnbt-derive", - "thiserror", + "thiserror 1.0.69", "valence_nbt", ] @@ -2494,9 +2617,9 @@ dependencies = [ [[package]] name = "simdutf8" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "simple_asn1" @@ -2507,7 +2630,7 @@ dependencies = [ "chrono", "num-bigint", "num-traits", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2549,9 +2672,9 @@ dependencies = [ [[package]] name = "socks5-impl" -version = "0.5.14" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922f9d794c286fb5821e900f0cc73cd38d74049508dbe4f17c758b10d387a2bc" +checksum = "82a85c021488d0690111763ddd6466b4e9e13b6e7e11651c678c0f52568877e3" dependencies = [ "as-any", "async-trait", @@ -2559,7 +2682,7 @@ dependencies = [ "bytes", "percent-encoding", "serde", - "thiserror", + "thiserror 2.0.3", "tokio", ] @@ -2579,6 +2702,12 @@ dependencies = [ "der", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "subtle" version = "2.6.1" @@ -2587,9 +2716,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -2598,27 +2727,58 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" dependencies = [ "futures-core", ] [[package]] -name = "thiserror" -version = "1.0.63" +name = "synstructure" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ - "thiserror-impl", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thiserror" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" +dependencies = [ + "thiserror-impl 2.0.3", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" dependencies = [ "proc-macro2", "quote", @@ -2645,6 +2805,16 @@ dependencies = [ "once_cell", ] +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinytemplate" version = "1.2.1" @@ -2672,9 +2842,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" dependencies = [ "backtrace", "bytes", @@ -2740,27 +2910,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - [[package]] name = "tower-service" version = "0.3.3" @@ -2868,7 +3017,7 @@ dependencies = [ "once_cell", "rand", "smallvec", - "thiserror", + "thiserror 1.0.69", "tinyvec", "tokio", "tracing", @@ -2888,7 +3037,7 @@ dependencies = [ "parking_lot", "rand", "smallvec", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "trust-dns-proto", @@ -2914,21 +3063,21 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] @@ -2941,15 +3090,27 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", - "idna 0.5.0", + "idna 1.0.3", "percent-encoding", ] +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -2958,9 +3119,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" dependencies = [ "getrandom", "md-5", @@ -3016,9 +3177,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -3027,9 +3188,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", @@ -3042,9 +3203,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -3054,9 +3215,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3064,9 +3225,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", @@ -3077,15 +3238,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -3102,10 +3263,20 @@ dependencies = [ ] [[package]] -name = "webpki-roots" -version = "0.26.5" +name = "web-time" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.26.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" dependencies = [ "rustls-pki-types", ] @@ -3262,6 +3433,42 @@ dependencies = [ "memchr", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + +[[package]] +name = "yoke" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + [[package]] name = "zerocopy" version = "0.7.35" @@ -3283,8 +3490,51 @@ dependencies = [ "syn", ] +[[package]] +name = "zerofrom" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + [[package]] name = "zeroize" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/Cargo.toml b/Cargo.toml index 9ce1fc84..217d8ac7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,24 +1,80 @@ [workspace] members = [ - "azalea", - "azalea-client", - "azalea-protocol", - "azalea-chat", - "azalea-core", - "azalea-auth", - "azalea-brigadier", - "azalea-crypto", - "azalea-world", - "azalea-language", - "azalea-block", - "azalea-buf", - "azalea-physics", - "azalea-registry", - "azalea-inventory", - "azalea-entity", + "azalea", + "azalea-client", + "azalea-protocol", + "azalea-chat", + "azalea-core", + "azalea-auth", + "azalea-brigadier", + "azalea-crypto", + "azalea-world", + "azalea-language", + "azalea-block", + "azalea-buf", + "azalea-physics", + "azalea-registry", + "azalea-inventory", + "azalea-entity", ] resolver = "2" +[workspace.dependencies] +aes = "0.8.4" +anyhow = "1.0.93" +async-recursion = "1.1.1" +async-trait = "0.1.83" +base64 = "0.22.1" +bevy_app = "0.13.2" +bevy_ecs = { version = "0.13.2", default-features = false } +bevy_log = "0.13.2" +bevy_tasks = "0.13.2" +bevy_time = "0.13.2" +byteorder = "1.5.0" +bytes = "1.8.0" +cfb8 = "0.8.1" +chrono = { version = "0.4.38", default-features = false } +criterion = "0.5.1" +derive_more = "1.0.0" +enum-as-inner = "0.6.1" +env_logger = "0.11.5" +flate2 = "1.0.35" +futures = "0.3.31" +futures-lite = "2.5.0" +#futures-util = "0.3.31" +log = "0.4.22" +md-5 = "0.10.6" +minecraft_folder_path = "0.1.2" +nohash-hasher = "0.2.0" +num-bigint = "0.4.6" +num-traits = "0.2.19" +once_cell = "1.20.2" +parking_lot = "0.12.3" +priority-queue = "2.1.1" +proc-macro2 = "1.0.92" +quote = "1.0.37" +rand = "0.8.5" +regex = "1.11.1" +reqwest = { version = "0.12.9", default-features = false } +rsa = "0.9.6" +rsa_public_encrypt_pkcs1 = "0.4.0" +rustc-hash = "2.0.0" +serde = "1.0.215" +serde_json = "1.0.133" +sha-1 = "0.10.1" +sha2 = "0.10.8" +simdnbt = "0.6" +#smallvec = "1.13.2" +socks5-impl = "0.5.17" +syn = "2.0.89" +thiserror = "2.0.3" +tokio = "1.41.1" +tokio-util = "0.7.12" +tracing = "0.1.40" +tracing-subscriber = "0.3.18" +trust-dns-resolver = { version = "0.23.2", default-features = false } +uuid = "1.11.0" + [profile.release] debug = true diff --git a/azalea-auth/Cargo.toml b/azalea-auth/Cargo.toml index dce850bf..7eb38c19 100644 --- a/azalea-auth/Cargo.toml +++ b/azalea-auth/Cargo.toml @@ -11,23 +11,20 @@ version = "0.10.3+mc1.21.1" [dependencies] azalea-buf = { path = "../azalea-buf", version = "0.10.0" } azalea-crypto = { path = "../azalea-crypto", version = "0.10.0" } -base64 = "0.22.1" -chrono = { version = "0.4.38", default-features = false, features = ["serde"] } -tracing = "0.1.40" -num-bigint = "0.4.6" -once_cell = "1.19.0" -reqwest = { version = "0.12.5", default-features = false, features = [ - "json", - "rustls-tls", -] } -rsa = "0.9.6" -serde = { version = "1.0.203", features = ["derive"] } -serde_json = "1.0.120" -thiserror = "1.0.61" -tokio = { version = "1.38.0", features = ["fs"] } -uuid = { version = "1.9.1", features = ["serde", "v3"] } -md-5 = "0.10.6" +base64 = { workspace = true } +chrono = { workspace = true, features = ["serde"] } +md-5 = { workspace = true } +#num-bigint = { workspace = true } +once_cell = { workspace = true } +reqwest = { workspace = true, features = ["json", "rustls-tls"] } +rsa = { workspace = true } +serde = { workspace = true, features = ["derive"] } +serde_json = { workspace = true } +thiserror = { workspace = true } +tokio = { workspace = true, features = ["fs"] } +tracing = { workspace = true } +uuid = { workspace = true, features = ["serde", "v3"] } [dev-dependencies] -env_logger = "0.11.3" -tokio = { version = "1.38.0", features = ["full"] } +env_logger = { workspace = true } +tokio = { workspace = true, features = ["full"] } diff --git a/azalea-auth/src/auth.rs b/azalea-auth/src/auth.rs index e70be27d..55d7d36a 100755 --- a/azalea-auth/src/auth.rs +++ b/azalea-auth/src/auth.rs @@ -68,7 +68,7 @@ pub enum AuthError { /// If you want to use your own code to cache or show the auth code to the user /// in a different way, use [`get_ms_link_code`], [`get_ms_auth_token`], /// [`get_minecraft_token`] and [`get_profile`] instead. -pub async fn auth<'a>(email: &str, opts: AuthOpts<'a>) -> Result { +pub async fn auth(email: &str, opts: AuthOpts<'_>) -> Result { let cached_account = if let Some(cache_file) = &opts.cache_file { cache::get_account_in_cache(cache_file, email).await } else { diff --git a/azalea-block/azalea-block-macros/Cargo.toml b/azalea-block/azalea-block-macros/Cargo.toml index d20f5d09..8e3885c1 100644 --- a/azalea-block/azalea-block-macros/Cargo.toml +++ b/azalea-block/azalea-block-macros/Cargo.toml @@ -12,6 +12,6 @@ proc-macro = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -proc-macro2 = "1.0.86" -quote = "1.0.36" -syn = "2.0.68" +proc-macro2 = { workspace = true } +quote = { workspace = true } +syn = { workspace = true } diff --git a/azalea-brigadier/Cargo.toml b/azalea-brigadier/Cargo.toml index 5b70e815..167559ea 100644 --- a/azalea-brigadier/Cargo.toml +++ b/azalea-brigadier/Cargo.toml @@ -9,13 +9,13 @@ version = "0.10.3+mc1.21.1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dev-dependencies] -bevy_app = "0.13.0" -bevy_ecs = "0.13.0" +bevy_app = { workspace = true } +bevy_ecs = { workspace = true } [dependencies] azalea-buf = { path = "../azalea-buf", version = "0.10.0", optional = true } azalea-chat = { path = "../azalea-chat", version = "0.10.0", optional = true } -parking_lot = "0.12.3" +parking_lot = { workspace = true } [features] azalea-buf = ["dep:azalea-buf", "dep:azalea-chat", "azalea-chat/azalea-buf"] diff --git a/azalea-buf/Cargo.toml b/azalea-buf/Cargo.toml index e37b8e45..c8b29c6f 100644 --- a/azalea-buf/Cargo.toml +++ b/azalea-buf/Cargo.toml @@ -9,13 +9,13 @@ 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-buf-macros = { path = "./azalea-buf-macros", version = "0.10.0" } -byteorder = "^1.5.0" -tracing = "0.1.40" -serde_json = { version = "^1.0", optional = true } -thiserror = "1.0.61" -uuid = "^1.9.1" +byteorder = { workspace = true } +serde_json = { workspace = true, optional = true } +simdnbt = { workspace = true } +thiserror = { workspace = true } +tracing = { workspace = true } +uuid = { workspace = true } [features] serde_json = ["dep:serde_json"] diff --git a/azalea-buf/azalea-buf-macros/Cargo.toml b/azalea-buf/azalea-buf-macros/Cargo.toml index bd49144f..85545a75 100644 --- a/azalea-buf/azalea-buf-macros/Cargo.toml +++ b/azalea-buf/azalea-buf-macros/Cargo.toml @@ -11,6 +11,6 @@ proc-macro = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -proc-macro2 = "^1.0.86" -quote = "^1.0.36" -syn = { version = "^2.0.68", features = ["extra-traits"] } +proc-macro2 = { workspace = true } +quote = { workspace = true } +syn = { workspace = true, features = ["extra-traits"] } diff --git a/azalea-chat/Cargo.toml b/azalea-chat/Cargo.toml index dc85f726..6cd9c16e 100644 --- a/azalea-chat/Cargo.toml +++ b/azalea-chat/Cargo.toml @@ -15,13 +15,11 @@ azalea-buf = ["dep:azalea-buf", "simdnbt"] numbers = ["dep:azalea-registry", "dep:simdnbt"] [dependencies] -azalea-buf = { path = "../azalea-buf", features = [ - "serde_json", -], version = "0.10.0", optional = true } +azalea-buf = { path = "../azalea-buf", features = ["serde_json"], version = "0.10.0", optional = true } azalea-language = { path = "../azalea-language", version = "0.10.0" } -simdnbt = { version = "0.6", optional = true } -tracing = "0.1.40" -once_cell = "1.19.0" -serde = { version = "^1.0", features = ["derive"] } -serde_json = "^1.0.120" azalea-registry = { path = "../azalea-registry", version = "0.10.0", optional = true } +once_cell = { workspace = true } +serde = { workspace = true, features = ["derive"] } +serde_json = { workspace = true } +simdnbt = { workspace = true, optional = true } +tracing = { workspace = true } diff --git a/azalea-client/Cargo.toml b/azalea-client/Cargo.toml index 089f48ed..371e2d3b 100644 --- a/azalea-client/Cargo.toml +++ b/azalea-client/Cargo.toml @@ -9,40 +9,40 @@ 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" -reqwest = { version = "0.12.5", default-features = false } -anyhow = "1.0.86" -async-trait = "0.1.80" +anyhow = { workspace = true } +#async-trait = { workspace = true } azalea-auth = { path = "../azalea-auth", version = "0.10.0" } azalea-block = { path = "../azalea-block", version = "0.10.0" } +azalea-buf = { path = "../azalea-buf", version = "0.10.0" } azalea-chat = { path = "../azalea-chat", version = "0.10.0" } azalea-core = { path = "../azalea-core", version = "0.10.0" } azalea-crypto = { path = "../azalea-crypto", version = "0.10.0" } +azalea-entity = { version = "0.10.0", path = "../azalea-entity" } +azalea-inventory = { version = "0.10.0", path = "../azalea-inventory" } azalea-physics = { path = "../azalea-physics", version = "0.10.0" } -azalea-buf = { path = "../azalea-buf", version = "0.10.0" } azalea-protocol = { path = "../azalea-protocol", version = "0.10.0" } azalea-registry = { path = "../azalea-registry", version = "0.10.0" } azalea-world = { path = "../azalea-world", version = "0.10.0" } -bevy_app = "0.13.0" -bevy_ecs = "0.13.0" -bevy_log = { version = "0.13.0", optional = true } -bevy_tasks = "0.13.0" -bevy_time = "0.13.0" -derive_more = { version = "0.99.18", features = ["deref", "deref_mut"] } -futures = "0.3.30" -tracing = "0.1.40" -nohash-hasher = "0.2.0" -once_cell = "1.19.0" -parking_lot = { version = "^0.12.3", features = ["deadlock_detection"] } -regex = "1.10.5" -thiserror = "^1.0.61" -tokio = { version = "^1.38.0", features = ["sync"] } -uuid = "^1.9.1" -serde_json = "1.0.120" -serde = "1.0.203" -minecraft_folder_path = "0.1.2" -azalea-entity = { version = "0.10.0", path = "../azalea-entity" } -azalea-inventory = { version = "0.10.0", path = "../azalea-inventory" } +bevy_app = { workspace = true } +bevy_ecs = { workspace = true } +bevy_log = { workspace = true, optional = true } +bevy_tasks = { workspace = true } +bevy_time = { workspace = true } +derive_more = { workspace = true, features = ["deref", "deref_mut"] } +#futures = { workspace = true } +minecraft_folder_path = { workspace = true } +#nohash-hasher = { workspace = true } +once_cell = { workspace = true } +parking_lot = { workspace = true, features = ["deadlock_detection"] } +regex = { workspace = true } +reqwest = { workspace = true } +#serde = { workspace = true } +#serde_json = { workspace = true } +simdnbt = { workspace = true } +thiserror = { workspace = true } +tokio = { workspace = true, features = ["sync"] } +tracing = { workspace = true } +uuid = { workspace = true } [features] default = ["log"] diff --git a/azalea-client/src/client.rs b/azalea-client/src/client.rs index caeca7fe..9083a80b 100644 --- a/azalea-client/src/client.rs +++ b/azalea-client/src/client.rs @@ -3,7 +3,6 @@ use std::{ fmt::Debug, io, net::SocketAddr, - ops::Deref, sync::Arc, time::{Duration, Instant}, }; diff --git a/azalea-client/src/local_player.rs b/azalea-client/src/local_player.rs index b0582d8b..3cc77f9d 100644 --- a/azalea-client/src/local_player.rs +++ b/azalea-client/src/local_player.rs @@ -137,6 +137,7 @@ pub fn death_event(query: Query<&LocalPlayerEvents, Added>) { } } +#[allow(clippy::large_enum_variant)] #[derive(Error, Debug)] pub enum HandlePacketError { #[error("{0}")] diff --git a/azalea-client/src/raw_connection.rs b/azalea-client/src/raw_connection.rs index 9f7a85f1..8cbb15a4 100644 --- a/azalea-client/src/raw_connection.rs +++ b/azalea-client/src/raw_connection.rs @@ -22,7 +22,6 @@ pub struct RawConnection { writer: RawConnectionWriter, /// Packets sent to this will be sent to the server. - /// A task that reads packets from the server. The client is disconnected /// when this task ends. read_packets_task: tokio::task::JoinHandle<()>, diff --git a/azalea-core/Cargo.toml b/azalea-core/Cargo.toml index 00781373..bc65399f 100644 --- a/azalea-core/Cargo.toml +++ b/azalea-core/Cargo.toml @@ -9,16 +9,16 @@ 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-buf = { path = "../azalea-buf", version = "0.10.0" } azalea-registry = { path = "../azalea-registry", version = "0.10.0" } -bevy_ecs = { version = "0.13.0", default-features = false, optional = true } -nohash-hasher = "0.2.0" -num-traits = "0.2.19" -serde = { version = "^1.0", optional = true } -uuid = "^1.9.1" -serde_json = "^1.0.120" -tracing = "0.1.40" +bevy_ecs = { workspace = true, optional = true } +nohash-hasher = { workspace = true } +num-traits = { workspace = true } +serde = { workspace = true, optional = true } +#serde_json = { workspace = true } +simdnbt = { workspace = true } +tracing = { workspace = true } +#uuid = { workspace = true } [features] bevy_ecs = ["dep:bevy_ecs"] diff --git a/azalea-crypto/Cargo.toml b/azalea-crypto/Cargo.toml index 0584f338..6369377b 100644 --- a/azalea-crypto/Cargo.toml +++ b/azalea-crypto/Cargo.toml @@ -9,19 +9,19 @@ repository = "https://github.com/azalea-rs/azalea/tree/main/azalea-crypto" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -aes = "0.8.4" +aes = { workspace = true } azalea-buf = { path = "../azalea-buf", version = "0.10.0" } -cfb8 = "0.8.1" -num-bigint = "^0.4.6" -rand = { version = "^0.8.5", features = ["getrandom"] } -rsa = { version = "0.9.6", features = ["sha2"] } -rsa_public_encrypt_pkcs1 = "0.4.0" -sha-1 = "^0.10.1" -sha2 = "0.10.8" -uuid = "^1.9.1" +cfb8 = { workspace = true } +num-bigint = { workspace = true } +rand = { workspace = true, features = ["getrandom"] } +rsa = { workspace = true, features = ["sha2"] } +rsa_public_encrypt_pkcs1 = { workspace = true } +sha-1 = { workspace = true } +sha2 = { workspace = true } +uuid = { workspace = true } [dev-dependencies] -criterion = { version = "^0.5.1", features = ["html_reports"] } +criterion = { workspace = true, features = ["html_reports"] } [[bench]] harness = false diff --git a/azalea-entity/Cargo.toml b/azalea-entity/Cargo.toml index 9a9fc469..2f294857 100644 --- a/azalea-entity/Cargo.toml +++ b/azalea-entity/Cargo.toml @@ -9,22 +9,20 @@ license = "MIT" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -simdnbt = "0.6" azalea-block = { version = "0.10.0", path = "../azalea-block" } azalea-buf = { version = "0.10.0", path = "../azalea-buf" } -azalea-chat = { version = "0.10.0", path = "../azalea-chat", features = [ - "azalea-buf", -] } +azalea-chat = { version = "0.10.0", path = "../azalea-chat", features = ["azalea-buf"] } azalea-core = { version = "0.10.0", path = "../azalea-core" } azalea-inventory = { version = "0.10.0", path = "../azalea-inventory" } 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" -derive_more = "0.99.18" -enum-as-inner = "0.6.0" -tracing = "0.1.40" -nohash-hasher = "0.2.0" -parking_lot = "0.12.3" -thiserror = "1.0.61" -uuid = "1.9.1" +bevy_app = { workspace = true } +bevy_ecs = { workspace = true } +derive_more = { workspace = true } +enum-as-inner = { workspace = true } +nohash-hasher = { workspace = true } +parking_lot = { workspace = true } +simdnbt = { workspace = true } +thiserror = { workspace = true } +tracing = { workspace = true } +uuid = { workspace = true } diff --git a/azalea-inventory/Cargo.toml b/azalea-inventory/Cargo.toml index 69a85356..816df100 100644 --- a/azalea-inventory/Cargo.toml +++ b/azalea-inventory/Cargo.toml @@ -9,12 +9,10 @@ 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-buf = { version = "0.10.0", path = "../azalea-buf" } +azalea-chat = { version = "0.10.0", path = "../azalea-chat", features = ["azalea-buf"] } +azalea-core = { version = "0.10.0", path = "../azalea-core" } azalea-inventory-macros = { version = "0.10.0", path = "./azalea-inventory-macros" } azalea-registry = { version = "0.10.0", path = "../azalea-registry" } -azalea-chat = { version = "0.10.0", path = "../azalea-chat", features = [ - "azalea-buf", -] } -azalea-core = { version = "0.10.0", path = "../azalea-core" } -uuid = "1.9.1" +simdnbt = { workspace = true } +uuid = { workspace = true } diff --git a/azalea-inventory/azalea-inventory-macros/Cargo.toml b/azalea-inventory/azalea-inventory-macros/Cargo.toml index f02b16c1..c55729ee 100644 --- a/azalea-inventory/azalea-inventory-macros/Cargo.toml +++ b/azalea-inventory/azalea-inventory-macros/Cargo.toml @@ -12,6 +12,6 @@ proc-macro = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -proc-macro2 = "1.0.86" -quote = "1.0.36" -syn = "2.0.68" +proc-macro2 = { workspace = true } +quote = { workspace = true } +syn = { workspace = true } diff --git a/azalea-language/Cargo.toml b/azalea-language/Cargo.toml index 06d1240a..4fdda48c 100644 --- a/azalea-language/Cargo.toml +++ b/azalea-language/Cargo.toml @@ -9,7 +9,7 @@ version = "0.10.3+mc1.21.1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -once_cell = "1.19.0" -serde = "^1.0" -serde_json = "^1.0.120" -# tokio = {version = "^1.21.2", features = ["fs"]} +once_cell = { workspace = true } +serde = { workspace = true } +serde_json = { workspace = true } +#tokio = { workspace = true, features = ["fs"] } diff --git a/azalea-physics/Cargo.toml b/azalea-physics/Cargo.toml index 2dad5da5..33a301fc 100644 --- a/azalea-physics/Cargo.toml +++ b/azalea-physics/Cargo.toml @@ -11,18 +11,18 @@ version = "0.10.3+mc1.21.1" [dependencies] azalea-block = { path = "../azalea-block", version = "0.10.0" } azalea-core = { path = "../azalea-core", version = "0.10.0" } -azalea-registry = { path = "../azalea-registry", version = "0.10.0" } -azalea-world = { path = "../azalea-world", version = "0.10.0" } -bevy_app = "0.13.0" -bevy_ecs = "0.13.0" -tracing = "0.1.40" -once_cell = "1.19.0" -parking_lot = "^0.12.3" -nohash-hasher = "0.2.0" -smallvec = "1.13.2" azalea-entity = { version = "0.10.0", path = "../azalea-entity" } azalea-inventory = { version = "0.10.0", path = "../azalea-inventory" } +azalea-registry = { path = "../azalea-registry", version = "0.10.0" } +azalea-world = { path = "../azalea-world", version = "0.10.0" } +bevy_app = { workspace = true } +bevy_ecs = { workspace = true } +#nohash-hasher = { workspace = true } +once_cell = { workspace = true } +parking_lot = { workspace = true } +#smallvec = { workspace = true } +#tracing = { workspace = true } [dev-dependencies] -bevy_time = "0.13.0" -uuid = "^1.9.1" +#bevy_time = { workspace = true } +uuid = { workspace = true } diff --git a/azalea-protocol/Cargo.toml b/azalea-protocol/Cargo.toml index 9a6b328c..1e32d71d 100644 --- a/azalea-protocol/Cargo.toml +++ b/azalea-protocol/Cargo.toml @@ -9,46 +9,37 @@ 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" -async-recursion = "1.1.1" +async-recursion = { workspace = true } azalea-auth = { path = "../azalea-auth", version = "0.10.0" } azalea-block = { path = "../azalea-block", default-features = false, version = "0.10.0" } -azalea-brigadier = { path = "../azalea-brigadier", version = "0.10.0", features = [ - "azalea-buf", -] } +azalea-brigadier = { path = "../azalea-brigadier", version = "0.10.0", features = ["azalea-buf"] } azalea-buf = { path = "../azalea-buf", version = "0.10.0" } -azalea-chat = { path = "../azalea-chat", version = "0.10.0", features = [ - "numbers", - "azalea-buf", -] } -azalea-core = { path = "../azalea-core", optional = true, version = "0.10.0", features = [ - "serde", -] } +azalea-chat = { path = "../azalea-chat", version = "0.10.0", features = ["numbers", "azalea-buf"] } +azalea-core = { path = "../azalea-core", optional = true, version = "0.10.0", features = ["serde"] } azalea-crypto = { path = "../azalea-crypto", version = "0.10.0" } +azalea-entity = { version = "0.10.0", path = "../azalea-entity" } +azalea-inventory = { version = "0.10.0", path = "../azalea-inventory" } azalea-protocol-macros = { path = "./azalea-protocol-macros", version = "0.10.0" } azalea-registry = { path = "../azalea-registry", version = "0.10.0" } azalea-world = { path = "../azalea-world", version = "0.10.0" } -bevy_ecs = { version = "0.13.0", default-features = false } -byteorder = "^1.5.0" -bytes = "^1.6.0" -flate2 = "1.0.30" -futures = "0.3.30" -futures-lite = "2.3.0" -futures-util = "0.3.30" -tracing = "0.1.40" -serde = { version = "^1.0", features = ["serde_derive"] } -serde_json = "^1.0.120" -thiserror = "1.0.61" -tokio = { version = "^1.38.0", features = ["io-util", "net", "macros"] } -tokio-util = { version = "0.7.11", features = ["codec"] } -trust-dns-resolver = { version = "^0.23.2", default-features = false, features = [ - "tokio-runtime", -] } -uuid = "1.9.1" -log = "0.4.22" -azalea-entity = { version = "0.10.0", path = "../azalea-entity" } -azalea-inventory = { version = "0.10.0", path = "../azalea-inventory" } -socks5-impl = "0.5.14" +bevy_ecs = { workspace = true } +#byteorder = { workspace = true } +bytes = { workspace = true } +flate2 = { workspace = true } +futures = { workspace = true } +futures-lite = { workspace = true } +#futures-util = { workspace = true } +log = { workspace = true } +serde = { workspace = true, features = ["serde_derive"] } +serde_json = { workspace = true } +simdnbt = { workspace = true } +socks5-impl = { workspace = true } +thiserror = { workspace = true } +tokio = { workspace = true, features = ["io-util", "net", "macros"] } +tokio-util = { workspace = true, features = ["codec"] } +tracing = { workspace = true } +trust-dns-resolver = { workspace = true, features = ["tokio-runtime"] } +uuid = { workspace = true } [features] connecting = [] @@ -56,7 +47,7 @@ default = ["packets"] packets = ["connecting", "dep:azalea-core"] [dev-dependencies] -anyhow = "^1.0.86" -tracing = "^0.1.40" -tracing-subscriber = "^0.3.18" -once_cell = "1.19.0" +anyhow = { workspace = true } +once_cell = { workspace = true } +tracing = { workspace = true } +tracing-subscriber = { workspace = true } diff --git a/azalea-protocol/azalea-protocol-macros/Cargo.toml b/azalea-protocol/azalea-protocol-macros/Cargo.toml index 4a4de9a5..4bc8c360 100644 --- a/azalea-protocol/azalea-protocol-macros/Cargo.toml +++ b/azalea-protocol/azalea-protocol-macros/Cargo.toml @@ -11,6 +11,6 @@ proc-macro = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -proc-macro2 = "^1.0.86" -quote = "^1.0.36" -syn = "^2.0.68" +proc-macro2 = { workspace = true } +quote = { workspace = true } +syn = { workspace = true } 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 diff --git a/azalea-registry/Cargo.toml b/azalea-registry/Cargo.toml index 3e968b24..ef089fcd 100644 --- a/azalea-registry/Cargo.toml +++ b/azalea-registry/Cargo.toml @@ -9,11 +9,12 @@ 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-buf = { path = "../azalea-buf", version = "0.10.0" } azalea-registry-macros = { path = "./azalea-registry-macros", version = "0.10.0" } -once_cell = "1.19.0" -serde = { version = "^1.0", optional = true } +once_cell = { workspace = true } +serde = { workspace = true, optional = true } +simdnbt = { workspace = true } + [features] serde = ["azalea-registry-macros/serde", "dep:serde"] default = ["serde"] diff --git a/azalea-registry/azalea-registry-macros/Cargo.toml b/azalea-registry/azalea-registry-macros/Cargo.toml index 9b156953..ad088b42 100644 --- a/azalea-registry/azalea-registry-macros/Cargo.toml +++ b/azalea-registry/azalea-registry-macros/Cargo.toml @@ -12,9 +12,9 @@ proc-macro = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -proc-macro2 = "1.0.86" -quote = "1.0.36" -syn = "2.0.68" +#proc-macro2 = { workspace = true } +quote = { workspace = true } +syn = { workspace = true } [features] serde = [] 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 { 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 { 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::() - .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 = /// } /// Ok(()) /// } - impl Swarm { /// Add a new account to the swarm. You can remove it later by calling /// [`Client::disconnect`]. diff --git a/rust-toolchain b/rust-toolchain index 07ade694..f36406d3 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly \ No newline at end of file +nightly-2024-11-11 \ No newline at end of file