diff --git a/Cargo.lock b/Cargo.lock index 02f67526e7..39933e788c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -285,7 +285,7 @@ dependencies = [ "crossbeam-channel", "log", "notify", - "parking_lot 0.12.1", + "parking_lot 0.12.0", "ron 0.8.0", "serde", "serde_json", @@ -340,7 +340,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1163d9d7c51de51a2b79d6df5e8888d11e9df17c752ce4a285fb6ca1580734e" dependencies = [ - "rustix", + "rustix 0.37.19", "tempfile", "windows-sys 0.48.0", ] @@ -1138,7 +1138,7 @@ dependencies = [ "ndk-context", "oboe", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.0", "stdweb 0.4.20", "thiserror", "web-sys", @@ -1395,8 +1395,8 @@ dependencies = [ "bitflags 1.3.2", "crossterm_winapi 0.9.0", "libc", - "mio 0.8.6", - "parking_lot 0.12.1", + "mio 0.8.2", + "parking_lot 0.12.0", "signal-hook 0.3.15", "signal-hook-mio", "winapi 0.3.9", @@ -1730,7 +1730,7 @@ dependencies = [ "bitflags 2.2.1", "crossbeam-channel", "num-traits", - "parking_lot 0.12.1", + "parking_lot 0.12.0", "serde", "serde_json", "serde_repr", @@ -1958,6 +1958,17 @@ dependencies = [ "egui", ] +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi 0.3.9", +] + [[package]] name = "errno" version = "0.3.1" @@ -2046,13 +2057,13 @@ dependencies = [ [[package]] name = "fd-lock" -version = "3.0.12" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ae6b3d9530211fb3b12a95374b8b0823be812f53d09e18c5675c0146b09642" +checksum = "02ecad9808e0596f8956d14f7fa868f996290bd01c8d7329d6e5bc2bb76adf8f" dependencies = [ "cfg-if 1.0.0", - "rustix", - "windows-sys 0.48.0", + "rustix 0.33.7", + "windows-sys 0.30.0", ] [[package]] @@ -2086,14 +2097,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall 0.2.16", - "windows-sys 0.48.0", + "winapi 0.3.9", ] [[package]] @@ -2326,15 +2337,15 @@ dependencies = [ [[package]] name = "generator" -version = "0.7.4" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e123d9ae7c02966b4d892e550bdc32164f05853cd40ab570650ad600596a8a" +checksum = "c1d9279ca822891c1a4dae06d185612cf8fc6acfe5dff37781b41297811b12ee" dependencies = [ "cc", "libc", "log", "rustversion", - "windows 0.48.0", + "winapi 0.3.9", ] [[package]] @@ -3124,6 +3135,12 @@ dependencies = [ "mach2", ] +[[package]] +name = "io-lifetimes" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec58677acfea8a15352d42fc87d11d63596ade9239e0a7c9352914417515dbe6" + [[package]] name = "io-lifetimes" version = "1.0.10" @@ -3142,8 +3159,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", + "io-lifetimes 1.0.10", + "rustix 0.37.19", "windows-sys 0.48.0", ] @@ -3419,6 +3436,12 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +[[package]] +name = "linux-raw-sys" +version = "0.0.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7" + [[package]] name = "linux-raw-sys" version = "0.3.7" @@ -3682,14 +3705,16 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.6" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" dependencies = [ "libc", "log", + "miow", + "ntapi", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "winapi 0.3.9", ] [[package]] @@ -4013,7 +4038,7 @@ dependencies = [ "inotify", "kqueue", "libc", - "mio 0.8.6", + "mio 0.8.2", "walkdir 2.3.3", "windows-sys 0.42.0", ] @@ -4415,12 +4440,12 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" dependencies = [ "lock_api 0.4.9", - "parking_lot_core 0.9.7", + "parking_lot_core 0.9.2", ] [[package]] @@ -4453,15 +4478,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall 0.2.16", "smallvec", - "windows-sys 0.45.0", + "windows-sys 0.34.0", ] [[package]] @@ -4770,7 +4795,7 @@ dependencies = [ "fnv", "lazy_static", "memchr", - "parking_lot 0.12.1", + "parking_lot 0.12.0", "thiserror", ] @@ -5409,6 +5434,20 @@ dependencies = [ "semver 1.0.17", ] +[[package]] +name = "rustix" +version = "0.33.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938a344304321a9da4973b9ff4f9f8db9caf4597dfd9dda6a60b523340a0fff0" +dependencies = [ + "bitflags 1.3.2", + "errno 0.2.8", + "io-lifetimes 0.5.3", + "libc", + "linux-raw-sys 0.0.42", + "winapi 0.3.9", +] + [[package]] name = "rustix" version = "0.37.19" @@ -5416,10 +5455,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ "bitflags 1.3.2", - "errno", - "io-lifetimes", + "errno 0.3.1", + "io-lifetimes 1.0.10", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.7", "windows-sys 0.48.0", ] @@ -5571,11 +5610,12 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" dependencies = [ - "windows-sys 0.42.0", + "lazy_static", + "winapi 0.3.9", ] [[package]] @@ -5900,7 +5940,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" dependencies = [ "libc", - "mio 0.8.6", + "mio 0.8.2", "signal-hook 0.3.15", ] @@ -6319,7 +6359,7 @@ dependencies = [ "cfg-if 1.0.0", "fastrand", "redox_syscall 0.3.5", - "rustix", + "rustix 0.37.19", "windows-sys 0.45.0", ] @@ -6449,31 +6489,33 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f" +checksum = "57aec3cfa4c296db7255446efb4928a6be304b431a806216105542a67b6ca82e" dependencies = [ "autocfg", "bytes", "libc", - "mio 0.8.6", + "memchr", + "mio 0.8.2", "num_cpus", + "once_cell", "pin-project-lite", "signal-hook-registry", "socket2 0.4.9", "tokio-macros", - "windows-sys 0.48.0", + "winapi 0.3.9", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2 1.0.56", "quote 1.0.26", - "syn 2.0.15", + "syn 1.0.109", ] [[package]] @@ -6500,9 +6542,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" dependencies = [ "bytes", "futures-core", @@ -6719,7 +6761,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", "rand 0.8.5", "static_assertions", ] @@ -7229,7 +7271,7 @@ dependencies = [ "lazy_static", "noise", "num_cpus", - "parking_lot 0.12.1", + "parking_lot 0.12.0", "portpicker", "prometheus", "prometheus-hyper", @@ -8222,6 +8264,19 @@ dependencies = [ "windows-targets 0.48.0", ] +[[package]] +name = "windows-sys" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "030b7ff91626e57a05ca64a07c481973cbb2db774e4852c9c7ca342408c6a99a" +dependencies = [ + "windows_aarch64_msvc 0.30.0", + "windows_i686_gnu 0.30.0", + "windows_i686_msvc 0.30.0", + "windows_x86_64_gnu 0.30.0", + "windows_x86_64_msvc 0.30.0", +] + [[package]] name = "windows-sys" version = "0.33.0" @@ -8235,6 +8290,19 @@ dependencies = [ "windows_x86_64_msvc 0.33.0", ] +[[package]] +name = "windows-sys" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825" +dependencies = [ + "windows_aarch64_msvc 0.34.0", + "windows_i686_gnu 0.34.0", + "windows_i686_msvc 0.34.0", + "windows_x86_64_gnu 0.34.0", + "windows_x86_64_msvc 0.34.0", +] + [[package]] name = "windows-sys" version = "0.42.0" @@ -8310,12 +8378,24 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29277a4435d642f775f63c7d1faeb927adba532886ce0287bd985bffb16b6bca" + [[package]] name = "windows_aarch64_msvc" version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd761fd3eb9ab8cc1ed81e56e567f02dd82c4c837e48ac3b2181b9ffc5060807" +[[package]] +name = "windows_aarch64_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" + [[package]] name = "windows_aarch64_msvc" version = "0.37.0" @@ -8334,12 +8414,24 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +[[package]] +name = "windows_i686_gnu" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1145e1989da93956c68d1864f32fb97c8f561a8f89a5125f6a2b7ea75524e4b8" + [[package]] name = "windows_i686_gnu" version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cab0cf703a96bab2dc0c02c0fa748491294bf9b7feb27e1f4f96340f208ada0e" +[[package]] +name = "windows_i686_gnu" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" + [[package]] name = "windows_i686_gnu" version = "0.37.0" @@ -8358,12 +8450,24 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +[[package]] +name = "windows_i686_msvc" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a09e3a0d4753b73019db171c1339cd4362c8c44baf1bcea336235e955954a6" + [[package]] name = "windows_i686_msvc" version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8cfdbe89cc9ad7ce618ba34abc34bbb6c36d99e96cae2245b7943cd75ee773d0" +[[package]] +name = "windows_i686_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" + [[package]] name = "windows_i686_msvc" version = "0.37.0" @@ -8382,12 +8486,24 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +[[package]] +name = "windows_x86_64_gnu" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ca64fcb0220d58db4c119e050e7af03c69e6f4f415ef69ec1773d9aab422d5a" + [[package]] name = "windows_x86_64_gnu" version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4dd9b0c0e9ece7bb22e84d70d01b71c6d6248b81a3c60d11869451b4cb24784" +[[package]] +name = "windows_x86_64_gnu" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" + [[package]] name = "windows_x86_64_gnu" version = "0.37.0" @@ -8418,12 +8534,24 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +[[package]] +name = "windows_x86_64_msvc" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08cabc9f0066848fef4bc6a1c1668e6efce38b661d2aeec75d18d8617eebb5f1" + [[package]] name = "windows_x86_64_msvc" version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff1e4aa646495048ec7f3ffddc411e1d829c026a2ec62b39da15c1055e406eaa" +[[package]] +name = "windows_x86_64_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" + [[package]] name = "windows_x86_64_msvc" version = "0.37.0" diff --git a/client/Cargo.toml b/client/Cargo.toml index 896433eb67..39b09a99d4 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -22,7 +22,7 @@ common-net = { package = "veloren-common-net", path = "../common/net" } network = { package = "veloren-network", path = "../network", features = ["compression","quic"], default-features = false } byteorder = "1.3.2" -tokio = { version = "1.24", default-features = false, features = ["rt-multi-thread"] } +tokio = { version = "1.20", default-features = false, features = ["rt-multi-thread"] } quinn = "0.8" image = { version = "0.24", default-features = false, features = ["png"] } num = "0.4" diff --git a/network/Cargo.toml b/network/Cargo.toml index e1e0c2b8b1..cbfd81eef0 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -24,7 +24,7 @@ serde = { version = "1.0" } socket2 = "0.5.2" #sending crossbeam-channel = "0.5" -tokio = { version = "1.24", default-features = false, features = ["io-util", "macros", "rt", "net", "time"] } +tokio = { version = "1.20", default-features = false, features = ["io-util", "macros", "rt", "net", "time"] } tokio-stream = { version = "0.1.2", default-features = false } #tracing and metrics tracing = { version = "0.1", default-features = false, features = ["attributes"]} @@ -50,7 +50,7 @@ hashbrown = { version = "0.13" } [dev-dependencies] tracing-subscriber = { version = "0.3.7", default-features = false, features = ["env-filter", "fmt", "time", "ansi", "smallvec"] } -tokio = { version = "1.24", default-features = false, features = ["io-std", "fs", "rt-multi-thread"] } +tokio = { version = "1.20", default-features = false, features = ["io-std", "fs", "rt-multi-thread"] } futures-util = { version = "0.3.7", default-features = false, features = ["sink", "std"] } clap = { version = "4.2", default-features = false, features = ["std", "color", "suggestions"] } shellexpand = "3.1.0" diff --git a/network/protocol/Cargo.toml b/network/protocol/Cargo.toml index 94488f025c..ba00c291cc 100644 --- a/network/protocol/Cargo.toml +++ b/network/protocol/Cargo.toml @@ -28,7 +28,7 @@ hashbrown = { version = "0.13" } [dev-dependencies] async-channel = "1.5.1" -tokio = { version = "1.24", default-features = false, features = ["rt", "macros"] } +tokio = { version = "1.20", default-features = false, features = ["rt", "macros"] } criterion = { version = "0.3.4", features = ["default", "async_tokio"] } [[bench]] diff --git a/server-cli/Cargo.toml b/server-cli/Cargo.toml index df7299975d..f3edc2c77d 100644 --- a/server-cli/Cargo.toml +++ b/server-cli/Cargo.toml @@ -35,7 +35,7 @@ common-net = { package = "veloren-common-net", path = "../common/net" } common-frontend = { package = "veloren-common-frontend", path = "../common/frontend" } world = { package = "veloren-world", path = "../world", optional = true } -tokio = { version = "1.24", default-features = false, features = ["rt-multi-thread"] } +tokio = { version = "1.20", default-features = false, features = ["rt-multi-thread"] } num_cpus = "1.0" cansi = "2.2.1" clap = { version = "4.2", features = ["derive"] } diff --git a/server/Cargo.toml b/server/Cargo.toml index 8c90dcfaaf..e0cc1c2b78 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -38,7 +38,7 @@ num_cpus = "1.0" tracing = "0.1" vek = { version = "0.15.8", features = ["serde"] } futures-util = "0.3.7" -tokio = { version = "1.24", default-features = false, features = ["rt"] } +tokio = { version = "1.20", default-features = false, features = ["rt"] } prometheus-hyper = "0.1.4" quinn = "0.8" rustls = { version = "0.20", default-features = false } diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml index c2c6e93d0f..4d1997a2dc 100644 --- a/voxygen/Cargo.toml +++ b/voxygen/Cargo.toml @@ -130,7 +130,7 @@ slab = "0.4.2" strum = { version = "0.24", features = ["derive"] } tracing = "0.1" treeculler = "0.2" -tokio = { version = "1.24", default-features = false, features = ["rt-multi-thread"] } +tokio = { version = "1.20", default-features = false, features = ["rt-multi-thread"] } num_cpus = "1.0" inline_tweak = "1.0.2" itertools = "0.10.0"