From 47fe06066521e0cdf7991a966a669ac014f36244 Mon Sep 17 00:00:00 2001 From: Alexander Medvedev Date: Thu, 9 Jul 2026 20:39:01 +0200 Subject: [PATCH] fix: rust 1.97 lints --- Cargo.lock | 523 ++++++++---------- Cargo.toml | 12 +- pumpkin-codegen/Cargo.lock | 295 +++++----- pumpkin-codegen/Cargo.toml | 2 +- pumpkin-codegen/src/advancement.rs | 2 +- pumpkin-codegen/src/bedrock_creative.rs | 10 +- pumpkin-codegen/src/block.rs | 14 +- pumpkin-codegen/src/fluid.rs | 2 +- pumpkin-codegen/src/wit/packet_mapping.rs | 14 +- pumpkin-data/src/generated/block.rs | 230 ++++---- pumpkin-data/src/generated/fluid.rs | 16 +- pumpkin-protocol/src/bedrock/frame_set.rs | 6 +- pumpkin-world/src/chunk/format/anvil.rs | 2 +- .../src/chunk_system/chunk_loading.rs | 2 +- .../structure/structures/jigsaw_placement.rs | 5 +- pumpkin/src/entity/player/advancement.rs | 2 +- 16 files changed, 546 insertions(+), 591 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dc2185c0d..a824df029 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -187,12 +187,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "base16ct" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" - [[package]] name = "base16ct" version = "1.0.0" @@ -270,9 +264,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae3f5d315924270530207e2a68396c3cc547f6dca3fbdca317cfb1a51edb593" +checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" [[package]] name = "cap-fs-ext" @@ -350,9 +344,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.2.65" +version = "1.2.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e228eec9be7c17ccb640b59b36a5cd805ea2a564a4c5e162c2f659fea30d3b96" +checksum = "f5d6cac793997bd970000024b2934968efe83b382de4fdcf4fcb46b6ee4ad996" dependencies = [ "find-msvc-tools", "jobserver", @@ -395,7 +389,7 @@ checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81" dependencies = [ "cfg-if", "cpufeatures 0.3.0", - "rand_core 0.10.1", + "rand_core", ] [[package]] @@ -550,12 +544,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - [[package]] name = "const-oid" version = "0.10.2" @@ -850,18 +838,18 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.15" +version = "0.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" +checksum = "d85363c37faeca707aef026efa9f3b34d077bce547e48f770770625c6013679e" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +checksum = "5181e0de7b61eb03a81e347d6dd8797bae9da5146707b51077e2d71a54ec0ceb" dependencies = [ "crossbeam-epoch", "crossbeam-utils", @@ -869,38 +857,38 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.18" +version = "0.9.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-queue" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" +checksum = "803d13fb3b09d88be9f4dbc29062c66b19bf7170867ceb746d2a8689bf6c7a26" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.21" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" +checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17" [[package]] name = "crossfire" -version = "3.1.18" +version = "3.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df981decccf9b846c396ae513b3d2c6a1770d9593c8e47853d8fdb336c7bcb46" +checksum = "111ce8f7abfbac38b4bc4f32a3a2dda1a8034b873c90c7899f302cc9dbbc05ec" dependencies = [ "crossbeam-utils", - "embed-collections", "futures-core", "parking_lot", + "pointers", "smallvec", ] @@ -910,18 +898,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" -[[package]] -name = "crypto-bigint" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" -dependencies = [ - "generic-array", - "rand_core 0.6.4", - "subtle", - "zeroize", -] - [[package]] name = "crypto-bigint" version = "0.7.5" @@ -930,17 +906,20 @@ checksum = "1a52aa3fcda4e6302a9f48734f234d35d4721b96f8fe07d073f07ce9df4f0271" dependencies = [ "cpubits", "ctutils", + "getrandom 0.4.3", + "hybrid-array", "num-traits", - "rand_core 0.10.1", + "rand_core", "serdect", + "subtle", "zeroize", ] [[package]] name = "crypto-common" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ "generic-array", "typenum", @@ -952,7 +931,9 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453" dependencies = [ + "getrandom 0.4.3", "hybrid-array", + "rand_core", ] [[package]] @@ -961,8 +942,8 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3633a51a39c69ebbaa4feaa694bd83d241e4093901c84a0963b19d9bb3f0cf8f" dependencies = [ - "crypto-bigint 0.7.5", - "rand_core 0.10.1", + "crypto-bigint", + "rand_core", ] [[package]] @@ -981,6 +962,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e" dependencies = [ "cmov", + "subtle", ] [[package]] @@ -999,21 +981,11 @@ dependencies = [ [[package]] name = "der" -version = "0.7.10" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" +checksum = "a69dedd701da44b0536442edf09c81a64b0ab97a7a4a5e3d1971f00027cbc63d" dependencies = [ - "const-oid 0.9.6", - "zeroize", -] - -[[package]] -name = "der" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71fd89660b2dc699704064e59e9dba0147b903e85319429e131620d022be411b" -dependencies = [ - "const-oid 0.10.2", + "const-oid", "pem-rfc7468", "zeroize", ] @@ -1031,9 +1003,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", - "const-oid 0.9.6", - "crypto-common 0.1.6", - "subtle", + "crypto-common 0.1.7", ] [[package]] @@ -1043,7 +1013,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" dependencies = [ "block-buffer 0.12.1", - "const-oid 0.10.2", + "const-oid", "crypto-common 0.2.2", "ctutils", ] @@ -1091,16 +1061,17 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.16.9" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" +checksum = "c0681a4fc24c767085329728d8dfba959af91228aa4610cca4f8ce317ba46ae0" dependencies = [ - "der 0.7.10", - "digest 0.10.7", + "der", + "digest 0.11.3", "elliptic-curve", "rfc6979", - "signature 2.2.0", - "spki 0.7.3", + "signature", + "spki", + "zeroize", ] [[package]] @@ -1111,30 +1082,25 @@ checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e" [[package]] name = "elliptic-curve" -version = "0.13.8" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +checksum = "9d65aa39b3a5c1c9c1b745c9a019234bb7a21b77abcb4f4d266d706e2d577d65" dependencies = [ - "base16ct 0.2.0", - "crypto-bigint 0.5.5", - "digest 0.10.7", + "base16ct", + "crypto-bigint", + "crypto-common 0.2.2", + "digest 0.11.3", "ff", - "generic-array", "group", "hkdf", - "pkcs8 0.10.2", - "rand_core 0.6.4", + "hybrid-array", + "pkcs8", + "rand_core", "sec1", "subtle", "zeroize", ] -[[package]] -name = "embed-collections" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49c327886cdc0e7eda24cd0827f195db19a5f941425914bc6db76c79c64bc21" - [[package]] name = "embedded-io" version = "0.4.0" @@ -1207,14 +1173,20 @@ dependencies = [ [[package]] name = "ff" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" +checksum = "a1f686ab92a9fb0eaf188f6c6c87b89490baa6fdb0db4544ba4dc47f7942489f" dependencies = [ - "rand_core 0.6.4", + "rand_core", "subtle", ] +[[package]] +name = "fiat-crypto" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64cd1e32ddd350061ae6edb1b082d7c54915b5c672c389143b9a63403a109f24" + [[package]] name = "find-msvc-tools" version = "0.1.9" @@ -1362,13 +1334,12 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.9" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", - "zeroize", ] [[package]] @@ -1382,18 +1353,6 @@ dependencies = [ "wasi", ] -[[package]] -name = "getrandom" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" -dependencies = [ - "cfg-if", - "libc", - "r-efi 5.3.0", - "wasip2", -] - [[package]] name = "getrandom" version = "0.4.3" @@ -1402,8 +1361,8 @@ checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099" dependencies = [ "cfg-if", "libc", - "r-efi 6.0.0", - "rand_core 0.10.1", + "r-efi", + "rand_core", ] [[package]] @@ -1420,12 +1379,12 @@ dependencies = [ [[package]] name = "group" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +checksum = "7fd1a1c7a5206c5b7a3f5a0d7ccd3ff85d0c8f5133d62a02680255b0004af5f4" dependencies = [ "ff", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -1526,20 +1485,11 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hkdf" -version = "0.12.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +checksum = "4aaa26c720c68b866f2c96ef5c1264b3e6f473fe5d4ce61cd44bbe913e553018" dependencies = [ - "hmac 0.12.1", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest 0.10.7", + "hmac", ] [[package]] @@ -1608,7 +1558,9 @@ version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "818356c5132c1fede50f837ca96afbe78ff42413047f4abb886217845e1b6c8c" dependencies = [ + "subtle", "typenum", + "zeroize", ] [[package]] @@ -1826,9 +1778,9 @@ dependencies = [ [[package]] name = "inotify" -version = "0.11.2" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "533e68a5842e734946fe159fb03fc9bbbb254f590dd0d8ad321ae5ff7beca2c1" +checksum = "153be1941a183ec9ccd095ddbe17a8b8d435ef6c76e9e02451b933c3999af2c8" dependencies = [ "bitflags", "inotify-sys", @@ -1837,9 +1789,9 @@ dependencies = [ [[package]] name = "inotify-sys" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea94e891b3606826e9c998be69ddca42247dad8ad50b1649a5cb7e1c9ae06fd" +checksum = "c033f80b2c113cdf91ab7a33faa9cbc014726dcad99880c8609af2a370edf37d" dependencies = [ "libc", ] @@ -1910,11 +1862,11 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "jobserver" -version = "0.1.34" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" +checksum = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3" dependencies = [ - "getrandom 0.3.4", + "getrandom 0.4.3", "libc", ] @@ -2080,15 +2032,15 @@ dependencies = [ [[package]] name = "md5" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae960838283323069879657ca3de837e9f7bbb4c7bf6ea7f1b290d5e9476d2e0" +checksum = "7ebb8d8732c6a6df3d8f032a82911cfc747e00efb95cc46e8d0acd5b5b88570c" [[package]] name = "memchr" -version = "2.8.2" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4" +checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "memfd" @@ -2212,9 +2164,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7032fbb7ef662c18e806aa75b311f68ddf5c94e8fc62832c0039d79095ab6abf" +checksum = "93e7820bc0a80a0238e650327316f929ba18d5be054b647490a3a6a339f3e7c0" dependencies = [ "num-integer", "num-traits", @@ -2318,14 +2270,16 @@ dependencies = [ [[package]] name = "p384" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6" +checksum = "d17b851e6b3e378ab4ecb07fa2ed23f4d15f075735f8fec9fa1e7bdce5f8301f" dependencies = [ "ecdsa", "elliptic-curve", + "fiat-crypto", + "primefield", "primeorder", - "sha2 0.10.9", + "sha2 0.11.0", ] [[package]] @@ -2378,9 +2332,9 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pest" -version = "2.8.6" +version = "2.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0848c601009d37dfa3430c4666e147e49cdcf1b92ecd3e63657d8a5f19da662" +checksum = "47627dd7305c6a2d6c8c6bcd24c5a4c17dbbf425f4f9c5313e724b38fc9782e9" dependencies = [ "memchr", "ucd-trie", @@ -2388,9 +2342,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.8.6" +version = "2.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f486f1ea21e6c10ed15d5a7c77165d0ee443402f0780849d1768e7d9d6fe77" +checksum = "4b4254325ecad416ab689e27ba51da03ba01a9632bc6e108f5fe7c3c4ad29d58" dependencies = [ "pest", "pest_generator", @@ -2398,9 +2352,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.8.6" +version = "2.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8040c4647b13b210a963c1ed407c1ff4fdfa01c31d6d2a098218702e6664f94f" +checksum = "6c4c0e91ead7a8f7acecbca6f003fc2e8282b1dbe2dd9c9d2f16aba42995e0a7" dependencies = [ "pest", "pest_meta", @@ -2411,12 +2365,11 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.8.6" +version = "2.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89815c69d36021a140146f26659a81d6c2afa33d216d736dd4be5381a7362220" +checksum = "f9744bc48116fee06334924bb5f2bad41eed5e89bd26e29b0b799f9a3f82c210" dependencies = [ "pest", - "sha2 0.10.9", ] [[package]] @@ -2494,18 +2447,8 @@ version = "0.8.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "986d2e952779af96ea048f160fd9194e1751b4faea78bcf3ceb456efe008088e" dependencies = [ - "der 0.8.0", - "spki 0.8.0", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der 0.7.10", - "spki 0.7.3", + "der", + "spki", ] [[package]] @@ -2514,8 +2457,8 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "451913da69c775a56034ea8d9003d27ee8948e12443eae7c038ba100a4f21cb7" dependencies = [ - "der 0.8.0", - "spki 0.8.0", + "der", + "spki", ] [[package]] @@ -2537,6 +2480,12 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "pointers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dcdc93847ad24990939cce6e1804361e903efcb5f99daa5abd87943a9d6d7ba" + [[package]] name = "postcard" version = "1.1.3" @@ -2575,12 +2524,30 @@ dependencies = [ ] [[package]] -name = "primeorder" -version = "0.13.6" +name = "primefield" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" +checksum = "c555a6e4eb7d4e158fcb028c835c3b8642206ddc279b5c6b202ef9a8bdb592f4" +dependencies = [ + "crypto-bigint", + "crypto-common 0.2.2", + "ff", + "rand_core", + "subtle", + "zeroize", +] + +[[package]] +name = "primeorder" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c9f42978c78a00e3d68f69fc03e57a234debae69da4020a4fb588fcdcd07b06" dependencies = [ "elliptic-curve", + "once_cell", + "primefield", + "serdect", + "wnaf", ] [[package]] @@ -2682,7 +2649,7 @@ dependencies = [ "dashmap", "flate2", "futures", - "hmac 0.13.0", + "hmac", "hyper", "image", "indexmap", @@ -2818,7 +2785,7 @@ dependencies = [ "serde_json", "tracing", "tracing-serde-structured", - "wit-bindgen 0.58.0", + "wit-bindgen", ] [[package]] @@ -2852,7 +2819,7 @@ dependencies = [ "base64 0.22.1", "bytes", "colored", - "crypto-bigint 0.7.5", + "crypto-bigint", "ecdsa", "enum_dispatch", "md5", @@ -2914,9 +2881,9 @@ dependencies = [ [[package]] name = "pxfm" -version = "0.1.29" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c5ccf5294c6ccd63a74f1565028353830a9c2f5eb0c682c355c471726a6e3f" +checksum = "d55d956fa96f5ec02be2e13af0e20391a5aa83d6a074e3ad368959d0fab299ea" [[package]] name = "quote" @@ -2927,12 +2894,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "r-efi" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" - [[package]] name = "r-efi" version = "6.0.0" @@ -2947,16 +2908,7 @@ checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80" dependencies = [ "chacha20", "getrandom 0.4.3", - "rand_core 0.10.1", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.17", + "rand_core", ] [[package]] @@ -3022,9 +2974,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.12.4" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba" +checksum = "2a0e75113e14dc5acb068cd0786884f214f1312650a3d36d269f5c4f3cdee8a2" dependencies = [ "aho-corasick", "memchr", @@ -3034,9 +2986,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" +checksum = "1f388202e4b80542a0921078cc23b6333bcf1409c1e3f86404cae4766a6131db" dependencies = [ "aho-corasick", "memchr", @@ -3051,12 +3003,12 @@ checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] name = "rfc6979" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +checksum = "b4a459cddafb3fe76b31fd8f1108007566c40301feb64dc7b54656eb7388172b" dependencies = [ - "hmac 0.12.1", - "subtle", + "crypto-bigint", + "hmac", ] [[package]] @@ -3079,23 +3031,23 @@ version = "0.10.0-rc.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30b2aa4ba0d89f73d1e332df05be0eeab8840351c36ca5654341dfdb57bb3caf" dependencies = [ - "const-oid 0.10.2", - "crypto-bigint 0.7.5", + "const-oid", + "crypto-bigint", "crypto-primes", "digest 0.11.3", "pkcs1", - "pkcs8 0.11.0", - "rand_core 0.10.1", - "signature 3.0.0", - "spki 0.8.0", + "pkcs8", + "rand_core", + "signature", + "spki", "zeroize", ] [[package]] name = "rustc-demangle" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b50b8869d9fc858ce7266cce0194bd74df58b9d0e3f6df3a9fc8eb470d95c09d" +checksum = "b74b56ffa8bb2830709a538c2cbcae9aa062db0d2a42563bfb09bdaae44020eb" [[package]] name = "rustc-hash" @@ -3182,9 +3134,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" +checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f" [[package]] name = "rustyline" @@ -3228,14 +3180,14 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sec1" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +checksum = "d56d437c2f19203ce5f7122e507831de96f3d2d4d3be5af44a0b0a09d8a80e4d" dependencies = [ - "base16ct 0.2.0", - "der 0.7.10", - "generic-array", - "pkcs8 0.10.2", + "base16ct", + "ctutils", + "der", + "hybrid-array", "subtle", "zeroize", ] @@ -3330,7 +3282,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66cf8fedced2fcf12406bcb34223dffb92eaf34908ede12fed414c82b7f00b3e" dependencies = [ - "base16ct 1.0.0", + "base16ct", "serde", ] @@ -3392,16 +3344,6 @@ dependencies = [ "libc", ] -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest 0.10.7", - "rand_core 0.6.4", -] - [[package]] name = "signature" version = "3.0.0" @@ -3409,7 +3351,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28d567dcbaf0049cb8ac2608a76cd95ff9e4412e1899d389ee400918ca7537f5" dependencies = [ "digest 0.11.3", - "rand_core 0.10.1", + "rand_core", ] [[package]] @@ -3473,16 +3415,6 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591" -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der 0.7.10", -] - [[package]] name = "spki" version = "0.8.0" @@ -3490,7 +3422,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d9efca8738c78ee9484207732f728b1ef517bbb1833d6fc0879ca898a522f6f" dependencies = [ "base64ct", - "der 0.8.0", + "der", ] [[package]] @@ -3541,9 +3473,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.39.5" +version = "0.39.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8bd2130a9b60bee2581bf82cfe89ee836424d1f37dcfa4ce21509611684673" +checksum = "d2071df9448915b71c4fe6d25deaf1c22f12bd234f01540b77312bb8e41361e6" dependencies = [ "libc", "memchr", @@ -4113,15 +4045,6 @@ version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" -[[package]] -name = "wasip2" -version = "1.0.4+wasi-0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487" -dependencies = [ - "wit-bindgen 0.57.1", -] - [[package]] name = "wasm-bindgen" version = "0.2.126" @@ -4174,19 +4097,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a879a421bd17c528b74721b2abf4c62e8f1d1889c2ba8c3c50d02deaf2ce395" dependencies = [ "leb128fmt", - "wasmparser", + "wasmparser 0.251.0", +] + +[[package]] +name = "wasm-encoder" +version = "0.253.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59972d6cd272259de647b7c1f1912e45e289c75ffd4be04e10695507cd7e1b59" +dependencies = [ + "leb128fmt", + "wasmparser 0.253.0", ] [[package]] name = "wasm-metadata" -version = "0.251.0" +version = "0.253.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f998ccc6e012f7b86865eb2a106c8a0422017a1a88977ce01a69f2244be2e57" +checksum = "b3f45816ef616806f48498bcd831377de578c4fa51db0c83ab8ceb78cc13523b" dependencies = [ "anyhow", "indexmap", - "wasm-encoder", - "wasmparser", + "wasm-encoder 0.253.0", + "wasmparser 0.253.0", ] [[package]] @@ -4202,6 +4135,18 @@ dependencies = [ "serde", ] +[[package]] +name = "wasmparser" +version = "0.253.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19db11f87d2486580e1e8b6f494c54df7e0566b87d0b599db843c24019667339" +dependencies = [ + "bitflags", + "hashbrown 0.17.1", + "indexmap", + "semver", +] + [[package]] name = "wasmprinter" version = "0.251.0" @@ -4210,7 +4155,7 @@ checksum = "8798c1a699bd25648b6708eefe94d97c6f9891febb94b42cca1f7a4b086ea64e" dependencies = [ "anyhow", "termcolor", - "wasmparser", + "wasmparser 0.251.0", ] [[package]] @@ -4241,7 +4186,7 @@ dependencies = [ "serde_derive", "smallvec", "target-lexicon", - "wasmparser", + "wasmparser 0.251.0", "wasmtime-environ", "wasmtime-internal-cache", "wasmtime-internal-component-macro", @@ -4280,8 +4225,8 @@ dependencies = [ "sha2 0.10.9", "smallvec", "target-lexicon", - "wasm-encoder", - "wasmparser", + "wasm-encoder 0.251.0", + "wasmparser 0.251.0", "wasmprinter", "wasmtime-internal-component-util", "wasmtime-internal-core", @@ -4319,7 +4264,7 @@ dependencies = [ "syn", "wasmtime-internal-component-util", "wasmtime-internal-wit-bindgen", - "wit-parser", + "wit-parser 0.251.0", ] [[package]] @@ -4359,7 +4304,7 @@ dependencies = [ "smallvec", "target-lexicon", "thiserror 2.0.18", - "wasmparser", + "wasmparser 0.251.0", "wasmtime-environ", "wasmtime-internal-core", "wasmtime-internal-unwinder", @@ -4437,7 +4382,7 @@ dependencies = [ "bitflags", "heck", "indexmap", - "wit-parser", + "wit-parser 0.251.0", ] [[package]] @@ -4852,35 +4797,29 @@ dependencies = [ [[package]] name = "wit-bindgen" -version = "0.57.1" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" - -[[package]] -name = "wit-bindgen" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a43552cfa071f246cfd99e5dbb23710dfe7336b3259e09339818483359470749" +checksum = "94c5e45f6d4cfaca727c1c48989ab3e05bb289bf84fbad226e1cfbbef2c04b7f" dependencies = [ "wit-bindgen-rust-macro", ] [[package]] name = "wit-bindgen-core" -version = "0.58.0" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4738d1c9a78e97bc7f664bfafd5d8e67d7bb26faa5c41e6d628e8bbdad3ec351" +checksum = "05cf25dc4bb1981c16aa549ec66c6762b7752bfb8b7c3b3936ae13100298dc72" dependencies = [ "anyhow", "heck", - "wit-parser", + "wit-parser 0.253.0", ] [[package]] name = "wit-bindgen-rust" -version = "0.58.0" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1130ce1f531bc9f9a75922244aa773bf5e2117fda1ef4a86b9f98d6b8135eb46" +checksum = "407ee2b474af1a366766fe91b8255b7935e5e3c3afb9c304e91ac3d154287ff1" dependencies = [ "anyhow", "heck", @@ -4894,9 +4833,9 @@ dependencies = [ [[package]] name = "wit-bindgen-rust-macro" -version = "0.58.0" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07296369e4d598e7e79b64eef66f724d83324ea671bcf677d78fc5cf92604ae5" +checksum = "37386eba32427684ffe37a0f765f63ce2ece03efb1ad28c23cf69562fdc67ec0" dependencies = [ "anyhow", "prettyplease", @@ -4909,9 +4848,9 @@ dependencies = [ [[package]] name = "wit-component" -version = "0.251.0" +version = "0.253.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a5e60173c413659c689f0581b0cf5d1a2404077568f9ffdce748a9eb2fc913" +checksum = "dbbd2500ac3488489ee8c6e59b79d7e47e6da5bfb019efd35d5dca57b78af624" dependencies = [ "anyhow", "bitflags", @@ -4920,10 +4859,10 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "wasm-encoder", + "wasm-encoder 0.253.0", "wasm-metadata", - "wasmparser", - "wit-parser", + "wasmparser 0.253.0", + "wit-parser 0.253.0", ] [[package]] @@ -4942,7 +4881,37 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser", + "wasmparser 0.251.0", +] + +[[package]] +name = "wit-parser" +version = "0.253.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d997b8e5920fcbeec742b58e583325d6419a6aca617ae8075c406a61c65ba8a" +dependencies = [ + "anyhow", + "hashbrown 0.17.1", + "id-arena", + "indexmap", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-ident", + "wasmparser 0.253.0", +] + +[[package]] +name = "wnaf" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab12e7090f27e2ffd9322651492942d50c2926094af30601e1964337db39daf1" +dependencies = [ + "ff", + "group", + "hybrid-array", ] [[package]] @@ -4982,18 +4951,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.52" +version = "0.8.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f" +checksum = "b7cbbc0a705a0fd05cc3676525980d2bf5a9bc4adac6d6475209a7887cf59d19" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.52" +version = "0.8.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930" +checksum = "e2e817b7b52d0c7358d3246da9d69935ebb18116b2b102b4230dac079b4862f5" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index a9a1e1465..bfcda5449 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -128,11 +128,11 @@ colored = { version = "3.1", default-features = false } console-subscriber = { version = "0.5.0", default-features = false } crc-fast = { version = "1.10.0", default-features = false, features = ["std"] } criterion = { version = "0.8", default-features = false } -crossbeam-utils = { version = "0.8.21", default-features = false, features = ["std"] } -crossfire = { version = "3.1.18", default-features = false, features = ["compat"] } +crossbeam-utils = { version = "0.8.22", default-features = false, features = ["std"] } +crossfire = { version = "3.1.19", default-features = false, features = ["compat"] } crypto-bigint = { version = "0.7.5", default-features = false } dashmap = { version = "6.2", default-features = false } -ecdsa = { version = "0.16.9", default-features = false, features = ["std"] } +ecdsa = { version = "0.17.0", default-features = false, features = ["std"] } either = { version = "1.16.0", default-features = false } enum_dispatch = { version = "0.3.13", default-features = false } flate2 = { version = "1.1.9", default-features = false, features = ["rust_backend"] } @@ -141,13 +141,13 @@ hmac = { version = "=0.13.0", default-features = false } indexmap = { version = "2.14", default-features = false, features = ["std"] } itertools = { version = "0.15.0", default-features = false, features = ["use_std"] } libloading = { version = "0.9", default-features = false, features = ["std"] } -lru = { version = "0.18.0", default-features = false } +lru = { version = "0.18.1", default-features = false } lz4-java-wrc = { version = "0.2.0", default-features = false, features = ["lz4_flex"] } md5 = { version = "0.8", default-features = false } num-bigint = { version = "0.5", default-features = false, features = ["std"] } num-derive = { version = "0.4", default-features = false } num-traits = { version = "0.2", default-features = false, features = ["std"] } -p384 = { version = "0.13.1", default-features = false, features = ["std", "arithmetic", "pkcs8", "ecdh"] } +p384 = { version = "0.14.0", default-features = false, features = ["std", "arithmetic", "pkcs8", "ecdh"] } phf = { version = "0.14.0", default-features = false, features = ["std"] } proc-macro2 = { version = "1.0", default-features = false, features = ["proc-macro"] } pumpkin-codecs = { path = "pumpkin-codecs", default-features = false } @@ -197,7 +197,7 @@ wasmtime-wasi = { version = "46.0", default-features = false, features = ["p2"] wasmtime-wasi-http = { version = "46.0", default-features = false, features = ["p2", "default-send-request"] } # needed for interacting with wasmtime-wasi-http - keep in sync hyper = { version = "^1.10", default-features = false } -wit-bindgen = { version = "0.58", default-features = false, features = ["macros"] } +wit-bindgen = { version = "0.59", default-features = false, features = ["macros"] } postcard = { version = "1.1", default-features = false, features = ["alloc"] } tracing-serde-structured = { version = "0.4", default-features = false } diff --git a/pumpkin-codegen/Cargo.lock b/pumpkin-codegen/Cargo.lock index 464ee8426..5bffe522d 100644 --- a/pumpkin-codegen/Cargo.lock +++ b/pumpkin-codegen/Cargo.lock @@ -10,9 +10,9 @@ checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "anyhow" -version = "1.0.102" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" +checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3" [[package]] name = "autocfg" @@ -20,12 +20,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" -[[package]] -name = "base16ct" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" - [[package]] name = "base16ct" version = "1.0.0" @@ -117,12 +111,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - [[package]] name = "const-oid" version = "0.10.2" @@ -187,18 +175,6 @@ version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" -[[package]] -name = "crypto-bigint" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" -dependencies = [ - "generic-array", - "rand_core 0.6.4", - "subtle", - "zeroize", -] - [[package]] name = "crypto-bigint" version = "0.7.5" @@ -207,9 +183,12 @@ checksum = "1a52aa3fcda4e6302a9f48734f234d35d4721b96f8fe07d073f07ce9df4f0271" dependencies = [ "cpubits", "ctutils", + "getrandom 0.4.1", + "hybrid-array", "num-traits", - "rand_core 0.10.1", + "rand_core", "serdect", + "subtle", "zeroize", ] @@ -229,7 +208,9 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77727bb15fa921304124b128af125e7e3b968275d1b108b379190264f4423710" dependencies = [ + "getrandom 0.4.1", "hybrid-array", + "rand_core", ] [[package]] @@ -238,9 +219,9 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21f41f23de7d24cdbda7f0c4d9c0351f99a4ceb258ef30e5c1927af8987ffe5a" dependencies = [ - "crypto-bigint 0.7.5", + "crypto-bigint", "libm", - "rand_core 0.10.1", + "rand_core", ] [[package]] @@ -250,16 +231,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e" dependencies = [ "cmov", -] - -[[package]] -name = "der" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" -dependencies = [ - "const-oid 0.9.6", - "zeroize", + "subtle", ] [[package]] @@ -268,7 +240,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71fd89660b2dc699704064e59e9dba0147b903e85319429e131620d022be411b" dependencies = [ - "const-oid 0.10.2", + "const-oid", "pem-rfc7468", "zeroize", ] @@ -286,9 +258,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", - "const-oid 0.9.6", "crypto-common 0.1.6", - "subtle", ] [[package]] @@ -298,22 +268,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4850db49bf08e663084f7fb5c87d202ef91a3907271aff24a94eb97ff039153c" dependencies = [ "block-buffer 0.12.0", - "const-oid 0.10.2", + "const-oid", "crypto-common 0.2.1", + "ctutils", ] [[package]] name = "ecdsa" -version = "0.16.9" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" +checksum = "c0681a4fc24c767085329728d8dfba959af91228aa4610cca4f8ce317ba46ae0" dependencies = [ - "der 0.7.10", - "digest 0.10.7", + "der", + "digest 0.11.2", "elliptic-curve", "rfc6979", - "signature 2.2.0", - "spki 0.7.3", + "signature", + "spki", + "zeroize", ] [[package]] @@ -324,18 +296,20 @@ checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e" [[package]] name = "elliptic-curve" -version = "0.13.8" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +checksum = "9d65aa39b3a5c1c9c1b745c9a019234bb7a21b77abcb4f4d266d706e2d577d65" dependencies = [ - "base16ct 0.2.0", - "crypto-bigint 0.5.5", - "digest 0.10.7", + "base16ct", + "crypto-bigint", + "crypto-common 0.2.1", + "digest 0.11.2", "ff", - "generic-array", "group", - "pkcs8 0.10.2", - "rand_core 0.6.4", + "hkdf", + "hybrid-array", + "pkcs8", + "rand_core", "sec1", "subtle", "zeroize", @@ -361,14 +335,20 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "ff" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" +checksum = "a1f686ab92a9fb0eaf188f6c6c87b89490baa6fdb0db4544ba4dc47f7942489f" dependencies = [ - "rand_core 0.6.4", + "rand_core", "subtle", ] +[[package]] +name = "fiat-crypto" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64cd1e32ddd350061ae6edb1b082d7c54915b5c672c389143b9a63403a109f24" + [[package]] name = "find-msvc-tools" version = "0.1.9" @@ -405,7 +385,6 @@ checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2" dependencies = [ "typenum", "version_check", - "zeroize", ] [[package]] @@ -428,18 +407,19 @@ dependencies = [ "cfg-if", "libc", "r-efi", + "rand_core", "wasip2", "wasip3", ] [[package]] name = "group" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +checksum = "7fd1a1c7a5206c5b7a3f5a0d7ccd3ff85d0c8f5133d62a02680255b0004af5f4" dependencies = [ "ff", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -468,12 +448,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] -name = "hmac" -version = "0.12.1" +name = "hkdf" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +checksum = "4aaa26c720c68b866f2c96ef5c1264b3e6f473fe5d4ce61cd44bbe913e553018" dependencies = [ - "digest 0.10.7", + "hmac", +] + +[[package]] +name = "hmac" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f" +dependencies = [ + "digest 0.11.2", ] [[package]] @@ -494,11 +483,13 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "hybrid-array" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d46837a0ed51fe95bd3b05de33cd64a1ee88fc797477ca48446872504507c5" +checksum = "818356c5132c1fede50f837ca96afbe78ff42413047f4abb886217845e1b6c8c" dependencies = [ + "subtle", "typenum", + "zeroize", ] [[package]] @@ -555,9 +546,9 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "log" -version = "0.4.32" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a" +checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" [[package]] name = "md-5" @@ -577,9 +568,9 @@ checksum = "ae960838283323069879657ca3de837e9f7bbb4c7bf6ea7f1b290d5e9476d2e0" [[package]] name = "memchr" -version = "2.8.1" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8" +checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "miniz_oxide" @@ -619,14 +610,16 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "p384" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6" +checksum = "d17b851e6b3e378ab4ecb07fa2ed23f4d15f075735f8fec9fa1e7bdce5f8301f" dependencies = [ "ecdsa", "elliptic-curve", + "fiat-crypto", + "primefield", "primeorder", - "sha2 0.10.9", + "sha2 0.11.0", ] [[package]] @@ -699,18 +692,8 @@ version = "0.8.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "986d2e952779af96ea048f160fd9194e1751b4faea78bcf3ceb456efe008088e" dependencies = [ - "der 0.8.0", - "spki 0.8.0", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der 0.7.10", - "spki 0.7.3", + "der", + "spki", ] [[package]] @@ -719,8 +702,8 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "451913da69c775a56034ea8d9003d27ee8948e12443eae7c038ba100a4f21cb7" dependencies = [ - "der 0.8.0", - "spki 0.8.0", + "der", + "spki", ] [[package]] @@ -744,12 +727,30 @@ dependencies = [ ] [[package]] -name = "primeorder" -version = "0.13.6" +name = "primefield" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" +checksum = "c555a6e4eb7d4e158fcb028c835c3b8642206ddc279b5c6b202ef9a8bdb592f4" +dependencies = [ + "crypto-bigint", + "crypto-common 0.2.1", + "ff", + "rand_core", + "subtle", + "zeroize", +] + +[[package]] +name = "primeorder" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c9f42978c78a00e3d68f69fc03e57a234debae69da4020a4fb588fcdcd07b06" dependencies = [ "elliptic-curve", + "once_cell", + "primefield", + "serdect", + "wnaf", ] [[package]] @@ -811,7 +812,7 @@ dependencies = [ "base64", "bytes", "colored", - "crypto-bigint 0.7.5", + "crypto-bigint", "ecdsa", "enum_dispatch", "md5", @@ -835,9 +836,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.45" +version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" +checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368" dependencies = [ "proc-macro2", ] @@ -848,15 +849,6 @@ version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.17", -] - [[package]] name = "rand_core" version = "0.10.1" @@ -885,12 +877,12 @@ dependencies = [ [[package]] name = "rfc6979" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +checksum = "b4a459cddafb3fe76b31fd8f1108007566c40301feb64dc7b54656eb7388172b" dependencies = [ + "crypto-bigint", "hmac", - "subtle", ] [[package]] @@ -913,15 +905,15 @@ version = "0.10.0-rc.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30b2aa4ba0d89f73d1e332df05be0eeab8840351c36ca5654341dfdb57bb3caf" dependencies = [ - "const-oid 0.10.2", - "crypto-bigint 0.7.5", + "const-oid", + "crypto-bigint", "crypto-primes", "digest 0.11.2", "pkcs1", - "pkcs8 0.11.0", - "rand_core 0.10.1", - "signature 3.0.0-rc.10", - "spki 0.8.0", + "pkcs8", + "rand_core", + "signature", + "spki", "zeroize", ] @@ -968,14 +960,14 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "sec1" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +checksum = "d56d437c2f19203ce5f7122e507831de96f3d2d4d3be5af44a0b0a09d8a80e4d" dependencies = [ - "base16ct 0.2.0", - "der 0.7.10", - "generic-array", - "pkcs8 0.10.2", + "base16ct", + "ctutils", + "der", + "hybrid-array", "subtle", "zeroize", ] @@ -1062,7 +1054,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9af4a3e75ebd5599b30d4de5768e00b5095d518a79fefc3ecbaf77e665d1ec06" dependencies = [ - "base16ct 1.0.0", + "base16ct", "serde", ] @@ -1096,22 +1088,12 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signature" -version = "2.2.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest 0.10.7", - "rand_core 0.6.4", -] - -[[package]] -name = "signature" -version = "3.0.0-rc.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f1880df446116126965eeec169136b2e0251dba37c6223bcc819569550edea3" +checksum = "28d567dcbaf0049cb8ac2608a76cd95ff9e4412e1899d389ee400918ca7537f5" dependencies = [ "digest 0.11.2", - "rand_core 0.10.1", + "rand_core", ] [[package]] @@ -1120,16 +1102,6 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der 0.7.10", -] - [[package]] name = "spki" version = "0.8.0" @@ -1137,7 +1109,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d9efca8738c78ee9484207732f728b1ef517bbb1833d6fc0879ca898a522f6f" dependencies = [ "base64ct", - "der 0.8.0", + "der", ] [[package]] @@ -1148,9 +1120,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.117" +version = "2.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" +checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422" dependencies = [ "proc-macro2", "quote", @@ -1405,9 +1377,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.252.0" +version = "0.253.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3eb099dcadcde5be9eef55e3a337128efd4e44b4c93122487e4d2e4e1c6627c" +checksum = "19db11f87d2486580e1e8b6f494c54df7e0566b87d0b599db843c24019667339" dependencies = [ "bitflags", "indexmap", @@ -1583,15 +1555,15 @@ dependencies = [ [[package]] name = "wit-encoder" -version = "0.252.0" +version = "0.253.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9290403ac4d75957e2633cde0854e807970d7eedc75ab3b8fba068b948dbe0" +checksum = "63b783601ee9357f78aaa12bc5cfd0cd0a2fb3d637de1f35604e14eef52ab97d" dependencies = [ "id-arena", "pretty_assertions", "semver", "serde", - "wit-parser 0.252.0", + "wit-parser 0.253.0", ] [[package]] @@ -1614,9 +1586,9 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.252.0" +version = "0.253.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4266bea110371c620ccf3201c5023676046bc4556e5c7cfb5d500bda5ebc162d" +checksum = "4d997b8e5920fcbeec742b58e583325d6419a6aca617ae8075c406a61c65ba8a" dependencies = [ "anyhow", "hashbrown 0.17.1", @@ -1628,7 +1600,18 @@ dependencies = [ "serde_derive", "serde_json", "unicode-ident", - "wasmparser 0.252.0", + "wasmparser 0.253.0", +] + +[[package]] +name = "wnaf" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab12e7090f27e2ffd9322651492942d50c2926094af30601e1964337db39daf1" +dependencies = [ + "ff", + "group", + "hybrid-array", ] [[package]] diff --git a/pumpkin-codegen/Cargo.toml b/pumpkin-codegen/Cargo.toml index 99e61e277..06ebc2723 100644 --- a/pumpkin-codegen/Cargo.toml +++ b/pumpkin-codegen/Cargo.toml @@ -16,7 +16,7 @@ serde_repr = { version = "0.1" } serde_json = { version = "1.0", features = ["preserve_order"] } serde_json5 = "0.2" -wit-encoder = "0.252.0" +wit-encoder = "0.253.0" semver = "1.0" rayon = "1.12.0" diff --git a/pumpkin-codegen/src/advancement.rs b/pumpkin-codegen/src/advancement.rs index ba6af46e9..6368bd8ee 100644 --- a/pumpkin-codegen/src/advancement.rs +++ b/pumpkin-codegen/src/advancement.rs @@ -493,7 +493,7 @@ impl TreeNodePosition { /// /// This is the third of three passes. It only executes if the minimum y value found in /// the second walk was negative, ensuring all final positions are non-negative. - fn third_walk(nodes: &mut Vec, idx: usize, offset: f32) { + fn third_walk(nodes: &mut Vec, _idx: usize, offset: f32) { nodes.iter_mut().for_each(|node| { node.y += offset; }); diff --git a/pumpkin-codegen/src/bedrock_creative.rs b/pumpkin-codegen/src/bedrock_creative.rs index 1a688c6d8..3fd90ed7a 100644 --- a/pumpkin-codegen/src/bedrock_creative.rs +++ b/pumpkin-codegen/src/bedrock_creative.rs @@ -75,11 +75,11 @@ pub fn build() -> TokenStream { let mut icon_item_id = 0i16; let mut icon_item_aux_value = 0u32; - if let Some(ref icon) = g.icon { - if let Some(&id) = bedrock_items_map.get(icon.name.as_str()) { - icon_item_id = id; - icon_item_aux_value = icon.meta.unwrap_or(0) as u32; - } + if let Some(ref icon) = g.icon + && let Some(&id) = bedrock_items_map.get(icon.name.as_str()) + { + icon_item_id = id; + icon_item_aux_value = icon.meta.unwrap_or(0) as u32; } group_tokens.push(quote! { diff --git a/pumpkin-codegen/src/block.rs b/pumpkin-codegen/src/block.rs index b96261373..979579b38 100644 --- a/pumpkin-codegen/src/block.rs +++ b/pumpkin-codegen/src/block.rs @@ -412,7 +412,7 @@ impl ToTokens for BlockPropertyStruct { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) @@ -1490,7 +1490,7 @@ fn get_be_data_from_nbt( pumpkin_nbt::tag::NbtTag::Int(v) => v.to_string(), pumpkin_nbt::tag::NbtTag::String(v) => v.into(), _ => { - panic!("Unexpected type for {}. Value: {val:?}", &key); + panic!("Unexpected type for {}. Value: {val:?}", key); } }; @@ -1525,7 +1525,9 @@ fn parse_geyser_entry( .unwrap_or(java_block_name) .strip_prefix("minecraft:") .unwrap_or_else(|| { - compound.get_string("bedrock_identifier").unwrap_or(java_block_name) + compound + .get_string("bedrock_identifier") + .unwrap_or(java_block_name) }) .to_string(); @@ -1543,7 +1545,10 @@ fn parse_geyser_entry( pumpkin_nbt::tag::NbtTag::Int(v) => v.to_string(), pumpkin_nbt::tag::NbtTag::String(v) => v.to_string(), _ => { - panic!("Unexpected NBT type in Geyser state tag for {}. Value: {:?}", key, val); + panic!( + "Unexpected NBT type in Geyser state tag for {}. Value: {:?}", + key, val + ); } }; properties.insert(key.to_string(), unpacked); @@ -1552,4 +1557,3 @@ fn parse_geyser_entry( (bedrock_identifier, properties) } - diff --git a/pumpkin-codegen/src/fluid.rs b/pumpkin-codegen/src/fluid.rs index fa7a1f185..0a82d9b7e 100644 --- a/pumpkin-codegen/src/fluid.rs +++ b/pumpkin-codegen/src/fluid.rs @@ -571,7 +571,7 @@ pub fn build() -> TokenStream { assert_eq!( expected_values, &property.values, "Enum overlap for '{}' ({:?} vs {:?})", - property.name, &property.values, expected_values + property.name, property.values, expected_values ); property_mapping.push(PropertyVariantMapping { diff --git a/pumpkin-codegen/src/wit/packet_mapping.rs b/pumpkin-codegen/src/wit/packet_mapping.rs index c091e9d66..02c7466a1 100644 --- a/pumpkin-codegen/src/wit/packet_mapping.rs +++ b/pumpkin-codegen/src/wit/packet_mapping.rs @@ -643,9 +643,9 @@ fn parse_packet_file( " id if id == {}::{}::to_id(version) => {{\n", rust_path_prefix, struct_name )); - output.push_str(&format!( - " use pumpkin_protocol::ServerPacket;\n" - )); + output.push_str( + &" use pumpkin_protocol::ServerPacket;\n".to_string(), + ); output.push_str(&format!( " let p = <{}::{} as pumpkin_protocol::ServerPacket>::read(&mut Cursor::new(payload), &version).ok()?;\n", rust_path_prefix, struct_name @@ -659,9 +659,9 @@ fn parse_packet_file( " id if id == <{}::{} as pumpkin_protocol::Packet>::PACKET_ID as i32 => {{\n", rust_path_prefix, struct_name )); - output.push_str(&format!( - " use pumpkin_protocol::BServerPacket;\n" - )); + output.push_str( + &" use pumpkin_protocol::BServerPacket;\n".to_string(), + ); output.push_str(&format!( " let p = <{}::{} as pumpkin_protocol::BServerPacket>::read(&mut Cursor::new(payload)).ok()?;\n", rust_path_prefix, struct_name @@ -708,7 +708,7 @@ fn parse_packet_file( " if let Some(p) = any.downcast_ref::<{}::{}>() {{\n", rust_path_prefix, struct_name )); - output.push_str(&format!(" return Some(p.to_wit());\n")); + output.push_str(&" return Some(p.to_wit());\n".to_string()); output.push_str(" }\n"); } } diff --git a/pumpkin-data/src/generated/block.rs b/pumpkin-data/src/generated/block.rs index 3e66bbe38..f2d6cdada 100644 --- a/pumpkin-data/src/generated/block.rs +++ b/pumpkin-data/src/generated/block.rs @@ -577858,7 +577858,7 @@ impl BlockProperties for OakFenceGateLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -577969,7 +577969,7 @@ impl BlockProperties for CakeLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -578078,7 +578078,7 @@ impl BlockProperties for JukeboxLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -578169,7 +578169,7 @@ impl BlockProperties for NetherPortalLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -578287,7 +578287,7 @@ impl BlockProperties for PaleMossCarpetLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -578457,7 +578457,7 @@ impl BlockProperties for ResinBrickWallLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -578611,7 +578611,7 @@ impl BlockProperties for DriedGhastLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -578735,7 +578735,7 @@ impl BlockProperties for MovingPistonLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -578844,7 +578844,7 @@ impl BlockProperties for PistonHeadLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -578965,7 +578965,7 @@ impl BlockProperties for CalibratedSculkSensorLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -579127,7 +579127,7 @@ impl BlockProperties for SculkSensorLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -579277,7 +579277,7 @@ impl BlockProperties for StickyPistonLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -579400,7 +579400,7 @@ impl BlockProperties for RedstoneWireLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -579584,7 +579584,7 @@ impl BlockProperties for ChiseledBookshelfLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -579729,7 +579729,7 @@ impl BlockProperties for StructureBlockLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -579817,7 +579817,7 @@ impl BlockProperties for ChorusFlowerLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -579924,7 +579924,7 @@ impl BlockProperties for CactusLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -580088,7 +580088,7 @@ impl BlockProperties for FireLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -580239,7 +580239,7 @@ impl BlockProperties for HopperLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -580344,7 +580344,7 @@ impl BlockProperties for TrialSpawnerLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -580455,7 +580455,7 @@ impl BlockProperties for ScaffoldingLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -580594,7 +580594,7 @@ impl BlockProperties for ComparatorLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -580735,7 +580735,7 @@ impl BlockProperties for WallTorchLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -580885,7 +580885,7 @@ impl BlockProperties for VaultLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -580989,7 +580989,7 @@ impl BlockProperties for GrindstoneLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -581115,7 +581115,7 @@ impl BlockProperties for LeverLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -581250,7 +581250,7 @@ impl BlockProperties for RepeaterLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -581417,7 +581417,7 @@ impl BlockProperties for OakDoorLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -581628,7 +581628,7 @@ impl BlockProperties for OakStairsLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -581810,7 +581810,7 @@ impl BlockProperties for SmallDripleafLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -581920,7 +581920,7 @@ impl BlockProperties for SkeletonWallSkullLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -582069,7 +582069,7 @@ impl BlockProperties for OakTrapdoorLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -582210,7 +582210,7 @@ impl BlockProperties for LecternLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -582324,7 +582324,7 @@ impl BlockProperties for BellLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -582435,7 +582435,7 @@ impl BlockProperties for TripwireHookLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -582567,7 +582567,7 @@ impl BlockProperties for AcaciaShelfLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -582690,7 +582690,7 @@ impl BlockProperties for EndPortalFrameLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -582792,7 +582792,7 @@ impl BlockProperties for FurnaceLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -582908,7 +582908,7 @@ impl BlockProperties for CampfireLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -583033,7 +583033,7 @@ impl BlockProperties for CopperGolemStatueLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -583170,7 +583170,7 @@ impl BlockProperties for WhiteBedLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -583292,7 +583292,7 @@ impl BlockProperties for BeeNestLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -583422,7 +583422,7 @@ impl BlockProperties for DecoratedPotLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -583568,7 +583568,7 @@ impl BlockProperties for LadderLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -583719,7 +583719,7 @@ impl BlockProperties for BigDripleafLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -583845,7 +583845,7 @@ impl BlockProperties for ChestLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -583964,7 +583964,7 @@ impl BlockProperties for PinkPetalsLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -584083,7 +584083,7 @@ impl BlockProperties for LeafLitterLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -584202,7 +584202,7 @@ impl BlockProperties for CocoaLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -584326,7 +584326,7 @@ impl BlockProperties for SculkShriekerLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -584430,7 +584430,7 @@ impl BlockProperties for PotentSulfurLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -584534,7 +584534,7 @@ impl BlockProperties for BambooLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -584655,7 +584655,7 @@ impl BlockProperties for RespawnAnchorLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -584780,7 +584780,7 @@ impl BlockProperties for EndRodLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -584897,7 +584897,7 @@ impl BlockProperties for DispenserLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -584999,7 +584999,7 @@ impl BlockProperties for ObserverLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -585111,7 +585111,7 @@ impl BlockProperties for LightningRodLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -585221,7 +585221,7 @@ impl BlockProperties for BarrelLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -585323,7 +585323,7 @@ impl BlockProperties for AmethystClusterLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -585428,7 +585428,7 @@ impl BlockProperties for CommandBlockLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -585543,7 +585543,7 @@ impl BlockProperties for NoteBlockLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -585713,7 +585713,7 @@ impl BlockProperties for BrewingStandLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -585817,7 +585817,7 @@ impl BlockProperties for SnowLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -585931,7 +585931,7 @@ impl BlockProperties for TallSeagrassLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -586031,7 +586031,7 @@ impl BlockProperties for PitcherCropLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -586159,7 +586159,7 @@ impl BlockProperties for CrafterLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -586254,7 +586254,7 @@ impl BlockProperties for FarmlandLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -586365,7 +586365,7 @@ impl BlockProperties for SuspiciousSandLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -586547,7 +586547,7 @@ impl BlockProperties for ResinBrickSlabLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -586729,7 +586729,7 @@ impl BlockProperties for StonePressurePlateLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -586842,7 +586842,7 @@ impl BlockProperties for CopperBulbLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -586982,7 +586982,7 @@ impl BlockProperties for TripwireLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -587101,7 +587101,7 @@ impl BlockProperties for PoweredRailLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -587208,7 +587208,7 @@ impl BlockProperties for SkeletonSkullLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -587345,7 +587345,7 @@ impl BlockProperties for TestBlockLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -587433,7 +587433,7 @@ impl BlockProperties for ComposterLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -587546,7 +587546,7 @@ impl BlockProperties for CaveVinesPlantLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -587640,7 +587640,7 @@ impl BlockProperties for CaveVinesLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -587794,7 +587794,7 @@ impl BlockProperties for TntLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -587919,7 +587919,7 @@ impl BlockProperties for BrownMushroomBlockLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -588064,7 +588064,7 @@ impl BlockProperties for GlowLichenLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -588200,7 +588200,7 @@ impl BlockProperties for VineLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -588322,7 +588322,7 @@ impl BlockProperties for RedstoneOreLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -588468,7 +588468,7 @@ impl BlockProperties for CandleLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -588602,7 +588602,7 @@ impl BlockProperties for PaleHangingMossLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -588690,7 +588690,7 @@ impl BlockProperties for BubbleColumnLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -588849,7 +588849,7 @@ impl BlockProperties for OakFenceLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -588992,7 +588992,7 @@ impl BlockProperties for SculkCatalystLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -589080,7 +589080,7 @@ impl BlockProperties for GrassBlockLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -589187,7 +589187,7 @@ impl BlockProperties for OakLeavesLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -589314,7 +589314,7 @@ impl BlockProperties for SnifferEggLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -589424,7 +589424,7 @@ impl BlockProperties for TurtleEggLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -589579,7 +589579,7 @@ impl BlockProperties for OakHangingSignLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -589738,7 +589738,7 @@ impl BlockProperties for DaylightDetectorLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -589872,7 +589872,7 @@ impl BlockProperties for WaterCauldronLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -589996,7 +589996,7 @@ impl BlockProperties for MangrovePropaguleLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -590137,7 +590137,7 @@ impl BlockProperties for LanternLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -590239,7 +590239,7 @@ impl BlockProperties for OakSaplingLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -590344,7 +590344,7 @@ impl BlockProperties for WheatLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -590458,7 +590458,7 @@ impl BlockProperties for JigsawLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -590568,7 +590568,7 @@ impl BlockProperties for PointedDripstoneLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -590677,7 +590677,7 @@ impl BlockProperties for SeaPickleLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -590825,7 +590825,7 @@ impl BlockProperties for MangroveRootsLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -590960,7 +590960,7 @@ impl BlockProperties for RailLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -591068,7 +591068,7 @@ impl BlockProperties for IronChainLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -591190,7 +591190,7 @@ impl BlockProperties for OakSignLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -591350,7 +591350,7 @@ impl BlockProperties for LightLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -591547,7 +591547,7 @@ impl BlockProperties for PaleOakWoodLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -591714,7 +591714,7 @@ impl BlockProperties for CreakingHeartLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -591832,7 +591832,7 @@ impl BlockProperties for WhiteBannerLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -591977,7 +591977,7 @@ impl BlockProperties for WaterLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -592104,7 +592104,7 @@ impl BlockProperties for KelpLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -592251,7 +592251,7 @@ impl BlockProperties for LightWeightedPressurePlateLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -592378,7 +592378,7 @@ impl BlockProperties for TorchflowerCropLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } @@ -592477,7 +592477,7 @@ impl BlockProperties for NetherWartLikeProperties { Self::from_index(id.as_u16() - min_id) } else { #[cfg(debug_assertions)] - panic!("State ID {} does not exist for {}", id, &block.name); + panic!("State ID {} does not exist for {}", id, block.name); #[cfg(not(debug_assertions))] Self::from_index(0) } diff --git a/pumpkin-data/src/generated/fluid.rs b/pumpkin-data/src/generated/fluid.rs index 4839b30d5..b91a9c1aa 100644 --- a/pumpkin-data/src/generated/fluid.rs +++ b/pumpkin-data/src/generated/fluid.rs @@ -902,7 +902,7 @@ impl FluidProperties for WaterLikeFluidProperties { if !["water", "lava"].contains(&fluid.name) { panic!( "{} is not a valid fluid for {}", - &fluid.name, "WaterLikeFluidProperties" + fluid.name, "WaterLikeFluidProperties" ); } let prop_index = self.to_index(); @@ -916,7 +916,7 @@ impl FluidProperties for WaterLikeFluidProperties { if !["water", "lava"].contains(&fluid.name) { panic!( "{} is not a valid fluid for {}", - &fluid.name, "WaterLikeFluidProperties" + fluid.name, "WaterLikeFluidProperties" ); } for (idx, state) in fluid.states.iter().enumerate() { @@ -930,7 +930,7 @@ impl FluidProperties for WaterLikeFluidProperties { if !["water", "lava"].contains(&fluid.name) { panic!( "{} is not a valid fluid for {}", - &fluid.name, "WaterLikeFluidProperties" + fluid.name, "WaterLikeFluidProperties" ); } Self::from_index(fluid.default_state_index) @@ -942,7 +942,7 @@ impl FluidProperties for WaterLikeFluidProperties { if !["water", "lava"].contains(&fluid.name) { panic!( "{} is not a valid fluid for {}", - &fluid.name, "WaterLikeFluidProperties" + fluid.name, "WaterLikeFluidProperties" ); } let mut fluid_props = Self::default(fluid); @@ -990,7 +990,7 @@ impl FluidProperties for FlowingWaterLikeFluidProperties { if !["flowing_water", "flowing_lava"].contains(&fluid.name) { panic!( "{} is not a valid fluid for {}", - &fluid.name, "FlowingWaterLikeFluidProperties" + fluid.name, "FlowingWaterLikeFluidProperties" ); } let prop_index = self.to_index(); @@ -1004,7 +1004,7 @@ impl FluidProperties for FlowingWaterLikeFluidProperties { if !["flowing_water", "flowing_lava"].contains(&fluid.name) { panic!( "{} is not a valid fluid for {}", - &fluid.name, "FlowingWaterLikeFluidProperties" + fluid.name, "FlowingWaterLikeFluidProperties" ); } for (idx, state) in fluid.states.iter().enumerate() { @@ -1018,7 +1018,7 @@ impl FluidProperties for FlowingWaterLikeFluidProperties { if !["flowing_water", "flowing_lava"].contains(&fluid.name) { panic!( "{} is not a valid fluid for {}", - &fluid.name, "FlowingWaterLikeFluidProperties" + fluid.name, "FlowingWaterLikeFluidProperties" ); } Self::from_index(fluid.default_state_index) @@ -1033,7 +1033,7 @@ impl FluidProperties for FlowingWaterLikeFluidProperties { if !["flowing_water", "flowing_lava"].contains(&fluid.name) { panic!( "{} is not a valid fluid for {}", - &fluid.name, "FlowingWaterLikeFluidProperties" + fluid.name, "FlowingWaterLikeFluidProperties" ); } let mut fluid_props = Self::default(fluid); diff --git a/pumpkin-protocol/src/bedrock/frame_set.rs b/pumpkin-protocol/src/bedrock/frame_set.rs index cc670abb8..807a12e5b 100644 --- a/pumpkin-protocol/src/bedrock/frame_set.rs +++ b/pumpkin-protocol/src/bedrock/frame_set.rs @@ -70,9 +70,9 @@ impl Frame { let mut frames = Vec::new(); let mut header_buf = [0u8; 1]; - while match reader.read(&mut header_buf) { - Ok(n) => n > 0, - Err(e) => return Err(e), + while { + let n = reader.read(&mut header_buf)?; + n > 0 } { let header = header_buf[0]; let mut frame = Self::default(); diff --git a/pumpkin-world/src/chunk/format/anvil.rs b/pumpkin-world/src/chunk/format/anvil.rs index 282e27b8e..21cebd50b 100644 --- a/pumpkin-world/src/chunk/format/anvil.rs +++ b/pumpkin-world/src/chunk/format/anvil.rs @@ -408,7 +408,7 @@ impl AnvilChunkFile { { // Verify we are actually two sectors into the file let current_pos = write.stream_position().await?; - assert!(current_pos as usize == 2 * SECTOR_BYTES); + assert_eq!(current_pos as usize, 2 * SECTOR_BYTES); }; let mut current_sector = 2; diff --git a/pumpkin-world/src/chunk_system/chunk_loading.rs b/pumpkin-world/src/chunk_system/chunk_loading.rs index 42e547040..d515561d0 100644 --- a/pumpkin-world/src/chunk_system/chunk_loading.rs +++ b/pumpkin-world/src/chunk_system/chunk_loading.rs @@ -99,7 +99,7 @@ impl LevelCache { match change.entry(pos) { Entry::Occupied(mut entry) => { let i = entry.get_mut(); - debug_assert!(i.1 == value.0); + debug_assert_eq!(i.1, value.0); if i.0 == value.1 { entry.remove(); } else { diff --git a/pumpkin-world/src/generation/structure/structures/jigsaw_placement.rs b/pumpkin-world/src/generation/structure/structures/jigsaw_placement.rs index 183cea3b6..79a9906ec 100644 --- a/pumpkin-world/src/generation/structure/structures/jigsaw_placement.rs +++ b/pumpkin-world/src/generation/structure/structures/jigsaw_placement.rs @@ -104,10 +104,9 @@ impl JigsawPlacement { } } - if let Some(anchor) = found_anchor { + { + let anchor = found_anchor?; anchored_position = anchor; - } else { - return None; } } diff --git a/pumpkin/src/entity/player/advancement.rs b/pumpkin/src/entity/player/advancement.rs index 47d4c1c4b..665fff20c 100644 --- a/pumpkin/src/entity/player/advancement.rs +++ b/pumpkin/src/entity/player/advancement.rs @@ -227,7 +227,7 @@ impl PlayerAdvancement { pub fn new(manager: Arc, uuid: Uuid) -> Self { Self { progress: AdvancementProgressMap::default(), - path: manager.advancement_path.join(format!("{}.json", &uuid)), + path: manager.advancement_path.join(format!("{uuid}.json")), manager, player: Weak::new(), is_first_packet: true,