Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'neura/misc-deps-update' into 'master'

Browse Source 
Minor crate updates

See merge request veloren/veloren!4474
This commit is contained in:
Marcel 2024-05-20 18:26:00 +00:00
commit cd59c6716f
9 changed files with 207 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

374
Cargo.lock generated
View File

@ -346,18 +346,9 @@ version = "0.1.80"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
]
[[package]]
name = "atomic-polyfill"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4"
dependencies = [
"critical-section",
"syn 2.0.65",
]
[[package]]
@ -507,12 +498,12 @@ dependencies = [
"itertools 0.10.5",
"lazy_static",
"lazycell",
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"regex",
"rustc-hash",
"shlex",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -623,9 +614,9 @@ version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -952,9 +943,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
dependencies = [
"heck 0.5.0",
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -1025,25 +1016,25 @@ dependencies = [
[[package]]
name = "cmake"
version = "0.1.45"
version = "0.1.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb6210b637171dfba4cda12e579ac6dc73f5165ad56133e5d72ef3131f320855"
checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
dependencies = [
"cc",
]
[[package]]
name = "cocoa"
version = "0.24.1"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a"
checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c"
dependencies = [
"bitflags 1.3.2",
"block",
"cocoa-foundation",
"core-foundation",
"core-graphics",
"foreign-types 0.3.2",
"core-graphics 0.23.2",
"foreign-types 0.5.0",
"libc",
"objc",
]
@ -1119,7 +1110,7 @@ version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
dependencies = [
"crossbeam-utils 0.8.19",
"crossbeam-utils 0.8.20",
]
[[package]]
@ -1214,6 +1205,19 @@ dependencies = [
"libc",
]
[[package]]
name = "core-graphics"
version = "0.23.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
dependencies = [
"bitflags 1.3.2",
"core-foundation",
"core-graphics-types",
"foreign-types 0.5.0",
"libc",
]
[[package]]
name = "core-graphics-types"
version = "0.1.3"
@ -1441,19 +1445,13 @@ dependencies = [
"itertools 0.10.5",
]
[[package]]
name = "critical-section"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216"
[[package]]
name = "crossbeam-channel"
version = "0.5.12"
version = "0.5.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
dependencies = [
"crossbeam-utils 0.8.19",
"crossbeam-utils 0.8.20",
]
[[package]]
@ -1474,7 +1472,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
dependencies = [
"crossbeam-epoch 0.9.18",
"crossbeam-utils 0.8.19",
"crossbeam-utils 0.8.20",
]
[[package]]
@ -1498,7 +1496,7 @@ version = "0.9.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
dependencies = [
"crossbeam-utils 0.8.19",
"crossbeam-utils 0.8.20",
]
[[package]]
@ -1507,7 +1505,7 @@ version = "0.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
dependencies = [
"crossbeam-utils 0.8.19",
"crossbeam-utils 0.8.20",
]
[[package]]
@ -1523,9 +1521,9 @@ dependencies = [
[[package]]
name = "crossbeam-utils"
version = "0.8.19"
version = "0.8.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
[[package]]
name = "crossterm"
@ -1589,12 +1587,6 @@ dependencies = [
"memchr",
]
[[package]]
name = "cty"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
[[package]]
name = "culpa"
version = "1.0.2"
@ -1610,9 +1602,9 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1234e1717066d3c71dcf89b75e7b586299e41204d361db56ec51e6ded5014279"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -1659,9 +1651,9 @@ checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
dependencies = [
"fnv",
"ident_case",
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -1672,7 +1664,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
dependencies = [
"darling_core",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -1845,9 +1837,9 @@ version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -1975,9 +1967,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a"
dependencies = [
"heck 0.4.1",
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -1996,9 +1988,9 @@ version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -2017,9 +2009,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af"
dependencies = [
"darling",
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -2289,9 +2281,9 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -2396,9 +2388,9 @@ version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -2455,15 +2447,16 @@ dependencies = [
[[package]]
name = "generator"
version = "0.7.5"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e"
checksum = "186014d53bc231d0090ef8d6f03e0920c54d85a5ed22f4f2f74315ec56cf83fb"
dependencies = [
"cc",
"cfg-if 1.0.0",
"libc",
"log",
"rustversion",
"windows 0.48.0",
"windows 0.54.0",
]
[[package]]
@ -2746,9 +2739,9 @@ dependencies = [
[[package]]
name = "hash32"
version = "0.2.1"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606"
dependencies = [
"byteorder",
]
@ -2785,9 +2778,9 @@ dependencies = [
[[package]]
name = "hashlink"
version = "0.8.4"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
dependencies = [
"hashbrown 0.14.5",
]
@ -2809,14 +2802,11 @@ dependencies = [
[[package]]
name = "heapless"
version = "0.7.17"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f"
checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad"
dependencies = [
"atomic-polyfill",
"hash32",
"rustc_version 0.4.0",
"spin 0.9.8",
"stable_deref_trait",
]
@ -3308,6 +3298,15 @@ dependencies = [
"either",
]
[[package]]
name = "itertools"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
dependencies = [
"either",
]
[[package]]
name = "itertools"
version = "0.12.1"
@ -3522,9 +3521,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
[[package]]
name = "libmimalloc-sys"
version = "0.1.37"
version = "0.1.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81eb4061c0582dedea1cbc7aff2240300dd6982e0239d1c99e65c1dbf4a30ba7"
checksum = "0e7bb23d733dfcc8af652a78b7bf232f0e967710d044732185e561e47c0336b6"
dependencies = [
"cc",
"libc",
@ -3553,9 +3552,9 @@ dependencies = [
[[package]]
name = "libsqlite3-sys"
version = "0.27.0"
version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716"
checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f"
dependencies = [
"cc",
"pkg-config",
@ -3602,9 +3601,9 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
[[package]]
name = "loom"
version = "0.5.6"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5"
checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca"
dependencies = [
"cfg-if 1.0.0",
"generator",
@ -3797,9 +3796,9 @@ dependencies = [
[[package]]
name = "mimalloc"
version = "0.1.41"
version = "0.1.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f41a2280ded0da56c8cf898babb86e8f10651a34adcfff190ae9a1159c6908d"
checksum = "e9186d86b79b52f4a77af65604b51225e8db1d6ee7e3f41aec1e40829c71a176"
dependencies = [
"libmimalloc-sys",
]
@ -3812,9 +3811,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]]
name = "minifb"
version = "0.25.0"
version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05eddefadb505d3dcb66a89fa77dd0936e72ec84e891cc8fc36e3c05bfe61103"
checksum = "b0c470a74618b43cd182c21b3dc1e6123501249f3bad9a0085e95d1304ca2478"
dependencies = [
"cc",
"dlib",
@ -3824,7 +3823,7 @@ dependencies = [
"lazy_static",
"libc",
"orbclient",
"raw-window-handle 0.4.3",
"raw-window-handle 0.6.2",
"serde",
"serde_derive",
"tempfile",
@ -3907,20 +3906,22 @@ dependencies = [
[[package]]
name = "native-dialog"
version = "0.6.4"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bbf55edb2747e4e4b3a9cd3989194b88aae32274b4422635dcf98aa6e84197b"
checksum = "84e7038885d2aeab236bd60da9e159a5967b47cde3292da3b15ff1bec27c039f"
dependencies = [
"ascii",
"block",
"cocoa",
"core-foundation",
"dirs-next",
"objc",
"objc-foundation",
"objc_id",
"once_cell",
"raw-window-handle 0.4.3",
"raw-window-handle 0.5.2",
"thiserror",
"versions",
"wfd",
"which",
"winapi",
@ -4085,7 +4086,7 @@ version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c84f77a45e99a2f9b492695d99e1c23844619caa5f3e57647cffacad773ca257"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 1.0.109",
]
@ -4180,9 +4181,9 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -4282,7 +4283,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
dependencies = [
"proc-macro-crate 1.3.1",
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 1.0.109",
]
@ -4294,9 +4295,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
dependencies = [
"proc-macro-crate 1.3.1",
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -4306,9 +4307,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
dependencies = [
"proc-macro-crate 3.1.0",
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -4645,9 +4646,9 @@ version = "1.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -4806,18 +4807,18 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.82"
version = "1.0.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43"
dependencies = [
"unicode-ident",
]
[[package]]
name = "profiling"
version = "1.0.8"
version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2"
checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58"
dependencies = [
"profiling-procmacros",
"tracy-client",
@ -4830,7 +4831,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
dependencies = [
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -4877,7 +4878,7 @@ version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28647f30298898ead966b51e9aee5c74e4ac709ce5ca554378fde187fd3f7e47"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 1.0.109",
]
@ -4978,7 +4979,7 @@ version = "1.0.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
]
[[package]]
@ -5103,21 +5104,18 @@ dependencies = [
"unicode-width",
]
[[package]]
name = "raw-window-handle"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41"
dependencies = [
"cty",
]
[[package]]
name = "raw-window-handle"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
[[package]]
name = "raw-window-handle"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
[[package]]
name = "rayon"
version = "1.10.0"
@ -5135,17 +5133,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
dependencies = [
"crossbeam-deque 0.8.5",
"crossbeam-utils 0.8.19",
"crossbeam-utils 0.8.20",
]
[[package]]
name = "rcgen"
version = "0.12.1"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48406db8ac1f3cbc7dcdb56ec355343817958a356ff430259bb07baf7607e1e1"
checksum = "54077e1872c46788540de1ea3d7f4ccb1983d12f9aa909b234468676c1a36779"
dependencies = [
"pem",
"ring 0.17.8",
"rustls-pki-types",
"time",
"yasna",
]
@ -5225,11 +5224,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd81f69687fe8a1fa10995108b3ffc7cdbd63e682a4f8fbfd1020130780d7e17"
dependencies = [
"heck 0.4.1",
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"refinery-core",
"regex",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -5359,12 +5358,13 @@ dependencies = [
[[package]]
name = "rodio"
version = "0.17.3"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b1bb7b48ee48471f55da122c0044fcc7600cfcc85db88240b89cb832935e611"
checksum = "16e3ea3fb0b6a1837445e29e36971b101c154920791113ff860768a68a0b1cad"
dependencies = [
"cpal",
"lewton",
"thiserror",
]
[[package]]
@ -5396,9 +5396,9 @@ dependencies = [
[[package]]
name = "rstar"
version = "0.10.0"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f39465655a1e3d8ae79c6d9e007f4953bfc5d55297602df9dc38f9ae9f1359a"
checksum = "133315eb94c7b1e8d0cb097e5a710d850263372fd028fff18969de708afc7008"
dependencies = [
"heapless",
"num-traits",
@ -5407,9 +5407,9 @@ dependencies = [
[[package]]
name = "rusqlite"
version = "0.30.0"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d"
checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae"
dependencies = [
"bitflags 2.5.0",
"fallible-iterator",
@ -5508,6 +5508,12 @@ dependencies = [
"base64 0.21.7",
]
[[package]]
name = "rustls-pki-types"
version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
[[package]]
name = "rustls-webpki"
version = "0.101.7"
@ -5738,9 +5744,9 @@ version = "1.0.202"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -5770,9 +5776,9 @@ version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -5886,7 +5892,7 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69760b786f8b40361c10663eb63c81fa7d828008527d26aa7595b99c53ab3a8d"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 1.0.109",
]
@ -6074,7 +6080,7 @@ name = "specs-derive"
version = "0.4.1"
source = "git+https://github.com/amethyst/specs.git?rev=4e2da1df29ee840baa9b936593c45592b7c9ae27#4e2da1df29ee840baa9b936593c45592b7c9ae27"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 1.0.109",
]
@ -6126,7 +6132,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ff9eaf853dec4c8802325d8b6d3dffa86cc707fd7a1a4cdbf416e13b061787a"
dependencies = [
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -6206,7 +6212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
dependencies = [
"heck 0.4.1",
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"rustversion",
"syn 1.0.109",
@ -6219,10 +6225,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
dependencies = [
"heck 0.4.1",
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"rustversion",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -6254,27 +6260,27 @@ version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"unicode-ident",
]
[[package]]
name = "syn"
version = "2.0.64"
version = "2.0.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ad3dee41f36859875573074334c200d1add8e4a87bb37113ebd31d926b7b11f"
checksum = "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"unicode-ident",
]
[[package]]
name = "sync_file"
version = "0.2.8"
version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbeec677c04ab24ccddb3b46a435ae41ce4985a1d4c9d12678bb3471c608f216"
checksum = "9cfc24238213e42ffb35314aad7a7f5d46649c5fbba3ea95ef24f7debb95874e"
dependencies = [
"wasi 0.11.0+wasi-snapshot-preview1",
]
@ -6360,9 +6366,9 @@ version = "1.0.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -6498,9 +6504,9 @@ version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -6660,9 +6666,9 @@ version = "0.1.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -6707,9 +6713,9 @@ dependencies = [
[[package]]
name = "tracing-tracy"
version = "0.10.2"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55c48ef3e655220d4e43a6be44aa84f078c3004357251cab45f9cc15551a593e"
checksum = "6024d04f84a69fd0d1dc1eee3a2b070bd246530a0582f9982ae487cb6c703614"
dependencies = [
"tracing-core",
"tracing-subscriber",
@ -6718,9 +6724,9 @@ dependencies = [
[[package]]
name = "tracy-client"
version = "0.15.2"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "434ecabbda9f67eeea1eab44d52f4a20538afa3e2c2770f2efc161142b25b608"
checksum = "59fb931a64ff88984f86d3e9bcd1ae8843aa7fe44dd0f8097527bc172351741d"
dependencies = [
"loom",
"once_cell",
@ -6729,21 +6735,21 @@ dependencies = [
[[package]]
name = "tracy-client-sys"
version = "0.21.2"
version = "0.22.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2cb915ea3af048554640d76dd6f1492589a6401a41a30d789b983c1ec280455a"
checksum = "9d104d610dfa9dd154535102cc9c6164ae1fa37842bc2d9e83f9ac82b0ae0882"
dependencies = [
"cc",
]
[[package]]
name = "treeculler"
version = "0.2.0"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "82449b48a3494420dd1b11081f198c542f795a036246da4a9c5845b7d7427226"
checksum = "c11fcf82651ce9a4550c82beb88a38951fdde004917817eba244359720d74c06"
dependencies = [
"num-traits",
"vek 0.14.1",
"vek 0.17.0",
]
[[package]]
@ -7007,7 +7013,7 @@ dependencies = [
"chrono-tz",
"clap",
"criterion",
"crossbeam-utils 0.8.19",
"crossbeam-utils 0.8.20",
"csv",
"dot_vox",
"enum-map",
@ -7368,12 +7374,11 @@ dependencies = [
"chrono",
"chumsky",
"clap",
"cmake",
"conrod_core",
"conrod_winit",
"criterion",
"crossbeam-channel",
"crossbeam-utils 0.8.19",
"crossbeam-utils 0.8.20",
"directories-next",
"discord-sdk",
"dispatch 0.1.4",
@ -7531,6 +7536,16 @@ version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "versions"
version = "5.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c73a36bc44e3039f51fbee93e39f41225f6b17b380eb70cc2aab942df06b34dd"
dependencies = [
"itertools 0.11.0",
"nom",
]
[[package]]
name = "walkdir"
version = "2.5.0"
@ -7581,9 +7596,9 @@ dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
"wasm-bindgen-shared",
]
@ -7615,9 +7630,9 @@ version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@ -7749,9 +7764,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "794839a710a39a12677c67ff43fec54ef00d0ca6c6f631209a7c5524522221d3"
dependencies = [
"anyhow",
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
"wasmtime-component-util",
"wasmtime-wit-bindgen",
"wit-parser",
@ -7906,9 +7921,9 @@ version = "20.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d3b70422fdfa915c903f003b8b42554a8ae1aa0c6208429d8314ebf5721f3ac"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]
@ -8141,7 +8156,7 @@ version = "0.29.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"xml-rs",
]
@ -8152,7 +8167,7 @@ version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quick-xml 0.31.0",
"quote 1.0.36",
]
@ -8353,10 +8368,10 @@ checksum = "4ec3909e70f36066526ad3b2abb4855ab836f8a6b293449582563ac50d651083"
dependencies = [
"anyhow",
"heck 0.4.1",
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"shellexpand 2.1.2",
"syn 2.0.64",
"syn 2.0.65",
"witx",
]
@ -8366,9 +8381,9 @@ version = "20.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4c31124572ab16401c491c0d4fb5fe5d17dab65fcfcc56d7d8efb1c1e56a3db"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
"wiggle-generate",
]
@ -8443,15 +8458,6 @@ dependencies = [
"thiserror",
]
[[package]]
name = "windows"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
dependencies = [
"windows-targets 0.48.5",
]
[[package]]
name = "windows"
version = "0.51.1"
@ -8715,7 +8721,7 @@ dependencies = [
"bitflags 1.3.2",
"cfg_aliases",
"core-foundation",
"core-graphics",
"core-graphics 0.22.3",
"dispatch 0.2.0",
"instant",
"libc",
@ -8990,9 +8996,9 @@ version = "0.7.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
dependencies = [
"proc-macro2 1.0.82",
"proc-macro2 1.0.83",
"quote 1.0.36",
"syn 2.0.64",
"syn 2.0.65",
]
[[package]]

2
common/base/Cargo.toml
View File

@ -16,4 +16,4 @@ directories-next = "2.0"
# NOTE: This must be kept in sync with the `tracy-client` version used by the
# `tracing-tracy` version in `common/frontend`.
# Using `=` here keeps `cargo update` from breaking this.
profiling = { version = "=1.0.8", default-features = false, optional = true }
profiling = { version = "=1.0.15", default-features = false, optional = true }

2
common/frontend/Cargo.toml
View File

@ -20,4 +20,4 @@ tracing-subscriber = { version = "0.3.7", default-features = false, features = [
# Tracy
# NOTE: This must be kept in sync with the `profiling` version in `common/base`.
# NOTE: `=` since the minor version of tracing-tracy bumped a major version of `tracy-client`
tracing-tracy = { version = "=0.10.2", optional = true }
tracing-tracy = { version = "=0.11.0", optional = true }

4
common/frontend/src/lib.rs
View File

@ -109,7 +109,9 @@ where
// Create the terminal writer layer.
#[cfg(feature = "tracy")]
let registry = registry.with(tracing_tracy::TracyLayer::new().with_stackdepth(0));
let registry = registry.with(tracing_tracy::TracyLayer::new(
tracing_tracy::DefaultConfig::default(),
));
#[cfg(not(feature = "tracy"))]
let registry = {
let (non_blocking, stdio_guard) = tracing_appender::non_blocking(terminal.make_writer());

2
network/Cargo.toml
View File

@ -72,7 +72,7 @@ criterion = { version = "0.5.1", default-features = false, features = [
"async_tokio",
] }
#quic
rcgen = { version = "0.12" }
rcgen = { version = "0.13.1" }
[[bench]]
name = "speed"

6
network/tests/helper.rs
View File

@ -105,11 +105,11 @@ pub fn quic() -> (ListenAddr, ConnectAddr) {
trace!("generating self-signed certificate");
let cert = rcgen::generate_simple_self_signed(vec![LOCALHOST.into()]).unwrap();
let key = cert.serialize_private_key_der();
let cert = cert.serialize_der().unwrap();
let key = cert.key_pair.serialize_der();
let cert = cert.cert.der();
let key = rustls::PrivateKey(key);
let cert = rustls::Certificate(cert);
let cert = rustls::Certificate((*cert).to_vec());
let mut root_store = rustls::RootCertStore::empty();
root_store.add(&cert).expect("cannot add cert to rootstore");

4
server/Cargo.toml
View File

@ -71,12 +71,12 @@ enum-map = { workspace = true }
noise = { version = "0.7", default-features = false }
censor = "0.3"
rusqlite = { version = "0.30.0", features = [
rusqlite = { version = "0.31.0", features = [
"array",
"vtab",
"bundled",
"trace",
] }
refinery = { version = "0.8.12", features = ["rusqlite"] }
refinery = { version = "0.8.14", features = ["rusqlite"] }
schnellru = "0.2.1"

9
voxygen/Cargo.toml
View File

@ -76,9 +76,6 @@ bytemuck = { version = "1.7", features = ["derive"] }
# shaderc = "0.8.0"
# Working around a current bug in shaderc that causes it to use the system installation even if we specify compile from source
shaderc = { git = "https://github.com/pythonesque/shaderc-rs", rev = "f2605a02062834019bedff911aee2fd2998c49f9" }
# cmake crate used by shaderc, newer version 0.1.46 uses a new cmake command that is not available in our CI cmake version
# see https://github.com/alexcrichton/cmake-rs/issues/131
cmake = "=0.1.45"
# Ui
conrod_core = { git = "https://gitlab.com/veloren/conrod.git", branch = "copypasta_0.7" }
@ -125,19 +122,19 @@ guillotiere = "0.6.2"
hashbrown = { workspace = true }
image = { workspace = true, features = ["ico"] }
lazy_static = { workspace = true }
native-dialog = { version = "0.6.3", optional = true }
native-dialog = { version = "0.7.0", optional = true }
num = { workspace = true }
ordered-float = { workspace = true }
rand = { workspace = true }
rand_chacha = { workspace = true }
rayon = { workspace = true }
rodio = { version = "0.17", default-features = false, features = ["vorbis"] }
rodio = { version = "0.18", default-features = false, features = ["vorbis"] }
ron = { workspace = true }
serde = { workspace = true, features = ["rc"] }
slab = { workspace = true }
strum = { workspace = true }
tracing = { workspace = true }
treeculler = "0.2"
treeculler = "0.4"
tokio = { workspace = true, features = ["rt-multi-thread"] }
num_cpus = "1.0"
inline_tweak = { workspace = true }

6
world/Cargo.toml
View File

@ -58,7 +58,7 @@ deflate = { version = "1.0.0", optional = true }
flate2 = { version = "1.0.20", optional = true }
num-traits = { workspace = true, optional = true }
fallible-iterator = { version = "0.3.0", optional = true }
rstar = { version = "0.10", optional = true }
rstar = { version = "0.12", optional = true }
clap = { workspace = true, optional = true }
signal-hook = { version = "0.3.6", optional = true }
indicatif = { version = "0.17.8", optional = true }
@ -78,8 +78,8 @@ tracing-subscriber = { version = "0.3.7", default-features = false, features = [
"smallvec",
"env-filter",
] }
minifb = "0.25"
rusqlite = { version = "0.30.0", features = [
minifb = "0.27"
rusqlite = { version = "0.31.0", features = [
"array",
"vtab",
"bundled",