From e29ede7c970c109305aba356650ec5fa937bc934 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= Date: Fri, 19 Nov 2021 14:01:08 +0100 Subject: [PATCH] updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit. --- Cargo.lock | 1161 +++++++++++++++---------- client/Cargo.toml | 4 +- client/src/lib.rs | 2 +- common/Cargo.toml | 6 +- common/assets/Cargo.toml | 2 +- common/frontend/Cargo.toml | 6 +- common/src/terrain/block.rs | 4 +- network/Cargo.toml | 4 +- network/protocol/Cargo.toml | 2 +- network/src/channel.rs | 19 +- server-cli/Cargo.toml | 4 +- server/Cargo.toml | 10 +- server/src/lib.rs | 30 +- voxygen/Cargo.toml | 14 +- voxygen/egui/Cargo.toml | 4 +- voxygen/egui/src/lib.rs | 13 +- voxygen/egui/src/widgets.rs | 8 +- voxygen/i18n/Cargo.toml | 2 +- voxygen/src/render/renderer/drawer.rs | 2 +- world/Cargo.toml | 10 +- 20 files changed, 784 insertions(+), 523 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 45e47bf983..ded3fec26a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,27 +4,27 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af0ac006645f86f20f6c6fa4dcaef920bf803df819123626f9440e35835e7d80" +checksum = "20b228f2c198f98d4337ceb560333fb12cbb2f4948a953bf8c57d09deb219603" dependencies = [ "ab_glyph_rasterizer", - "owned_ttf_parser 0.12.1", + "owned_ttf_parser 0.13.2", ] [[package]] name = "ab_glyph_rasterizer" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9fe5e32de01730eb1f6b7f5b51c17e03e2325bf40a74f754f04f130043affff" +checksum = "a13739d7177fbd22bb0ed28badfff9f372f8bef46c863db4e1c6248f6b223b6e" [[package]] name = "addr2line" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd" +checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" dependencies = [ - "gimli 0.25.0", + "gimli 0.26.1", ] [[package]] @@ -47,9 +47,9 @@ checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" [[package]] name = "ahash" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ "getrandom 0.2.3", "once_cell", @@ -74,7 +74,7 @@ dependencies = [ "alsa-sys", "bitflags", "libc", - "nix 0.20.1", + "nix 0.20.0", ] [[package]] @@ -172,8 +172,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0609c78bd572f4edc74310dfb63a01f5609d53fa8b4dd7c4d98aef3b3e8d72d1" dependencies = [ "proc-macro-hack", - "quote 1.0.9", - "syn 1.0.76", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -209,22 +209,22 @@ version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06063a002a77d2734631db74e8f4ce7148b77fe522e6bca46f2ae7774fd48112" dependencies = [ - "libloading 0.7.0", + "libloading 0.7.2", ] [[package]] name = "assets_manager" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1091e796450c5caa4bf1b05e4c17581291a281652e2faa870d2f1a64d51e7436" +checksum = "35c55040a3eee1353bfa4bee2c03a695395d64176e8063223aa62d11b4ef669c" dependencies = [ - "ahash 0.7.4", + "ahash 0.7.6", "bincode", "crossbeam-channel", "log", "notify 4.0.17", "parking_lot 0.11.2", - "ron", + "ron 0.7.0", "serde", "serde_json", ] @@ -246,9 +246,9 @@ version = "0.1.51" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e" dependencies = [ - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -259,9 +259,9 @@ checksum = "c9ff149ed9780025acfdb36862d35b28856bb693ceb451259a7164442f22fdc3" [[package]] name = "atomic_refcell" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681b971236e0f76b20fcafca0236b8718c9186ee778d67cd78bd5f28fd85427f" +checksum = "73b5e5f48b927f04e952dedc932f31995a65a0bf65ec971c74436e51bf6e970d" [[package]] name = "atomicwrites" @@ -269,7 +269,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4830ac690261d0b47f06e86d18c47eaa65d0184e576cf9b62c3a49b28cb876b" dependencies = [ - "nix 0.20.1", + "nix 0.20.0", "tempfile", "winapi 0.3.9", ] @@ -320,16 +320,16 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "backtrace" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01" +checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6" dependencies = [ "addr2line", "cc", "cfg-if 1.0.0", "libc", "miniz_oxide 0.4.4", - "object 0.26.2", + "object 0.27.1", "rustc-demangle", ] @@ -369,8 +369,8 @@ dependencies = [ "lazycell", "log", "peeking_take_while", - "proc-macro2 1.0.29", - "quote 1.0.9", + "proc-macro2 1.0.32", + "quote 1.0.10", "regex", "rustc-hash", "shlex", @@ -394,9 +394,9 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitvec" @@ -429,9 +429,9 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "bstr" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279" +checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" dependencies = [ "lazy_static", "memchr", @@ -441,9 +441,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.7.1" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9df67f7bf9ef8498769f994239c45613ef0c5899415fb58e9add412d2c1a538" +checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c" [[package]] name = "bytemuck" @@ -460,9 +460,9 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e215f8c2f9f79cb53c8335e687ffd07d5bfcb6fe5fc80723762d0be46e7cc54" dependencies = [ - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -510,9 +510,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.70" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0" +checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" dependencies = [ "jobserver", ] @@ -572,13 +572,13 @@ checksum = "d6144914dd4928dc86677ef8824a77cf1a5df915590af7befa0ac8d9815cd740" [[package]] name = "clang-sys" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10612c0ec0e0a1ff0e97980647cb058a6e7aedb913d01d009c406b8b7d0b26ee" +checksum = "fa66045b9cb23c2e9c1520732030608b02ee07e5cfaa5a521ec15ded7fa24c90" dependencies = [ "glob", "libc", - "libloading 0.7.0", + "libloading 0.7.2", ] [[package]] @@ -608,9 +608,9 @@ dependencies = [ [[package]] name = "clipboard-win" -version = "4.2.1" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4ea1881992efc993e4dc50a324cdbd03216e41bdc8385720ff47efc9bd2ca8" +checksum = "3db8340083d28acb43451166543b98c838299b7e0863621be53a338adceea0ed" dependencies = [ "error-code", "str-buf", @@ -658,9 +658,9 @@ dependencies = [ [[package]] name = "cmake" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb6210b637171dfba4cda12e579ac6dc73f5165ad56133e5d72ef3131f320855" +checksum = "b7b858541263efe664aead4a5209a4ae5c5d2811167d4ed4ee0944503f8d2089" dependencies = [ "cc", ] @@ -674,8 +674,8 @@ dependencies = [ "bitflags", "block", "cocoa-foundation", - "core-foundation 0.9.1", - "core-graphics 0.22.2", + "core-foundation 0.9.2", + "core-graphics 0.22.3", "foreign-types", "libc", "objc", @@ -689,7 +689,7 @@ checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" dependencies = [ "bitflags", "block", - "core-foundation 0.9.1", + "core-foundation 0.9.2", "core-graphics-types", "foreign-types", "libc", @@ -714,9 +714,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "combine" -version = "4.6.1" +version = "4.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a909e4d93292cd8e9c42e189f61681eff9d67b6541f96b8a1a737f23737bd001" +checksum = "b2b2f5d0ee456f3928812dfc8c6d9a1d592b98678f6d56db9b0cd2b7bc6c8db5" dependencies = [ "bytes", "memchr", @@ -818,11 +818,11 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" +checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3" dependencies = [ - "core-foundation-sys 0.8.2", + "core-foundation-sys 0.8.3", "libc", ] @@ -840,9 +840,9 @@ checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" [[package]] name = "core-foundation-sys" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "core-graphics" @@ -858,12 +858,12 @@ dependencies = [ [[package]] name = "core-graphics" -version = "0.22.2" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "269f35f69b542b80e736a20a89a05215c0ce80c2c03c514abb2e318b78379d86" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ "bitflags", - "core-foundation 0.9.1", + "core-foundation 0.9.2", "core-graphics-types", "foreign-types", "libc", @@ -876,7 +876,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" dependencies = [ "bitflags", - "core-foundation 0.9.1", + "core-foundation 0.9.2", "foreign-types", "libc", ] @@ -920,7 +920,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98f45f0a21f617cd2c788889ef710b63f075c949259593ea09c826f1e47a2418" dependencies = [ "alsa", - "core-foundation-sys 0.8.2", + "core-foundation-sys 0.8.3", "coreaudio-rs", "jni", "js-sys", @@ -929,7 +929,7 @@ dependencies = [ "mach 0.3.2", "ndk 0.3.0", "ndk-glue 0.3.0", - "nix 0.20.1", + "nix 0.20.0", "oboe", "parking_lot 0.11.2", "stdweb 0.1.3", @@ -1160,7 +1160,7 @@ dependencies = [ "crossterm_winapi 0.6.2", "lazy_static", "libc", - "mio 0.7.13", + "mio 0.7.14", "parking_lot 0.10.2", "signal-hook 0.1.17", "winapi 0.3.9", @@ -1168,14 +1168,14 @@ dependencies = [ [[package]] name = "crossterm" -version = "0.21.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486d44227f71a1ef39554c0dc47e44b9f4139927c75043312690c3f476d1d788" +checksum = "c85525306c4291d1b73ce93c8acf9c339f9b213aef6c1d85c3830cbf1c16325c" dependencies = [ "bitflags", - "crossterm_winapi 0.8.0", + "crossterm_winapi 0.9.0", "libc", - "mio 0.7.13", + "mio 0.7.14", "parking_lot 0.11.2", "signal-hook 0.3.10", "signal-hook-mio", @@ -1193,9 +1193,9 @@ dependencies = [ [[package]] name = "crossterm_winapi" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6966607622438301997d3dac0d2f6e9a90c68bb6bc1785ea98456ab93c0507" +checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" dependencies = [ "winapi 0.3.9", ] @@ -1228,7 +1228,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" dependencies = [ - "sct", + "sct 0.6.1", ] [[package]] @@ -1238,7 +1238,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2daefd788d1e96e0a9d66dee4b828b883509bc3ea9ce30665f04c3246372690c" dependencies = [ "bitflags", - "libloading 0.7.0", + "libloading 0.7.2", "winapi 0.3.9", ] @@ -1279,10 +1279,10 @@ checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.29", - "quote 1.0.9", + "proc-macro2 1.0.32", + "quote 1.0.10", "strsim 0.9.3", - "syn 1.0.76", + "syn 1.0.81", ] [[package]] @@ -1293,10 +1293,10 @@ checksum = "2c34d8efb62d0c2d7f60ece80f75e5c63c1588ba68032740494b0b9a996466e3" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.29", - "quote 1.0.9", + "proc-macro2 1.0.32", + "quote 1.0.10", "strsim 0.10.0", - "syn 1.0.76", + "syn 1.0.81", ] [[package]] @@ -1306,8 +1306,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" dependencies = [ "darling_core 0.10.2", - "quote 1.0.9", - "syn 1.0.76", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -1317,8 +1317,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade7bff147130fe5e6d39f089c6bd49ec0250f35d70b2eebf72afdfc919f15cc" dependencies = [ "darling_core 0.13.0", - "quote 1.0.9", - "syn 1.0.76", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -1333,9 +1333,9 @@ dependencies = [ [[package]] name = "deflate" -version = "0.9.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f95bf05dffba6e6cce8dfbb30def788154949ccd9aed761b472119c21e01c70" +checksum = "c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f" dependencies = [ "adler32", ] @@ -1346,9 +1346,9 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -1367,6 +1367,15 @@ dependencies = [ "dirs-sys-next", ] +[[package]] +name = "dirs" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" +dependencies = [ + "dirs-sys", +] + [[package]] name = "dirs-next" version = "2.0.0" @@ -1377,6 +1386,17 @@ dependencies = [ "dirs-sys-next", ] +[[package]] +name = "dirs-sys" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" +dependencies = [ + "libc", + "redox_users", + "winapi 0.3.9", +] + [[package]] name = "dirs-sys-next" version = "0.1.2" @@ -1421,7 +1441,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" dependencies = [ - "libloading 0.7.0", + "libloading 0.7.2", ] [[package]] @@ -1448,7 +1468,18 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "788148861d80b87d28d64440a3d31cae190e50ccc3ea585597466d38428365d7" dependencies = [ - "epaint", + "epaint 0.12.0", +] + +[[package]] +name = "egui" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c8d416a3343cbfc6f4d17bb1cba46b4d7efecb9ee541967763e0b5e04e5fae7" +dependencies = [ + "ahash 0.7.6", + "epaint 0.15.0", + "nohash-hasher", ] [[package]] @@ -1463,11 +1494,11 @@ dependencies = [ [[package]] name = "egui_winit_platform" -version = "0.8.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd4cf17c0cd4dbcf2f8fef55a3592b9b7cfd970576c7302d8ba5c521b8560371" +checksum = "a0ae306ae9cd296ed3178d518fd0d9edf45f176cfdfe31ff77b7051c5f1d5278" dependencies = [ - "egui", + "egui 0.15.0", "winit", ] @@ -1484,10 +1515,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e73d6c8c70eadb71756fbbc3c303ab25e163b46b656886dd250de5636efea12" [[package]] -name = "encoding_rs" -version = "0.8.28" +name = "emath" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" +checksum = "24a1aaa922d55da6a2bf32957c3d153e7fb9d52ed8d69777a75092240172eb6e" + +[[package]] +name = "encoding_rs" +version = "0.8.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746" dependencies = [ "cfg-if 1.0.0", ] @@ -1513,16 +1550,16 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159" dependencies = [ - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] name = "enumset" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e76129da36102af021b8e5000dab2c1c30dbef85c1e482beeff8da5dde0e0b0" +checksum = "6216d2c19a6fb5f29d1ada1dc7bc4367a8cbf0fa4af5cf12e07b5bbdde6b5b2c" dependencies = [ "enumset_derive", ] @@ -1534,9 +1571,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6451128aa6655d880755345d085494cf7561a6bee7c8dc821e5d77e6d267ecd4" dependencies = [ "darling 0.13.0", - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -1558,20 +1595,33 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80e2db640801230bdda80629bc3a063927a462f5eaf38a98da676954e78ccb99" dependencies = [ - "ahash 0.7.4", + "ahash 0.7.6", "atomic_refcell", - "emath", + "emath 0.12.0", "ordered-float 2.8.0", "rusttype 0.9.2", ] +[[package]] +name = "epaint" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16bb4d3b8bbbd132c99d2a5efec8567e8b6d09b742f758ae6cf1e4b104fe0231" +dependencies = [ + "ab_glyph", + "ahash 0.7.6", + "atomic_refcell", + "emath 0.15.0", + "nohash-hasher", +] + [[package]] name = "epi" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59c4f6cbede1fc8f836384f85295a59199a4825940abcc3a8a29cfe2e3c37583" dependencies = [ - "egui", + "egui 0.12.0", ] [[package]] @@ -1646,9 +1696,9 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccb5acb1045ebbfa222e2c50679e392a71dd77030b78fb0189f2d9c5974400f9" dependencies = [ - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -1840,9 +1890,9 @@ checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" dependencies = [ "autocfg", "proc-macro-hack", - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -1944,7 +1994,7 @@ checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi 0.10.0+wasi-snapshot-preview1", ] [[package]] @@ -1966,7 +2016,7 @@ dependencies = [ "bitflags", "gfx-auxil", "gfx-hal", - "libloading 0.7.0", + "libloading 0.7.2", "log", "parking_lot 0.11.2", "range-alloc", @@ -2022,7 +2072,7 @@ dependencies = [ "glow", "js-sys", "khronos-egl", - "libloading 0.7.0", + "libloading 0.7.2", "log", "naga", "parking_lot 0.11.2", @@ -2069,7 +2119,7 @@ dependencies = [ "core-graphics-types", "gfx-hal", "inplace_it", - "libloading 0.7.0", + "libloading 0.7.2", "log", "naga", "objc", @@ -2116,7 +2166,7 @@ dependencies = [ "libc", "libudev-sys", "log", - "nix 0.20.1", + "nix 0.20.0", "rusty-xinput", "serde", "stdweb 0.4.20", @@ -2138,15 +2188,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.25.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" +checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" [[package]] name = "git2" -version = "0.13.22" +version = "0.13.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c1cbbfc9a1996c6af82c2b4caf828d2c653af4fcdbb0e5674cc966eee5a4197" +checksum = "845e007a28f1fcac035715988a234e8ec5458fd825b20a20c7dec74237ef341f" dependencies = [ "bitflags", "libc", @@ -2184,9 +2234,9 @@ dependencies = [ [[package]] name = "glyph_brush" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e3f00b8574a76fb6c50890c48da03946ca50e4372a2778737922666a2238221" +checksum = "21932fbf719272848eec4583740d978203c6e7da4c4e203358f5b95946c97409" dependencies = [ "glyph_brush_draw_cache", "glyph_brush_layout", @@ -2198,9 +2248,9 @@ dependencies = [ [[package]] name = "glyph_brush_draw_cache" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac2c82074cafb68b9e459c50c655f7eedcb92d6ee7166813802934bc6fc29fa3" +checksum = "6010675390f6889e09a21e2c8b575b3ee25667ea8237a8d59423f73cb8c28610" dependencies = [ "ab_glyph", "crossbeam-channel", @@ -2272,9 +2322,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.4" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7f3675cfef6a30c8031cf9e6493ebdc3bb3272a3fea3923c4210d1830e6a472" +checksum = "7fd819562fcebdac5afc5c113c3ec36f902840b70fd4fc458799c8ce4607ae55" dependencies = [ "bytes", "fnv", @@ -2291,9 +2341,9 @@ dependencies = [ [[package]] name = "half" -version = "1.7.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "hash32" @@ -2319,7 +2369,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ - "ahash 0.7.4", + "ahash 0.7.6", "rayon", "serde", ] @@ -2393,9 +2443,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" +checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" dependencies = [ "bytes", "fnv", @@ -2404,9 +2454,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5" +checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" dependencies = [ "bytes", "http", @@ -2421,9 +2471,9 @@ checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" [[package]] name = "httpdate" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "humantime" @@ -2433,9 +2483,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.13" +version = "0.14.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15d1cfb9e4f68655fa04c01f59edb405b6074a0f7118ea881e5026e4a1cd8593" +checksum = "436ec0091e4f20e655156a30a0df3770fe2900aa301e548e08446ec794b6953c" dependencies = [ "bytes", "futures-channel", @@ -2448,7 +2498,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.2", + "socket2", "tokio", "tower-service", "tracing", @@ -2465,11 +2515,11 @@ dependencies = [ "futures-util", "hyper", "log", - "rustls", - "rustls-native-certs", + "rustls 0.19.1", + "rustls-native-certs 0.5.0", "tokio", "tokio-rustls", - "webpki", + "webpki 0.21.4", ] [[package]] @@ -2592,9 +2642,9 @@ dependencies = [ [[package]] name = "inotify" -version = "0.9.3" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b031475cb1b103ee221afb806a23d35e0570bf7271d7588762ceba8127ed43b3" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" dependencies = [ "bitflags", "inotify-sys", @@ -2618,9 +2668,9 @@ checksum = "90953f308a79fe6d62a4643e51f848fbfddcd05975a38e69fdf4ab86a7baf7ca" [[package]] name = "instant" -version = "0.1.10" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if 1.0.0", ] @@ -2720,10 +2770,10 @@ source = "git+https://gitlab.com/Frinksy/keyboard-keynames.git?branch=develop#1a dependencies = [ "libc", "memmap", - "wayland-client", + "wayland-client 0.28.6", "winapi 0.3.9", "winit", - "xcb", + "xcb 0.9.0", "xkbcommon-sys 0.7.6", ] @@ -2734,14 +2784,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" dependencies = [ "libc", - "libloading 0.7.0", + "libloading 0.7.2", ] [[package]] name = "kiddo" -version = "0.1.5" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d93815d7b36a79b35bafa5227738f81e2072764235f1369a412de0e16459e7" +checksum = "8d9d9b46f84e6d21fda457c8d7a5ed0e50382355194a47f28a3747ce6b5351d4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "kiddo" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b65ad2193b81d1050ae6570a00c96e6bd1b3ea0e2a3c3831f02cf6891613c329" dependencies = [ "num-traits", ] @@ -2786,9 +2845,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "leb128" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "lewton" @@ -2803,15 +2862,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.102" +version = "0.2.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a5ac8f984bfcf3a823267e5fde638acc3325f6496633a5da6bb6eb2171e103" +checksum = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219" [[package]] name = "libgit2-sys" -version = "0.12.23+1.2.0" +version = "0.12.25+1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29730a445bae719db3107078b46808cc45a5b7a6bae3f31272923af969453356" +checksum = "8f68169ef08d6519b2fe133ecc637408d933c0174b23b80bb2f79828966fbaab" dependencies = [ "cc", "libc", @@ -2831,9 +2890,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a" +checksum = "afe203d669ec979b7128619bae5a63b7b42e9203c1b29146079ee05e2f604b52" dependencies = [ "cfg-if 1.0.0", "winapi 0.3.9", @@ -2934,8 +2993,8 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0fbfc88337168279f2e9ae06e157cfed4efd3316e14dc96ed074d4f2e6c5952" dependencies = [ - "quote 1.0.9", - "syn 1.0.76", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -3033,6 +3092,15 @@ dependencies = [ "libc", ] +[[package]] +name = "memmap2" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b6c2ebff6180198788f5db08d7ce3bc1d0b617176678831a7510825973e357" +dependencies = [ + "libc", +] + [[package]] name = "memoffset" version = "0.5.6" @@ -3075,9 +3143,9 @@ dependencies = [ "orbclient", "raw-window-handle", "tempfile", - "wayland-client", - "wayland-cursor", - "wayland-protocols", + "wayland-client 0.28.6", + "wayland-cursor 0.28.6", + "wayland-protocols 0.28.6", "winapi 0.3.9", "x11-dl", "xkb", @@ -3086,9 +3154,9 @@ dependencies = [ [[package]] name = "minimal-lexical" -version = "0.1.3" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c835948974f68e0bd58636fc6c5b1fbff7b297e3046f11b3b3c18bbac012c6d" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" @@ -3130,9 +3198,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" +checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" dependencies = [ "libc", "log", @@ -3162,7 +3230,7 @@ dependencies = [ "crossbeam", "crossbeam-queue", "log", - "mio 0.7.13", + "mio 0.7.14", ] [[package]] @@ -3194,9 +3262,9 @@ checksum = "a785740271256c230f57462d3b83e52f998433a7062fc18f96d5999474a9f915" [[package]] name = "more-asserts" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238" +checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" [[package]] name = "mumble-link" @@ -3306,9 +3374,9 @@ checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d" dependencies = [ "darling 0.10.2", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -3351,9 +3419,21 @@ dependencies = [ [[package]] name = "nix" -version = "0.20.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8e5e343312e7fbeb2a52139114e9e702991ef9c2aea6817ff2440b35647d56" +checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" +dependencies = [ + "bitflags", + "cc", + "cfg-if 1.0.0", + "libc", +] + +[[package]] +name = "nix" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1e25ee6b412c2a1e3fcb6a4499a5c1bfe7f43e014bdce9a6b6666e5aa2d187" dependencies = [ "bitflags", "cc", @@ -3363,17 +3443,10 @@ dependencies = [ ] [[package]] -name = "nix" -version = "0.22.1" +name = "nohash-hasher" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7555d6c7164cc913be1ce7f95cbecdabda61eb2ccd89008524af306fb7f5031" -dependencies = [ - "bitflags", - "cc", - "cfg-if 1.0.0", - "libc", - "memoffset 0.6.4", -] +checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] name = "noise" @@ -3407,9 +3480,9 @@ dependencies = [ [[package]] name = "nom" -version = "7.0.0" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffd9d26838a953b4af82cbeb9f1592c6798916983959be223a7124e992742c1" +checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109" dependencies = [ "memchr", "minimal-lexical", @@ -3444,10 +3517,10 @@ dependencies = [ "crossbeam-channel", "filetime", "fsevent-sys 4.0.0", - "inotify 0.9.3", + "inotify 0.9.6", "kqueue", "libc", - "mio 0.7.13", + "mio 0.7.14", "walkdir 2.3.2", "winapi 0.3.9", ] @@ -3481,7 +3554,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" dependencies = [ - "num-bigint 0.4.2", + "num-bigint 0.4.3", "num-complex 0.4.0", "num-integer", "num-iter", @@ -3502,9 +3575,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74e768dff5fb39a41b3bcd30bb25cf989706c90d028d1ad71971987aa309d535" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ "autocfg", "num-integer", @@ -3536,9 +3609,9 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -3592,7 +3665,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" dependencies = [ "autocfg", - "num-bigint 0.4.2", + "num-bigint 0.4.3", "num-integer", "num-traits", ] @@ -3634,9 +3707,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "486ea01961c4a818096de679a8b740b26d9033146ac5291b1c98557658f8cdd9" dependencies = [ "proc-macro-crate 1.1.0", - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -3691,9 +3764,9 @@ dependencies = [ [[package]] name = "object" -version = "0.26.2" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39f37e50073ccad23b6d09bcb5b263f4e76d3bb6038e4a3c08e52162ffa8abc2" +checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" dependencies = [ "memchr", ] @@ -3792,11 +3865,11 @@ dependencies = [ [[package]] name = "owned_ttf_parser" -version = "0.12.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60ac8dda2e5cc09bf6480e3b3feff9783db251710c922ae9369a429c51efdeb0" +checksum = "65ee3f72636e6f164cc41c9f9057f4e58c4e13507699ea7f5e5242b64b8198ee" dependencies = [ - "ttf-parser 0.12.3", + "ttf-parser 0.13.2", ] [[package]] @@ -3872,9 +3945,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pem" -version = "0.8.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb" +checksum = "06673860db84d02a63942fa69cd9543f2624a5df3aea7f33173048fa7ad5cf1a" dependencies = [ "base64", "once_cell", @@ -3947,9 +4020,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.19" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" +checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" [[package]] name = "plotters" @@ -4001,9 +4074,9 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.10" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" [[package]] name = "proc-macro-crate" @@ -4031,9 +4104,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", "version_check 0.9.3", ] @@ -4043,8 +4116,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.29", - "quote 1.0.9", + "proc-macro2 1.0.32", + "quote 1.0.10", "version_check 0.9.3", ] @@ -4071,18 +4144,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.29" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d" +checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" dependencies = [ "unicode-xid 0.2.2", ] [[package]] name = "profiling" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd5592a8eed7e74f56ad7b125f8234763b805c30f0c7c95c486920026a6ec" +checksum = "9926767b8b8244d7b6b64546585121d193c3d0b4856ccd656b7bfa9deb91ab6a" dependencies = [ "profiling-procmacros", "tracy-client", @@ -4090,12 +4163,12 @@ dependencies = [ [[package]] name = "profiling-procmacros" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9dc92bed14cc1433694b0ee18dfb3c219bf182019b0daf7b017f7a9f1e280ac" +checksum = "f899bc77213a95c5b7272c1f9889c1948eacafe06b035e976abbcadbb34fe517" dependencies = [ - "quote 1.0.9", - "syn 1.0.76", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -4139,48 +4212,72 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", +] + +[[package]] +name = "quick-xml" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8533f14c8382aaad0d592c812ac3b826162128b65662331e1127b45c3d18536b" +dependencies = [ + "memchr", ] [[package]] name = "quinn" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82c0a393b300104f989f3db8b8637c0d11f7a32a9c214560b47849ba8f119aa" +checksum = "61a84d97630b137463c8e6802adc1dfe9de81457b41bb1ac59189e6761ab9255" dependencies = [ "bytes", - "futures", - "lazy_static", - "libc", - "mio 0.7.13", + "futures-channel", + "futures-util", + "fxhash", "quinn-proto", - "rustls", - "socket2 0.3.19", + "quinn-udp", + "rustls 0.20.1", "thiserror", "tokio", "tracing", - "webpki", + "webpki 0.22.0", ] [[package]] name = "quinn-proto" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "047aa96ec7ee6acabad7a1318dff72e9aff8994316bf2166c9b94cbec78ca54c" +checksum = "063dedf7983c8d57db474218f258daa85b627de6f2dbc458b690a93b1de790e8" dependencies = [ "bytes", - "ct-logs", + "fxhash", "rand 0.8.4", "ring", - "rustls", - "rustls-native-certs", + "rustls 0.20.1", + "rustls-native-certs 0.6.1", + "rustls-pemfile", "slab", "thiserror", "tinyvec", "tracing", - "webpki", + "webpki 0.22.0", +] + +[[package]] +name = "quinn-udp" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f7996776e9ee3fc0e5c14476c1a640a17e993c847ae9c81191c2c102fbef903" +dependencies = [ + "futures-util", + "libc", + "mio 0.7.14", + "quinn-proto", + "socket2", + "tokio", + "tracing", ] [[package]] @@ -4194,11 +4291,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" dependencies = [ - "proc-macro2 1.0.29", + "proc-macro2 1.0.32", ] [[package]] @@ -4358,9 +4455,9 @@ dependencies = [ [[package]] name = "rcgen" -version = "0.8.13" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2351cbef4bf91837f5ff7face6091cb277ba960d1638d2c5ae2327859912fbba" +checksum = "5911d1403f4143c9d56a702069d593e8d0f3fab880a85e103604d0893ea31ba7" dependencies = [ "chrono", "pem", @@ -4427,11 +4524,11 @@ name = "refinery-macros" version = "0.5.0" source = "git+https://gitlab.com/veloren/refinery.git?rev=8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e#8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e" dependencies = [ - "proc-macro2 1.0.29", - "quote 1.0.9", + "proc-macro2 1.0.32", + "quote 1.0.10", "refinery-core", "regex", - "syn 1.0.76", + "syn 1.0.81", ] [[package]] @@ -4531,9 +4628,9 @@ version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba8f489f6b6d8551bb15904293c1ad58a6abafa7d8390d15f7ed05a2afcd87d5" dependencies = [ - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -4548,9 +4645,20 @@ dependencies = [ [[package]] name = "ron" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45005aa836116903a49cf3461474da697cfe66221762c6e95871092009ec86d6" +checksum = "86018df177b1beef6c7c8ef949969c4f7cb9a9344181b92486b23c79995bdaa4" +dependencies = [ + "base64", + "bitflags", + "serde", +] + +[[package]] +name = "ron" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b861ecaade43ac97886a512b360d01d66be9f41f3c61088b42cedf92e03d678" dependencies = [ "base64", "bitflags", @@ -4574,9 +4682,9 @@ dependencies = [ [[package]] name = "rstar" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d535e658ada8c1987a113e5261f8b907f721b2854d666e72820671481b7ee125" +checksum = "1fc6fc513b8c3853e43a0c3f909ded14ffa82e5170c9c5f6fb175f9c85c8a433" dependencies = [ "heapless 0.6.1", "num-traits", @@ -4650,8 +4758,19 @@ dependencies = [ "base64", "log", "ring", - "sct", - "webpki", + "sct 0.6.1", + "webpki 0.21.4", +] + +[[package]] +name = "rustls" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dac4581f0fc0e0efd529d069e8189ec7b90b8e7680e21beb35141bdc45f36040" +dependencies = [ + "ring", + "sct 0.7.0", + "webpki 0.22.0", ] [[package]] @@ -4661,11 +4780,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" dependencies = [ "openssl-probe", - "rustls", + "rustls 0.19.1", "schannel", "security-framework", ] +[[package]] +name = "rustls-native-certs" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca9ebdfa27d3fc180e42879037b5338ab1c040c06affd00d8338598e7800943" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" +dependencies = [ + "base64", +] + [[package]] name = "rusttype" version = "0.7.9" @@ -4726,13 +4866,13 @@ checksum = "790487c3881a63489ae77126f57048b42d62d3b2bafbf37453ea19eedb6340d6" dependencies = [ "bitflags", "cfg-if 1.0.0", - "clipboard-win 4.2.1", + "clipboard-win 4.2.2", "dirs-next", "fd-lock", "libc", "log", "memchr", - "nix 0.22.1", + "nix 0.22.0", "radix_trie", "scopeguard", "smallvec", @@ -4789,6 +4929,16 @@ dependencies = [ "untrusted", ] +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "sdl2" version = "0.34.5" @@ -4825,13 +4975,13 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "security-framework" -version = "2.3.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" +checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" dependencies = [ "bitflags", - "core-foundation 0.9.1", - "core-foundation-sys 0.8.2", + "core-foundation 0.9.2", + "core-foundation-sys 0.8.3", "libc", "security-framework-sys", ] @@ -4842,7 +4992,7 @@ version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e" dependencies = [ - "core-foundation-sys 0.8.2", + "core-foundation-sys 0.8.3", "libc", ] @@ -4901,16 +5051,16 @@ version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" dependencies = [ - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] name = "serde_json" -version = "1.0.68" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8" +checksum = "063bf466a64011ac24040a49009724ee60a57da1b437617ceb32e53ad61bfb19" dependencies = [ "itoa", "ryu", @@ -4923,9 +5073,9 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5" dependencies = [ - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -4956,9 +5106,9 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740223c51853f3145fe7c90360d2d4232f2b62e3449489c207eccde818979982" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" dependencies = [ "lazy_static", ] @@ -5005,9 +5155,9 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5404c36bd155e41a54276ab6aafedad2fb627e5e5849d36ec439c9ddc044a2f" dependencies = [ - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -5023,7 +5173,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729" dependencies = [ "libc", - "mio 0.7.13", + "mio 0.7.14", "signal-hook-registry", ] @@ -5044,7 +5194,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29fd5867f1c4f2c5be079aee7a2adf1152ebb04a4bc4d341f504b7dece607ed4" dependencies = [ "libc", - "mio 0.7.13", + "mio 0.7.14", "signal-hook 0.3.10", ] @@ -5065,9 +5215,9 @@ checksum = "533494a8f9b724d33625ab53c6c4800f7cc445895924a8ef649222dcb76e938b" [[package]] name = "slab" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" +checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" [[package]] name = "slotmap" @@ -5087,9 +5237,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" [[package]] name = "smithay-client-toolkit" @@ -5105,47 +5255,37 @@ dependencies = [ "log", "memmap2 0.1.0", "nix 0.18.0", - "wayland-client", - "wayland-cursor", - "wayland-protocols", + "wayland-client 0.28.6", + "wayland-cursor 0.28.6", + "wayland-protocols 0.28.6", ] [[package]] name = "smithay-client-toolkit" -version = "0.14.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec783683499a2cfc85b6df3d04f83b1907b5cbd98a1aed44667dbdf1eac4e64c" +checksum = "210cf40de565aaaa085face1d860b17f6aee9f76f9d2816307ea2cc45eeb64f3" dependencies = [ "bitflags", "dlib 0.5.0", "lazy_static", "log", - "memmap2 0.2.3", - "nix 0.20.1", - "wayland-client", - "wayland-cursor", - "wayland-protocols", + "memmap2 0.3.1", + "nix 0.22.0", + "pkg-config", + "wayland-client 0.29.1", + "wayland-cursor 0.29.1", + "wayland-protocols 0.29.1", ] [[package]] name = "smithay-clipboard" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "986c5b4a7bd4f50d4c51f81f844745535cb488360f9cf63293780b109b9295f3" +checksum = "610b551bd25378bfd2b8e7a0fcbd83d427e8f2f6a40c47ae0f70688e9949dd55" dependencies = [ - "smithay-client-toolkit 0.14.0", - "wayland-client", -] - -[[package]] -name = "socket2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "winapi 0.3.9", + "smithay-client-toolkit 0.15.2", + "wayland-client 0.29.1", ] [[package]] @@ -5180,9 +5320,9 @@ name = "specs-derive" version = "0.4.1" source = "git+https://github.com/amethyst/specs.git?rev=f985bec5d456f7b0dd8aae99848f9473c2cd9d46#f985bec5d456f7b0dd8aae99848f9473c2cd9d46" dependencies = [ - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -5279,11 +5419,11 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" dependencies = [ - "proc-macro2 1.0.29", - "quote 1.0.9", + "proc-macro2 1.0.32", + "quote 1.0.10", "serde", "serde_derive", - "syn 1.0.76", + "syn 1.0.81", ] [[package]] @@ -5293,13 +5433,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" dependencies = [ "base-x", - "proc-macro2 1.0.29", - "quote 1.0.9", + "proc-macro2 1.0.32", + "quote 1.0.10", "serde", "serde_derive", "serde_json", "sha1", - "syn 1.0.76", + "syn 1.0.81", ] [[package]] @@ -5343,9 +5483,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "structopt" -version = "0.3.23" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf9d950ef167e25e0bdb073cf1d68e9ad2795ac826f2f3f59647817cf23c0bfa" +checksum = "40b9788f4202aa75c240ecc9c15c65185e6a39ccdeb0fd5d008b98825464c87c" dependencies = [ "clap", "lazy_static", @@ -5354,36 +5494,37 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.16" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134d838a2c9943ac3125cf6df165eda53493451b719f3255b2a26b85f772d0ba" +checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ "heck", "proc-macro-error", - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] name = "strum" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" +checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.21.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" +checksum = "00ad150e9d51e33e8142984f577662c1324d49f3be45ed37bac8645fdcbe0fe5" dependencies = [ "heck", - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "rustversion", + "syn 1.0.81", ] [[package]] @@ -5411,12 +5552,12 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.76" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84" +checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966" dependencies = [ - "proc-macro2 1.0.29", - "quote 1.0.9", + "proc-macro2 1.0.32", + "quote 1.0.10", "unicode-xid 0.2.2", ] @@ -5477,22 +5618,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.29" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88" +checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.29" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c" +checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" dependencies = [ - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -5506,17 +5647,18 @@ dependencies = [ [[package]] name = "thunderdome" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87b4947742c93ece24a0032141d9caa3d853752e694a57e35029dd2bd08673e0" +checksum = "f685624f172cd0bde6f3363412455e81c018f2379fdf5a218e0be003f1bba642" [[package]] name = "time" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", + "wasi 0.10.0+wasi-snapshot-preview1", "winapi 0.3.9", ] @@ -5532,9 +5674,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.4.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5241dd6f21443a3606b432718b166d3cedc962fd4b8bea54a8bc7f514ebda986" +checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" dependencies = [ "tinyvec_macros", ] @@ -5547,15 +5689,15 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.11.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4efe6fc2395938c8155973d7be49fe8d03a843726e285e100a8a383cc0154ce" +checksum = "70e992e41e0d2fb9f755b37446f20900f64446ef54874f40a60c78f021ac6144" dependencies = [ "autocfg", "bytes", "libc", "memchr", - "mio 0.7.13", + "mio 0.7.14", "num_cpus", "once_cell", "pin-project-lite", @@ -5566,13 +5708,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.3.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110" +checksum = "c9efc1aba077437943f7515666aa2b882dfabfbfdf89c819ea75a8d6e9eaba5e" dependencies = [ - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -5581,16 +5723,16 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ - "rustls", + "rustls 0.19.1", "tokio", - "webpki", + "webpki 0.21.4", ] [[package]] name = "tokio-stream" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f" +checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" dependencies = [ "futures-core", "pin-project-lite", @@ -5599,9 +5741,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.6.8" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d3725d3efa29485e87311c5b699de63cde14b00ed4d256b8318aa30ca452cd" +checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" dependencies = [ "bytes", "futures-core", @@ -5628,9 +5770,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.28" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f96e095c0c82419687c20ddf5cb3eadb61f4e1405923c9dc8e53a1adacbda8" +checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" dependencies = [ "cfg-if 1.0.0", "pin-project-lite", @@ -5646,25 +5788,25 @@ checksum = "9965507e507f12c8901432a33e31131222abac31edd90cabbcf85cf544b7127a" dependencies = [ "chrono", "crossbeam-channel", - "tracing-subscriber", + "tracing-subscriber 0.2.25", ] [[package]] name = "tracing-attributes" -version = "0.1.16" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98863d0dd09fa59a1b79c6750ad80dbda6b75f4e71c437a6a1a8cb91a8bcbd77" +checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" dependencies = [ - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] name = "tracing-core" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46125608c26121c81b0c6d693eab5a420e416da7e43c426d2e8f7df8da8a3acf" +checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" dependencies = [ "lazy_static", ] @@ -5682,9 +5824,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.24" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdd0568dbfe3baf7048b7908d2b32bca0d81cd56bec6d2a8f894b01d74f86be3" +checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" dependencies = [ "ansi_term 0.12.1", "chrono", @@ -5700,21 +5842,32 @@ dependencies = [ ] [[package]] -name = "tracing-tracy" -version = "0.6.1" +name = "tracing-subscriber" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020d75c180d4d837163d5e718100bfc1b9311d4315c9d4d23492266d569da418" +checksum = "80a4ddde70311d8da398062ecf6fc2c309337de6b0f77d6c27aff8d53f6fca52" +dependencies = [ + "sharded-slab", + "thread_local", + "tracing-core", +] + +[[package]] +name = "tracing-tracy" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773057bb2b440e868776522a0587f732b1125116f12aca0eb37dea48d55ad2cd" dependencies = [ "tracing-core", - "tracing-subscriber", + "tracing-subscriber 0.3.1", "tracy-client", ] [[package]] name = "tracy-client" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a49133e2b4f358ddf7aff5288e0120eeb90d1a5200033fbc2ac4735347fc2b9c" +checksum = "62c0e37fbf87980abd5c35c3d86fd150c5ed349c3ae90959ba1877c799388203" dependencies = [ "tracy-client-sys", ] @@ -5752,9 +5905,9 @@ checksum = "3e5d7cd7ab3e47dda6e56542f4bbf3824c15234958c6e1bd6aaa347e93499fdc" [[package]] name = "ttf-parser" -version = "0.12.3" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ae2f58a822f08abdaf668897e96a5656fe72f5a9ce66422423e8849384872e6" +checksum = "3e835d06ed78a500d3d0e431a20c18ff5544b3f6e11376e834370cfd35e8948e" [[package]] name = "tui" @@ -5802,9 +5955,9 @@ checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" [[package]] name = "unicode-bidi" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085" +checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" [[package]] name = "unicode-normalization" @@ -5922,7 +6075,7 @@ dependencies = [ "num 0.4.0", "quinn", "rayon", - "ron", + "ron 0.7.0", "rustyline", "serde", "specs", @@ -5956,7 +6109,7 @@ dependencies = [ "fxhash", "hashbrown 0.11.2", "indexmap", - "kiddo", + "kiddo 0.1.7", "lazy_static", "num-derive", "num-traits", @@ -5964,7 +6117,7 @@ dependencies = [ "petgraph 0.5.1", "rand 0.8.4", "rayon", - "ron", + "ron 0.6.6", "roots", "serde", "serde_repr", @@ -5977,7 +6130,7 @@ dependencies = [ "strum", "strum_macros", "tracing", - "tracing-subscriber", + "tracing-subscriber 0.2.25", "uuid", "vek", "veloren-common-assets", @@ -5992,7 +6145,7 @@ dependencies = [ "dot_vox", "image", "lazy_static", - "ron", + "ron 0.7.0", "serde", "tracing", "walkdir 2.3.2", @@ -6025,7 +6178,7 @@ dependencies = [ "tracing", "tracing-appender", "tracing-log", - "tracing-subscriber", + "tracing-subscriber 0.2.25", "tracing-tracy", "veloren-common-base", ] @@ -6117,7 +6270,7 @@ dependencies = [ "tokio", "tokio-stream", "tracing", - "tracing-subscriber", + "tracing-subscriber 0.2.25", "veloren-network-protocol", ] @@ -6150,9 +6303,9 @@ dependencies = [ name = "veloren-plugin-derive" version = "0.1.0" dependencies = [ - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -6188,8 +6341,10 @@ dependencies = [ "rand_distr", "rayon", "refinery", - "ron", + "ron 0.7.0", "rusqlite", + "rustls 0.20.1", + "rustls-pemfile", "serde", "serde_json", "slab", @@ -6216,10 +6371,10 @@ version = "0.11.0" dependencies = [ "ansi-parser", "clap", - "crossterm 0.21.0", + "crossterm 0.22.1", "lazy_static", "num_cpus", - "ron", + "ron 0.7.0", "serde", "shell-words", "signal-hook 0.3.10", @@ -6253,7 +6408,7 @@ dependencies = [ "directories-next", "dispatch 0.1.4", "dot_vox", - "egui", + "egui 0.15.0", "egui_wgpu_backend", "egui_winit_platform", "enum-iterator", @@ -6278,7 +6433,7 @@ dependencies = [ "rand_chacha 0.3.1", "rayon", "rodio", - "ron", + "ron 0.7.0", "serde", "shaderc", "slab", @@ -6333,7 +6488,7 @@ name = "veloren-voxygen-dynlib" version = "0.1.0" dependencies = [ "find_folder", - "libloading 0.7.0", + "libloading 0.7.2", "notify 5.0.0-pre.13", "tracing", ] @@ -6342,7 +6497,7 @@ dependencies = [ name = "veloren-voxygen-egui" version = "0.9.0" dependencies = [ - "egui", + "egui 0.15.0", "egui_winit_platform", "lazy_static", "veloren-client", @@ -6365,7 +6520,7 @@ dependencies = [ "deunicode", "git2", "hashbrown 0.11.2", - "ron", + "ron 0.7.0", "serde", "tracing", "veloren-common-assets", @@ -6381,7 +6536,7 @@ dependencies = [ "clap", "criterion", "csv", - "deflate 0.9.1", + "deflate 1.0.0", "enum-iterator", "fallible-iterator", "flate2", @@ -6389,7 +6544,7 @@ dependencies = [ "hashbrown 0.11.2", "image", "itertools", - "kiddo", + "kiddo 0.2.1", "lazy_static", "lz-fear", "minifb", @@ -6401,7 +6556,7 @@ dependencies = [ "rand 0.8.4", "rand_chacha 0.3.1", "rayon", - "ron", + "ron 0.7.0", "rstar", "rusqlite", "serde", @@ -6409,7 +6564,7 @@ dependencies = [ "strum", "svg_fmt", "tracing", - "tracing-subscriber", + "tracing-subscriber 0.2.25", "vek", "veloren-common", "veloren-common-base", @@ -6474,9 +6629,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" +version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" @@ -6497,9 +6652,9 @@ dependencies = [ "bumpalo", "lazy_static", "log", - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", "wasm-bindgen-shared", ] @@ -6521,7 +6676,7 @@ version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" dependencies = [ - "quote 1.0.9", + "quote 1.0.10", "wasm-bindgen-macro-support", ] @@ -6531,9 +6686,9 @@ version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" dependencies = [ - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6614,9 +6769,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ee7b351bcc1e782997c72dc0b5b328f3ddcad4813b8ce3cac3f25ae5a4ab56b" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.76", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -6648,7 +6803,7 @@ checksum = "6aa390d123ebe23d5315c39f6063fcc18319661d03c8000f23d0fe1c011e8135" dependencies = [ "cfg-if 1.0.0", "leb128", - "libloading 0.7.0", + "libloading 0.7.2", "loupe", "rkyv", "serde", @@ -6735,9 +6890,9 @@ checksum = "52144d4c78e5cf8b055ceab8e5fa22814ce4315d6002ad32cfd914f37c12fd65" [[package]] name = "wast" -version = "38.0.0" +version = "38.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ebc29df4629f497e0893aacd40f13a4a56b85ef6eb4ab6d603f07244f1a7bf2" +checksum = "ae0d7b256bef26c898fa7344a2d627e8499f5a749432ce0a05eae1a64ff0c271" dependencies = [ "leb128", ] @@ -6760,11 +6915,27 @@ dependencies = [ "bitflags", "downcast-rs", "libc", - "nix 0.20.1", + "nix 0.20.0", "scoped-tls", - "wayland-commons", - "wayland-scanner", - "wayland-sys", + "wayland-commons 0.28.6", + "wayland-scanner 0.28.6", + "wayland-sys 0.28.6", +] + +[[package]] +name = "wayland-client" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9108ec1c37f4774d0c2937ba1a6c23d1786b2152c4a13bd9fdb20e42d16e8841" +dependencies = [ + "bitflags", + "downcast-rs", + "libc", + "nix 0.22.0", + "scoped-tls", + "wayland-commons 0.29.1", + "wayland-scanner 0.29.1", + "wayland-sys 0.29.1", ] [[package]] @@ -6773,10 +6944,22 @@ version = "0.28.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a21817947c7011bbd0a27e11b17b337bfd022e8544b071a2641232047966fbda" dependencies = [ - "nix 0.20.1", + "nix 0.20.0", "once_cell", "smallvec", - "wayland-sys", + "wayland-sys 0.28.6", +] + +[[package]] +name = "wayland-commons" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "265ef51b3b3e5c9ef098f10425c39624663f459c3821dcaacc4748be975f1beb" +dependencies = [ + "nix 0.22.0", + "once_cell", + "smallvec", + "wayland-sys 0.29.1", ] [[package]] @@ -6785,8 +6968,19 @@ version = "0.28.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be610084edd1586d45e7bdd275fe345c7c1873598caa464c4fb835dee70fa65a" dependencies = [ - "nix 0.20.1", - "wayland-client", + "nix 0.20.0", + "wayland-client 0.28.6", + "xcursor", +] + +[[package]] +name = "wayland-cursor" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c19bb6628daf4097e58b7911481e8371e13318d5a60894779901bd3267407a7" +dependencies = [ + "nix 0.22.0", + "wayland-client 0.29.1", "xcursor", ] @@ -6797,9 +6991,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "286620ea4d803bacf61fa087a4242ee316693099ee5a140796aaba02b29f861f" dependencies = [ "bitflags", - "wayland-client", - "wayland-commons", - "wayland-scanner", + "wayland-client 0.28.6", + "wayland-commons 0.28.6", + "wayland-scanner 0.28.6", +] + +[[package]] +name = "wayland-protocols" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b3b6f1dc0193072ef4eadcb144da30d58c1f2895516c063804d213310703c8e" +dependencies = [ + "bitflags", + "wayland-client 0.29.1", + "wayland-commons 0.29.1", + "wayland-scanner 0.29.1", ] [[package]] @@ -6808,8 +7014,19 @@ version = "0.28.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce923eb2deb61de332d1f356ec7b6bf37094dc5573952e1c8936db03b54c03f1" dependencies = [ - "proc-macro2 1.0.29", - "quote 1.0.9", + "proc-macro2 1.0.32", + "quote 1.0.10", + "xml-rs", +] + +[[package]] +name = "wayland-scanner" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaaf2bc85e7b9143159af96bd23d954a5abe391c4376db712320643280fdc6f4" +dependencies = [ + "proc-macro2 1.0.32", + "quote 1.0.10", "xml-rs", ] @@ -6824,6 +7041,17 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "wayland-sys" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba9e06acb775b3007f8d3094438306979e572d1d3b844d7a71557a84b055d959" +dependencies = [ + "dlib 0.5.0", + "lazy_static", + "pkg-config", +] + [[package]] name = "web-sys" version = "0.3.50" @@ -6844,6 +7072,16 @@ dependencies = [ "untrusted", ] +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "wfd" version = "0.1.7" @@ -6898,7 +7136,7 @@ dependencies = [ "parking_lot 0.11.2", "profiling", "raw-window-handle", - "ron", + "ron 0.6.6", "serde", "smallvec", "thiserror", @@ -7001,7 +7239,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33a4518b538a45ad39d138a8c3bea8f6b4452174aeb38143d1dd643a3a838ccc" dependencies = [ - "clipboard-win 4.2.1", + "clipboard-win 4.2.2", "clipboard_macos", "clipboard_wayland", "clipboard_x11", @@ -7016,15 +7254,15 @@ checksum = "79610794594d5e86be473ef7763f604f2159cbac8c94debd00df8fb41e86c2f8" dependencies = [ "bitflags", "cocoa", - "core-foundation 0.9.1", - "core-graphics 0.22.2", + "core-foundation 0.9.2", + "core-graphics 0.22.3", "core-video-sys", "dispatch 0.2.0", "instant", "lazy_static", "libc", "log", - "mio 0.7.13", + "mio 0.7.14", "mio-misc", "ndk 0.3.0", "ndk-glue 0.3.0", @@ -7036,16 +7274,16 @@ dependencies = [ "scopeguard", "serde", "smithay-client-toolkit 0.12.3", - "wayland-client", + "wayland-client 0.28.6", "winapi 0.3.9", "x11-dl", ] [[package]] name = "winres" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4fb510bbfe5b8992ff15f77a2e6fe6cf062878f0eda00c0f44963a807ca5dc" +checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" dependencies = [ "toml", ] @@ -7080,22 +7318,21 @@ dependencies = [ [[package]] name = "x11-clipboard" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b397ace6e980510de59a4fe3d4c758dffab231d6d747ce9fa1aba6b6035d5f32" +checksum = "473068b7b80ac86a18328824f1054e5e007898c47b5bbc281bd7abe32bc3653c" dependencies = [ - "xcb", + "xcb 0.10.1", ] [[package]] name = "x11-dl" -version = "2.18.5" +version = "2.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf981e3a5b3301209754218f962052d4d9ee97e478f4d26d4a6eced34c1fef8" +checksum = "ea26926b4ce81a6f5d9d0f3a0bc401e5a37c6ae14a1bfaa8ff6099ca80038c59" dependencies = [ "lazy_static", "libc", - "maybe-uninit", "pkg-config", ] @@ -7106,7 +7343,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ffb080b3f2f616242a4eb8e7d325035312127901025b0052bc3154a282d0f19" dependencies = [ "gethostname", - "nix 0.20.1", + "nix 0.20.0", "winapi 0.3.9", "winapi-wsapoll", ] @@ -7130,20 +7367,34 @@ dependencies = [ "log", ] +[[package]] +name = "xcb" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "771e2b996df720cd1c6dd9ff90f62d91698fd3610cc078388d0564bdd6622a9c" +dependencies = [ + "libc", + "log", + "quick-xml", +] + [[package]] name = "xcursor" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" dependencies = [ - "nom 7.0.0", + "nom 7.1.0", ] [[package]] name = "xdg" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" +checksum = "3a23fe958c70412687039c86f578938b4a0bb50ec788e96bce4d6ab00ddd5803" +dependencies = [ + "dirs", +] [[package]] name = "xi-unicode" diff --git a/client/Cargo.toml b/client/Cargo.toml index 2a15bcdad0..5904522dc1 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -22,7 +22,7 @@ network = { package = "veloren-network", path = "../network", features = ["compr byteorder = "1.3.2" tokio = { version = "1.11", default-features = false, features = ["rt-multi-thread"] } -quinn = "0.7.2" +quinn = "0.8" image = { version = "0.23.12", default-features = false, features = ["png"] } num = "0.4" tracing = { version = "0.1", default-features = false } @@ -37,7 +37,7 @@ authc = { git = "https://gitlab.com/veloren/auth.git", rev = "fb3dcbc4962b367253 async-channel = { version = "1.6", optional = true } common-ecs = { package = "veloren-common-ecs", path = "../common/ecs", optional = true } serde = { version = "1.0", features = [ "rc", "derive" ], optional = true } -ron = { version = "0.6", default-features = false, optional = true } +ron = { version = "0.7", default-features = false, optional = true } clap = { version = "2.33", optional = true } rustyline = { version = "9.0.0", optional = true } ## logging diff --git a/client/src/lib.rs b/client/src/lib.rs index ffd2d40f9d..edc5ea62e4 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -235,7 +235,7 @@ impl Client { "QUIC is enabled. This is experimental and you won't be able to connect to \ TCP servers unless deactivated" ); - let config = quinn::ClientConfigBuilder::default().build(); + let config = quinn::ClientConfig::with_native_roots(); addr::try_connect(&network, &hostname, prefer_ipv6, |a| { ConnectAddr::Quic(a, config.clone(), hostname.clone()) }) diff --git a/common/Cargo.toml b/common/Cargo.toml index 0e197365de..c13f38a733 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -28,9 +28,9 @@ enum-iterator = "0.7" vek = { version = "=0.14.1", features = ["serde"] } # Strum -strum = { version = "0.21", features = ["derive"] } +strum = { version = "0.23", features = ["derive"] } # TODO: remove this and rewrite every use of strum_macros to strum -strum_macros = "0.21" +strum_macros = "0.23" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] approx = "0.4.0" @@ -82,7 +82,7 @@ specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", rev = "8be2abc criterion = "0.3" #test -tracing-subscriber = { version = "0.2.15", default-features = false, features = ["fmt", "chrono", "ansi", "smallvec", "env-filter"] } +tracing-subscriber = { version = "0.2.25", default-features = false, features = ["fmt", "chrono", "ansi", "smallvec", "env-filter"] } [[bench]] name = "chonk_benchmark" diff --git a/common/assets/Cargo.toml b/common/assets/Cargo.toml index e217e09456..52dc078b5e 100644 --- a/common/assets/Cargo.toml +++ b/common/assets/Cargo.toml @@ -8,7 +8,7 @@ version = "0.10.0" [dependencies] lazy_static = "1.4.0" assets_manager = {version = "0.6.0", features = ["bincode", "ron", "json"]} -ron = { version = "0.6", default-features = false } +ron = { version = "0.7", default-features = false } dot_vox = "4.0" image = { version = "0.23.12", default-features = false, features = ["png"] } tracing = "0.1" diff --git a/common/frontend/Cargo.toml b/common/frontend/Cargo.toml index c3091bf29e..409708aabe 100644 --- a/common/frontend/Cargo.toml +++ b/common/frontend/Cargo.toml @@ -14,9 +14,9 @@ common-base = { package = "veloren-common-base", path = "../base" } # Logging termcolor = "1.1" tracing = { version = "0.1", default-features = false } -tracing-appender = "0.1" +tracing-appender = "0.1.2" tracing-log = "0.1.1" -tracing-subscriber = { version = "0.2.3", default-features = false, features = ["env-filter", "fmt", "chrono", "ansi", "smallvec", "tracing-log"]} +tracing-subscriber = { version = "0.2.25", default-features = false, features = ["env-filter", "fmt", "chrono", "ansi", "smallvec", "tracing-log"]} # Tracy -tracing-tracy = { version = "0.6.0", optional = true } +tracing-tracy = { version = "0.8.0", optional = true } diff --git a/common/src/terrain/block.rs b/common/src/terrain/block.rs index d7fdbd4c01..797d3a3b9f 100644 --- a/common/src/terrain/block.rs +++ b/common/src/terrain/block.rs @@ -7,7 +7,7 @@ use num_derive::FromPrimitive; use num_traits::FromPrimitive; use serde::{Deserialize, Serialize}; use std::ops::Deref; -use strum_macros::{EnumIter, EnumString, ToString}; +use strum_macros::{Display, EnumIter, EnumString}; use vek::*; make_case_elim!( @@ -24,7 +24,7 @@ make_case_elim!( FromPrimitive, EnumString, EnumIter, - ToString, + Display, )] #[repr(u8)] pub enum BlockKind { diff --git a/network/Cargo.toml b/network/Cargo.toml index 311572f608..5d1e15c308 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -35,7 +35,7 @@ async-channel = "1.5.1" #use for .close() channels lazy_static = { version = "1.4", default-features = false } rand = { version = "0.8" } #quic support -quinn = { version = "0.7.2", optional = true } +quinn = { version = "0.8", optional = true } #stream flags bitflags = "1.2.1" lz-fear = { version = "0.1.1", optional = true } @@ -46,7 +46,7 @@ bytes = "^1" hashbrown = { version = ">=0.9, <0.12" } [dev-dependencies] -tracing-subscriber = { version = "0.2.3", default-features = false, features = ["env-filter", "fmt", "chrono", "ansi", "smallvec"] } +tracing-subscriber = { version = "0.2.25", default-features = false, features = ["env-filter", "fmt", "chrono", "ansi", "smallvec"] } tokio = { version = "1.11", default-features = false, features = ["io-std", "fs", "rt-multi-thread"] } futures-util = { version = "0.3.7", default-features = false, features = ["sink", "std"] } clap = { version = "2.33", default-features = false } diff --git a/network/protocol/Cargo.toml b/network/protocol/Cargo.toml index 312aa3ab6e..6d597d4699 100644 --- a/network/protocol/Cargo.toml +++ b/network/protocol/Cargo.toml @@ -28,7 +28,7 @@ hashbrown = { version = ">=0.9, <0.12" } [dev-dependencies] async-channel = "1.5.1" -tokio = { version = "1.11", default-features = false, features = ["rt", "macros"] } +tokio = { version = "1.14", default-features = false, features = ["rt", "macros"] } criterion = { version = "0.3.4", features = ["default", "async_tokio"] } [[bench]] diff --git a/network/src/channel.rs b/network/src/channel.rs index 6064edf53d..f014b177fa 100644 --- a/network/src/channel.rs +++ b/network/src/channel.rs @@ -226,23 +226,20 @@ impl Protocols { metrics: ProtocolMetricCache, ) -> Result { let config = config.clone(); - let endpoint = quinn::Endpoint::builder(); use std::net::{IpAddr, Ipv4Addr, Ipv6Addr}; let bindsock = match addr { - SocketAddr::V4(_) => SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 0), - SocketAddr::V6(_) => { - SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 0)), 0) - }, + SocketAddr::V4(_) => SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), 0), + SocketAddr::V6(_) => SocketAddr::new(IpAddr::V6(Ipv6Addr::UNSPECIFIED), 0), }; - let (endpoint, _) = match endpoint.bind(&bindsock) { + let endpoint = match quinn::Endpoint::client(bindsock) { Ok(e) => e, - Err(quinn::EndpointError::Socket(e)) => return Err(NetworkConnectError::Io(e)), + Err(e) => return Err(NetworkConnectError::Io(e)), }; info!("Connecting Quic to: {}", &addr); - let connecting = endpoint.connect_with(config, &addr, &name).map_err(|e| { + let connecting = endpoint.connect_with(config, addr, &name).map_err(|e| { trace!(?e, "error setting up quic"); NetworkConnectError::Io(std::io::Error::new( std::io::ErrorKind::ConnectionAborted, @@ -276,11 +273,9 @@ impl Protocols { s2s_stop_listening_r: oneshot::Receiver<()>, c2s_protocol_s: mpsc::UnboundedSender<(Self, Cid)>, ) -> std::io::Result<()> { - let mut endpoint = quinn::Endpoint::builder(); - endpoint.listen(server_config); - let (_endpoint, mut listener) = match endpoint.bind(&addr) { + let (_endpoint, mut listener) = match quinn::Endpoint::server(server_config, addr) { Ok(v) => v, - Err(quinn::EndpointError::Socket(e)) => return Err(e), + Err(e) => return Err(e), }; trace!(?addr, "Quic Listener bound"); let mut end_receiver = s2s_stop_listening_r.fuse(); diff --git a/server-cli/Cargo.toml b/server-cli/Cargo.toml index c739920e47..d0230f5309 100644 --- a/server-cli/Cargo.toml +++ b/server-cli/Cargo.toml @@ -36,12 +36,12 @@ num_cpus = "1.0" ansi-parser = "0.8" clap = "2.33" structopt = "0.3.13" -crossterm = "0.21" +crossterm = "0.22" lazy_static = "1" signal-hook = "0.3.6" shell-words = "1.0.0" tracing = { version = "0.1", default-features = false } -ron = {version = "0.6", default-features = false} +ron = {version = "0.7", default-features = false} serde = {version = "1.0", features = [ "rc", "derive" ]} [dependencies.tui] diff --git a/server/Cargo.toml b/server/Cargo.toml index 0d331fada3..35b66f82ff 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -28,7 +28,7 @@ network = { package = "veloren-network", path = "../network", features = ["metri specs = { git = "https://github.com/amethyst/specs.git", features = ["shred-derive"], rev = "f985bec5d456f7b0dd8aae99848f9473c2cd9d46" } specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", rev = "8be2abcddf8f524cb5876e8dd20a7e47cfaf7573" } -strum = { version = "0.21", features = ["derive"] } +strum = { version = "0.23", features = ["derive"] } bincode = "1.3.2" num_cpus = "1.0" tracing = "0.1" @@ -36,13 +36,15 @@ vek = { version = "0.14.1", features = ["serde"] } futures-util = "0.3.7" tokio = { version = "1.11", default-features = false, features = ["rt"] } prometheus-hyper = "0.1.2" -quinn = "0.7.2" +quinn = "0.8" +rustls = { version = "0.20", default-features = false } +rustls-pemfile = { version = "0.2.1", default-features = false } atomicwrites = "0.3.0" -chrono = { version = "0.4.9", features = ["serde"] } +chrono = { version = "0.4.19", features = ["serde"] } humantime = "2.1.0" itertools = "0.10" lazy_static = "1.4.0" -ron = { version = "0.6", default-features = false } +ron = { version = "0.7", default-features = false } serde = { version = "1.0.110", features = ["derive"] } serde_json = "1.0.50" rand = { version = "0.8", features = ["small_rng"] } diff --git a/server/src/lib.rs b/server/src/lib.rs index 02feef4b9a..e1566faa3b 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -464,26 +464,36 @@ impl Server { runtime.block_on(network.listen(ListenAddr::Tcp(settings.gameserver_address)))?; runtime.block_on(network.listen(ListenAddr::Mpsc(14004)))?; if let Some(quic) = &settings.quic_files { + use rustls_pemfile::Item; use std::fs; match || -> Result<_, Box> { - let mut server_config = - quinn::ServerConfigBuilder::new(quinn::ServerConfig::default()); let key = fs::read(&quic.key)?; let key = if quic.key.extension().map_or(false, |x| x == "der") { - quinn::PrivateKey::from_der(&key)? + rustls::PrivateKey(key) } else { - quinn::PrivateKey::from_pem(&key)? + debug!("convert pem key to der"); + let key = rustls_pemfile::read_all(&mut key.as_slice())? + .into_iter() + .find_map(|item| match item { + Item::RSAKey(v) | Item::PKCS8Key(v) => Some(v), + Item::X509Certificate(_) => None, + }) + .ok_or("No valid pem key in file")?; + rustls::PrivateKey(key) }; let cert_chain = fs::read(&quic.cert)?; let cert_chain = if quic.cert.extension().map_or(false, |x| x == "der") { - quinn::CertificateChain::from_certs(Some( - quinn::Certificate::from_der(&cert_chain).unwrap(), - )) + vec![rustls::Certificate(cert_chain)] } else { - quinn::CertificateChain::from_pem(&cert_chain)? + debug!("convert pem cert to der"); + let certs = rustls_pemfile::certs(&mut cert_chain.as_slice())?; + certs + .into_iter() + .map(|cert| rustls::Certificate(cert)) + .collect() }; - server_config.certificate(cert_chain, key)?; - Ok(server_config.build()) + let server_config = quinn::ServerConfig::with_single_cert(cert_chain, key)?; + Ok(server_config) }() { Ok(server_config) => { warn!( diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml index d96157b697..af3143977f 100644 --- a/voxygen/Cargo.toml +++ b/voxygen/Cargo.toml @@ -68,9 +68,9 @@ glyph_brush = "0.7.0" keyboard-keynames = { git = "https://gitlab.com/Frinksy/keyboard-keynames.git", branch = "develop" } # EGUI -egui = {version = "0.12", optional = true } +egui = {version = "0.15", optional = true } egui_wgpu_backend = {git = "https://github.com/hasenbanck/egui_wgpu_backend.git", rev = "63a002c6a9b6c016e45806dd065864431caab621", optional = true } -egui_winit_platform = {version = "0.8", optional = true } +egui_winit_platform = {version = "0.11", optional = true } # ECS specs = {git = "https://github.com/amethyst/specs.git", rev = "f985bec5d456f7b0dd8aae99848f9473c2cd9d46"} @@ -88,7 +88,7 @@ server = { package = "veloren-server", path = "../server", optional = true, defa # Utility backtrace = "0.3.40" bincode = "1.3.1" -chrono = { version = "0.4.9", features = ["serde"] } +chrono = { version = "0.4.19", features = ["serde"] } chumsky = "0.3.2" cpal = "0.13" copy_dir = "0.1.2" @@ -109,13 +109,13 @@ rand = "0.8" rand_chacha = "0.3" rayon = "1.5" rodio = {version = "0.14", default-features = false, features = ["vorbis"]} -ron = {version = "0.6", default-features = false} +ron = {version = "0.7", default-features = false} serde = {version = "1.0", features = [ "rc", "derive" ]} slab = "0.4.2" -strum = { version = "0.21", features = ["derive"] } -strum_macros = "0.21" +strum = { version = "0.23", features = ["derive"] } +strum_macros = "0.23" treeculler = "0.2" -tokio = { version = "1.11", default-features = false, features = ["rt-multi-thread"] } +tokio = { version = "1.14", default-features = false, features = ["rt-multi-thread"] } num_cpus = "1.0" # vec_map = { version = "0.8.2" } # inline_tweak = "1.0.2" diff --git a/voxygen/egui/Cargo.toml b/voxygen/egui/Cargo.toml index 29b246f246..9cc6a26831 100644 --- a/voxygen/egui/Cargo.toml +++ b/voxygen/egui/Cargo.toml @@ -11,8 +11,8 @@ be-dyn-lib = [] [dependencies] client = {package = "veloren-client", path = "../../client"} common = {package = "veloren-common", path = "../../common"} -egui = "0.12" -egui_winit_platform = "0.8" +egui = "0.15" +egui_winit_platform = "0.11" lazy_static = "1.4.0" voxygen-dynlib = {package = "veloren-voxygen-dynlib", path = "../dynlib", optional = true} diff --git a/voxygen/egui/src/lib.rs b/voxygen/egui/src/lib.rs index e0a74c225f..2eca4f7ade 100644 --- a/voxygen/egui/src/lib.rs +++ b/voxygen/egui/src/lib.rs @@ -14,8 +14,7 @@ use common::{ }; use core::mem; use egui::{ - plot::{Plot, Value}, - widgets::plot::Curve, + plot::{Line, Plot, Value, Values}, CollapsingHeader, Color32, Grid, Pos2, ScrollArea, Slider, Ui, Window, }; @@ -262,13 +261,13 @@ pub fn maintain_egui_inner( Window::new("🔧 Settings") .open(&mut windows.egui_settings) - .scroll(true) + .vscroll(true) .show(ctx, |ui| { ctx.settings_ui(ui); }); Window::new("🔍 Inspection") .open(&mut windows.egui_inspection) - .scroll(true) + .vscroll(true) .show(ctx, |ui| { ctx.inspection_ui(ui); }); @@ -285,13 +284,13 @@ pub fn maintain_egui_inner( .default_width(200.0) .default_height(200.0) .show(ctx, |ui| { - let plot = Plot::new("Frame Time").curve(Curve::from_values_iter( + let plot = Plot::new("Frame Time").line(Line::new(Values::from_values_iter( egui_state .frame_times .iter() .enumerate() .map(|(i, x)| Value::new(i as f64, *x)), - )); + ))); ui.add(plot); }); @@ -321,7 +320,7 @@ pub fn maintain_egui_inner( .text("Cylinder height"), ); - let scroll_area = ScrollArea::from_max_height(800.0); + let scroll_area = ScrollArea::vertical().max_height(800.0); let (_current_scroll, _max_scroll) = scroll_area.show(ui, |ui| { Grid::new("entities_grid") .spacing([40.0, 4.0]) diff --git a/voxygen/egui/src/widgets.rs b/voxygen/egui/src/widgets.rs index 8cde109367..2a7c88c2ec 100644 --- a/voxygen/egui/src/widgets.rs +++ b/voxygen/egui/src/widgets.rs @@ -6,7 +6,7 @@ pub(crate) fn filterable_list( search_text: &str, selected_index: &mut usize, ) { - let scroll_area = ScrollArea::auto_sized(); + let scroll_area = ScrollArea::vertical(); scroll_area.show(ui, |ui| { ui.spacing_mut().item_spacing = Vec2::new(0.0, 2.0); let search_text = search_text.to_lowercase(); @@ -27,7 +27,11 @@ pub(crate) fn filterable_list( }); } -pub(crate) fn two_col_row(ui: &mut Ui, label: impl Into