diff --git a/Cargo.lock b/Cargo.lock index dbe2082c..0f271b78 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -138,8 +138,8 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62f7df18977a1ee03650ee4b31b4aefed6d56bac188760b6e37610400fe8d4bb" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.55", ] @@ -164,8 +164,8 @@ name = "azalea-block-macros" version = "0.9.0" source = "git+https://github.com/azalea-rs/azalea#38bb98707e92747910793669d2f03dc7ee9533fd" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.55", ] @@ -187,8 +187,8 @@ name = "azalea-buf-macros" version = "0.9.0" source = "git+https://github.com/azalea-rs/azalea#38bb98707e92747910793669d2f03dc7ee9533fd" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.55", ] @@ -225,8 +225,8 @@ name = "azalea-inventory-macros" version = "0.9.0" source = "git+https://github.com/azalea-rs/azalea#38bb98707e92747910793669d2f03dc7ee9533fd" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.55", ] @@ -246,8 +246,8 @@ name = "azalea-registry-macros" version = "0.9.0" source = "git+https://github.com/azalea-rs/azalea#38bb98707e92747910793669d2f03dc7ee9533fd" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.55", ] @@ -296,6 +296,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "base64ct" version = "1.6.0" @@ -324,7 +330,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f484318350462c58ba3942a45a656c1fd6b6e484a6b6b7abc3a787ad1a51e500" dependencies = [ "bevy_macro_utils 0.12.1", - "quote 1.0.35", + "quote", "syn 2.0.55", ] @@ -375,8 +381,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8843aa489f159f25cdcd9fee75cd7d221a7098a71eaa72cb2d6b40ac4e3f1ba" dependencies = [ "bevy_macro_utils 0.12.1", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.55", ] @@ -387,8 +393,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55dbbb6300f08cef5983497970db8545d3cbda6ee4f410a6c6742b7b6bbfd3af" dependencies = [ "bevy_macro_utils 0.13.1", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.55", ] @@ -398,8 +404,8 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e566640c6b6dced73d2006c764c2cffebe1a82be4809486c4a5d7b4b50efed4d" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "rustc-hash", "syn 2.0.55", "toml_edit 0.20.7", @@ -411,8 +417,8 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bbbf88fc577a21ee9994feed2253ee9838b63fb976783b7a549edfbe07c6764" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "rustc-hash", "syn 2.0.55", "toml_edit 0.21.1", @@ -452,8 +458,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2a8791d5841a6db862571f709d7ee70c2a5eb1634c3a4329817d04f0e307c2d" dependencies = [ "bevy_macro_utils 0.13.1", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.55", "uuid", ] @@ -529,8 +535,8 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7aafecc952b6b8eb1a93c12590bd867d25df2f4ae1033a01dfdfc3c35ebccfff" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.55", ] @@ -540,8 +546,8 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "014c80f466ed01821a2e602d63cd5076915c1af5de5fa3c074cc4a9ca898ada7" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.55", ] @@ -551,8 +557,8 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a26b8cea8bb6a81b75a84603b9e096f05fa86db057904ef29be1deee900532bd" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.55", ] @@ -746,41 +752,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "darling" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcfbcb0c5961907597a7d1148e3af036268f2b773886b8bb3eeb1e1281d3d3d6" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afc018370c3bff3eb51f89256a6bdb18b4fdcda72d577982a14954a7a0b402c" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2 0.4.30", - "quote 0.6.13", - "strsim", - "syn 0.15.44", -] - -[[package]] -name = "darling_macro" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6d8dac1c6f1d29a41c4712b4400f878cb4fcc4c7628f298dd75038e024998d1" -dependencies = [ - "darling_core", - "quote 0.6.13", - "syn 0.15.44", -] - [[package]] name = "deranged" version = "0.3.11" @@ -790,31 +761,6 @@ dependencies = [ "powerfmt", ] -[[package]] -name = "derive_builder" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ac53fa6a3cda160df823a9346442525dcaf1e171999a1cf23e67067e4fd64d4" -dependencies = [ - "darling", - "derive_builder_core", - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - -[[package]] -name = "derive_builder_core" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0288a23da9333c246bb18c143426074a6ae96747995c5819d2947b64cd942b37" -dependencies = [ - "darling", - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - [[package]] name = "derive_more" version = "0.99.17" @@ -822,8 +768,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "rustc_version", "syn 1.0.109", ] @@ -843,8 +789,8 @@ version = "1.0.0-beta.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.55", ] @@ -905,8 +851,8 @@ name = "evenio_macros" version = "0.4.1" source = "git+https://github.com/rj00a/evenio#0913f3b23512b2dce58141e3a79428db55c96dca" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.55", ] @@ -1088,8 +1034,8 @@ dependencies = [ "heck", "itertools", "prettyplease", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "serde", "serde_json", "syn 2.0.55", @@ -1185,12 +1131,6 @@ dependencies = [ "cc", ] -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "idna" version = "0.5.0" @@ -1394,8 +1334,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "176a5f5e69613d9e88337cf2a65e11135332b4efbcc628404a7c555e4452084c" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.55", ] @@ -1443,79 +1383,12 @@ dependencies = [ "winapi", ] -[[package]] -name = "num" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" -dependencies = [ - "autocfg", - "num-traits", -] - [[package]] name = "num-conv" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" -dependencies = [ - "autocfg", - "num-bigint", - "num-integer", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.18" @@ -1661,19 +1534,10 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2", "syn 2.0.55", ] -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid", -] - [[package]] name = "proc-macro2" version = "1.0.79" @@ -1683,32 +1547,13 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "quadtree_rs" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba363923b69b8ae7b125648e48c3b31ae6e5305567fb6b5a9a08987dc62019a9" -dependencies = [ - "derive_builder", - "num", -] - -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", -] - [[package]] name = "quote" version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2", ] [[package]] @@ -1880,8 +1725,8 @@ version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.55", ] @@ -1903,7 +1748,7 @@ dependencies = [ "anyhow", "azalea-buf", "azalea-world", - "base64", + "base64 0.22.0", "bytes", "chunk", "evenio", @@ -1913,7 +1758,6 @@ dependencies = [ "itertools", "mimalloc", "monoio", - "quadtree_rs", "rand 0.8.5", "rand_distr", "serde_json", @@ -1996,8 +1840,8 @@ name = "simdnbt-derive" version = "0.4.1" source = "git+https://github.com/azalea-rs/simdnbt#860d6e1b3a50d49b58b2853bf160420cd0b5eafe" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.55", ] @@ -2043,37 +1887,20 @@ dependencies = [ "lock_api", ] -[[package]] -name = "strsim" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550" - [[package]] name = "subtle" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid", -] - [[package]] name = "syn" version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "unicode-ident", ] @@ -2083,8 +1910,8 @@ version = "2.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "unicode-ident", ] @@ -2103,8 +1930,8 @@ version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.55", ] @@ -2206,8 +2033,8 @@ version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.55", ] @@ -2274,12 +2101,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - [[package]] name = "url" version = "2.5.0" @@ -2308,7 +2129,7 @@ version = "0.2.0-alpha.1+mc.1.20.1" source = "git+https://github.com/valence-rs/valence#7e91ca0f6d4608258524052bd521c5a6cbf221d4" dependencies = [ "anyhow", - "proc-macro2 1.0.79", + "proc-macro2", "syn 2.0.55", ] @@ -2319,8 +2140,8 @@ source = "git+https://github.com/valence-rs/valence#7e91ca0f6d4608258524052bd521 dependencies = [ "anyhow", "heck", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "serde", "serde_json", "uuid", @@ -2344,8 +2165,8 @@ name = "valence_ident_macros" version = "0.2.0-alpha.1+mc.1.20.1" source = "git+https://github.com/valence-rs/valence#7e91ca0f6d4608258524052bd521c5a6cbf221d4" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.55", ] @@ -2386,7 +2207,7 @@ version = "0.2.0-alpha.1+mc.1.20.1" source = "git+https://github.com/valence-rs/valence#7e91ca0f6d4608258524052bd521c5a6cbf221d4" dependencies = [ "anyhow", - "base64", + "base64 0.21.7", "bevy_ecs 0.12.1", "bitfield-struct", "byteorder", @@ -2412,8 +2233,8 @@ version = "0.2.0-alpha.1+mc.1.20.1" source = "git+https://github.com/valence-rs/valence#7e91ca0f6d4608258524052bd521c5a6cbf221d4" dependencies = [ "heck", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.55", ] @@ -2504,8 +2325,8 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.55", "wasm-bindgen-shared", ] @@ -2528,7 +2349,7 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ - "quote 1.0.35", + "quote", "wasm-bindgen-macro-support", ] @@ -2538,8 +2359,8 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.55", "wasm-bindgen-backend", "wasm-bindgen-shared", @@ -2767,8 +2588,8 @@ version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.55", ] @@ -2778,8 +2599,8 @@ version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "201585ea96d37ee69f2ac769925ca57160cef31acb137c16f38b02b76f4c1e62" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.55", ] diff --git a/generator-build/Cargo.toml b/generator-build/Cargo.toml index 690e2729..e7567441 100644 --- a/generator-build/Cargo.toml +++ b/generator-build/Cargo.toml @@ -14,7 +14,7 @@ proc-macro2 = "1.0.79" quote = "1.0.35" serde = { version = "1.0.197", features = ["derive"] } serde_json = "1.0.114" -syn = "2.0.53" +syn = "2.0.55" [lints.rust] warnings = "deny" diff --git a/server/Cargo.toml b/server/Cargo.toml index f63231a5..9b85090b 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -6,11 +6,11 @@ authors = ["Andrew Gazelka "] readme = "README.md" [dependencies] -anyhow = "1.0.80" +anyhow = "1.0.81" tracing-subscriber = { version = "0.3.18", features = ["chrono"] } tracing = "0.1.40" serde_json = "1.0.114" -bytes = "1.5.0" +bytes = "1.6.0" valence_protocol = { git = "https://github.com/valence-rs/valence" } valence_registry = { git = "https://github.com/valence-rs/valence" } @@ -38,10 +38,9 @@ flume = "0.11.0" # todo: how much will adding "sync" wakers hurt performance? monoio = { version = "0.2.3", features = ["sync"] } signal-hook = "0.3.17" -base64 = "0.21.7" +base64 = "0.22.0" uuid = "1.8.0" rand_distr = "0.4.3" -quadtree = { version = "0.1.3" , package = "quadtree_rs" } smallvec = { git = "https://github.com/servo/rust-smallvec" } fnv = "1.0.7" #pprof = { version = "0.13.0", features = ["flamegraph"] }