From 4fb6b077464e14f816e4c4fe54ff648e8c3d0ede Mon Sep 17 00:00:00 2001 From: mat Date: Fri, 14 Feb 2025 03:56:36 +0000 Subject: [PATCH] upgrade deps --- Cargo.lock | 169 ++++++++++++++++++++---------------- Cargo.toml | 18 ++-- azalea-client/src/client.rs | 2 +- 3 files changed, 104 insertions(+), 85 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 663a958a..880393a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -133,9 +133,9 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "as-any" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a30a44e99a1c83ccb2a6298c563c888952a1c9134953db26876528f84c93a" +checksum = "b0f477b951e452a0b6b4a10b53ccd569042d1d01729b519e02074a9c0958a063" [[package]] name = "assert_type_match" @@ -230,7 +230,7 @@ dependencies = [ "bevy_log", "bevy_tasks", "criterion", - "derive_more", + "derive_more 2.0.1", "futures", "futures-lite", "indexmap", @@ -239,7 +239,7 @@ dependencies = [ "num-traits", "parking_lot", "rand", - "rustc-hash 2.1.0", + "rustc-hash 2.1.1", "serde", "thiserror 2.0.11", "tokio", @@ -353,7 +353,7 @@ dependencies = [ "bevy_log", "bevy_tasks", "bevy_time", - "derive_more", + "derive_more 2.0.1", "minecraft_folder_path", "parking_lot", "regex", @@ -411,7 +411,7 @@ dependencies = [ "azalea-world", "bevy_app", "bevy_ecs", - "derive_more", + "derive_more 2.0.1", "enum-as-inner", "nohash-hasher", "parking_lot", @@ -543,10 +543,10 @@ dependencies = [ "azalea-registry", "bevy_ecs", "criterion", - "derive_more", + "derive_more 2.0.1", "nohash-hasher", "parking_lot", - "rustc-hash 2.1.0", + "rustc-hash 2.1.1", "simdnbt", "thiserror 2.0.11", "tracing", @@ -581,9 +581,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bevy_app" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "454a8cfd134864dcdcba6ee56fb958531b981021bba6bb2037c9e3df6046603c" +checksum = "47983196daf9290ac97023de67d9364182c4a9a88ce400039e2d79aaf342dcb2" dependencies = [ "bevy_derive", "bevy_ecs", @@ -592,7 +592,7 @@ dependencies = [ "bevy_utils", "console_error_panic_hook", "ctrlc", - "derive_more", + "derive_more 1.0.0", "downcast-rs", "wasm-bindgen", "web-sys", @@ -600,9 +600,9 @@ dependencies = [ [[package]] name = "bevy_derive" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b962df2a1bef274ae76ec75279eb6f8ef0ffd85b5e4c43433f5d08ba57b3d071" +checksum = "fa901a443b9ee433823f0d1a4e6db78440ff27572a98e7fa7f2a614bf8d6e475" dependencies = [ "bevy_macro_utils", "quote", @@ -611,9 +611,9 @@ dependencies = [ [[package]] name = "bevy_ecs" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b747210d7db09dfacc237707d4fd31c8b43d7744cd5e5829e2c4ca86b9e47baf" +checksum = "40e6d5ad061f750f710a9a4e2f9e7d65f86c0061fc9ffcf3a430b3c003bc0088" dependencies = [ "bevy_ecs_macros", "bevy_ptr", @@ -622,7 +622,7 @@ dependencies = [ "bevy_utils", "bitflags", "concurrent-queue", - "derive_more", + "derive_more 1.0.0", "disqualified", "fixedbitset 0.5.7", "nonmax", @@ -632,9 +632,9 @@ dependencies = [ [[package]] name = "bevy_ecs_macros" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d36ba5874ee278d20f17b8934d2969f8fbab90f3ea3fcf8d3583814b3661ada" +checksum = "fea80917f2d11e8928d0b7cd41efa55b814355e6a3544a1bf68e6b73871d332c" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -644,9 +644,9 @@ dependencies = [ [[package]] name = "bevy_log" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774238dcf70a0ef4d82aa2860b24b1cffdd4633f3694d3bcbfbb05c4f17ae4fe" +checksum = "8530cc17503ccfe86c8496136fca222bfa389c9cc70267be7d377d0f6621aa29" dependencies = [ "android_log-sys", "bevy_app", @@ -660,9 +660,9 @@ dependencies = [ [[package]] name = "bevy_macro_utils" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bdb3a681c24abace65bf18ed467ad8befbedb42468b32e459811bfdb01e506c" +checksum = "090371a2cd85574989febff6063a21d1fbbc2939e80f00fe075f62aa8e616136" dependencies = [ "proc-macro2", "quote", @@ -672,21 +672,21 @@ dependencies = [ [[package]] name = "bevy_ptr" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa65df6a190b7dfc84d79f09cf02d47ae046fa86a613e202c31559e06d8d3710" +checksum = "4da2111eefa2000ea8c9dc1beee2eb7283b29b5ef90a29fe43c748df549f84ad" [[package]] name = "bevy_reflect" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab3264acc3b6f48bc23fbd09fdfea6e5d9b7bfec142e4f3333f532acf195bca" +checksum = "82af24a68fd8feff476d9672ff34d220d3f45e95ef2f2324e7cb674614d18138" dependencies = [ "assert_type_match", "bevy_ptr", "bevy_reflect_derive", "bevy_utils", - "derive_more", + "derive_more 1.0.0", "disqualified", "downcast-rs", "erased-serde", @@ -697,9 +697,9 @@ dependencies = [ [[package]] name = "bevy_reflect_derive" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f83876a322130ab38a47d5dcf75258944bf76b3387d1acdb3750920fda63e2" +checksum = "8369e6e779ab3540f9dcd93d062139f62551b3d2fe1ab451c6ddf74757e22ccd" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -710,9 +710,9 @@ dependencies = [ [[package]] name = "bevy_tasks" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c28f2db2619203aa82342dbbe77e49aeea4f933212c0b7a1f285e94c4008e5b" +checksum = "53e085e93374b8dd2559968bcc1bc66d059387ef3128e59e9af92dcde03f10b7" dependencies = [ "async-channel", "async-executor", @@ -725,9 +725,9 @@ dependencies = [ [[package]] name = "bevy_time" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb3108ed1ef864bc40bc859ba4c9c3844213c7be3674f982203cf5d87c656848" +checksum = "c02b14d56c04a372725dacc656e2e5f134ff239e72cd73431a065b32b296db31" dependencies = [ "bevy_app", "bevy_ecs", @@ -738,9 +738,9 @@ dependencies = [ [[package]] name = "bevy_utils" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f01088c048960ea50ee847c3f668942ecf49ed26be12a1585a5e59b6a941d9a" +checksum = "2993cac374b3f88cfaf59506c71f8e3e7ad8b4961f4e9864bc76e1c9e1e4400c" dependencies = [ "ahash", "bevy_utils_proc_macros", @@ -753,9 +753,9 @@ dependencies = [ [[package]] name = "bevy_utils_proc_macros" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a0c3244d543cc964545b7aa074f6fb18a915a7121cf3de5d7ed37a4aae8662d" +checksum = "2606f79dfe359a88e2a59bb6cd632cd42e9d4bcd250ac8bc3a4e7657e82f4f39" dependencies = [ "proc-macro2", "quote", @@ -811,9 +811,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" +checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9" [[package]] name = "cast" @@ -823,9 +823,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.2.11" +version = "1.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4730490333d58093109dc02c23174c3f4d490998c3fed3cc8e82d57afedb9cf" +checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda" dependencies = [ "shlex", ] @@ -920,18 +920,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.27" +version = "4.5.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "769b0145982b4b48713e01ec42d61614425f27b7058bda7180a3a41f30104796" +checksum = "8acebd8ad879283633b343856142139f2da2317c96b05b4dd6181c61e2480184" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.27" +version = "4.5.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7" +checksum = "f6ba32cbda51c7e1dfd49acc1457ba1a7dec5b64fe360e828acb13ca8dc9c2f9" dependencies = [ "anstyle", "clap_lex", @@ -1110,9 +1110,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f" +checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010" [[package]] name = "der" @@ -1131,7 +1131,16 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" dependencies = [ - "derive_more-impl", + "derive_more-impl 1.0.0", +] + +[[package]] +name = "derive_more" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +dependencies = [ + "derive_more-impl 2.0.1", ] [[package]] @@ -1146,6 +1155,17 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "derive_more-impl" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "digest" version = "0.10.7" @@ -1479,9 +1499,9 @@ checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] name = "hickory-proto" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447afdcdb8afb9d0a852af6dc65d9b285ce720ed7a59e42a8bf2e931c67bc1b5" +checksum = "2ad3d6d98c648ed628df039541a5577bee1a7c83e9e16fe3dbedeea4cdfeb971" dependencies = [ "async-trait", "cfg-if", @@ -1503,9 +1523,9 @@ dependencies = [ [[package]] name = "hickory-resolver" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2e2aba9c389ce5267d31cf1e4dace82390ae276b0b364ea55630b1fa1b44b4" +checksum = "dcf287bde7b776e85d7188e6e5db7cf410a2f9531fe82817eb87feed034c8d14" dependencies = [ "cfg-if", "futures-util", @@ -1950,9 +1970,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" +checksum = "b3b1c9bd4fe1f0f8b387f6eb9eb3b4a1aa26185e5750efb9140301703f62cd1b" dependencies = [ "adler2", ] @@ -2124,9 +2144,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.2" +version = "1.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" [[package]] name = "oorandom" @@ -2199,18 +2219,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916" +checksum = "dfe2e71e1471fe07709406bf725f710b02927c9c54b2b5b2ec0e8087d97c327d" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb" +checksum = "f6e859e6e5bd50440ab63c47e3ebabc90f26251f7c73c3d3e837b74a1cc3fa67" dependencies = [ "proc-macro2", "quote", @@ -2316,7 +2336,7 @@ dependencies = [ "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 2.1.0", + "rustc-hash 2.1.1", "rustls", "socket2", "thiserror 2.0.11", @@ -2334,7 +2354,7 @@ dependencies = [ "getrandom", "rand", "ring", - "rustc-hash 2.1.0", + "rustc-hash 2.1.1", "rustls", "rustls-pki-types", "slab", @@ -2515,15 +2535,14 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.8" +version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +checksum = "e75ec5e92c4d8aede845126adc388046234541629e76029599ed35a003c7ed24" dependencies = [ "cc", "cfg-if", "getrandom", "libc", - "spin", "untrusted", "windows-sys 0.52.0", ] @@ -2574,9 +2593,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc-hash" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" [[package]] name = "rustc_version" @@ -2589,9 +2608,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.22" +version = "0.23.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7" +checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395" dependencies = [ "once_cell", "ring", @@ -2775,9 +2794,9 @@ dependencies = [ [[package]] name = "simdnbt" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1af1472d2425ec2edb429ed50c254ec74c403b6aab533d56ef9c59e9ed53ccc7" +checksum = "960b88bb7ea0984fbba94e53f1a2181ba6654e68a0eb53e45843e0eed402f10e" dependencies = [ "byteorder", "flate2", @@ -3087,9 +3106,9 @@ checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" [[package]] name = "toml_edit" -version = "0.22.23" +version = "0.22.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee" +checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" dependencies = [ "indexmap", "toml_datetime", @@ -3568,9 +3587,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e49d2d35d3fad69b39b94139037ecfb4f359f08958b9c11e7315ce770462419" +checksum = "59690dea168f2198d1a3b0cac23b8063efcd11012f10ae4698f284808c8ef603" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index e2716473..dc84bf06 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,16 +34,16 @@ anyhow = "1.0.95" async-recursion = "1.1.1" async-trait = "0.1.86" base64 = "0.22.1" -bevy_app = "0.15.1" -bevy_ecs = { version = "0.15.1", default-features = false } -bevy_log = "0.15.1" -bevy_tasks = "0.15.1" -bevy_time = "0.15.1" +bevy_app = "0.15.2" +bevy_ecs = { version = "0.15.2", default-features = false } +bevy_log = "0.15.2" +bevy_tasks = "0.15.2" +bevy_time = "0.15.2" byteorder = "1.5.0" cfb8 = "0.8.1" chrono = { version = "0.4.39", default-features = false } criterion = "0.5.1" -derive_more = "1.0.0" +derive_more = "2.0.1" enum-as-inner = "0.6.1" env_logger = "0.11.6" flate2 = "1.0.35" @@ -63,20 +63,20 @@ regex = "1.11.1" reqwest = { version = "0.12.12", default-features = false } rsa = "0.9.7" rsa_public_encrypt_pkcs1 = "0.4.0" -rustc-hash = "2.1.0" +rustc-hash = "2.1.1" serde = "1.0.217" serde_json = "1.0.138" sha-1 = "0.10.1" sha2 = "0.10.8" simdnbt = "0.7" socks5-impl = "0.6.1" -syn = "2.0.97" +syn = "2.0.98" thiserror = "2.0.11" tokio = "1.43.0" tokio-util = "0.7.13" tracing = "0.1.41" tracing-subscriber = "0.3.19" -hickory-resolver = { version = "0.24.2", default-features = false } +hickory-resolver = { version = "0.24.3", default-features = false } uuid = "1.12.1" num-format = "0.4.4" indexmap = "2.7.1" diff --git a/azalea-client/src/client.rs b/azalea-client/src/client.rs index 2221cee7..63026c96 100644 --- a/azalea-client/src/client.rs +++ b/azalea-client/src/client.rs @@ -717,7 +717,7 @@ impl Client { /// /// This is a shortcut for `*bot.component::()`. pub fn tab_list(&self) -> HashMap { - self.component::().deref().clone() + (*self.component::()).clone() } /// Call the given function with the client's [`RegistryHolder`].