diff --git a/Cargo.lock b/Cargo.lock index ce67d09945..e46a0808ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -329,13 +329,15 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.9.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" dependencies = [ "concurrent-queue", "event-listener", + "event-listener-strategy", "futures-core", + "pin-project-lite", ] [[package]] @@ -895,11 +897,20 @@ version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" dependencies = [ - "error-code", + "error-code 2.3.1", "str-buf", "winapi", ] +[[package]] +name = "clipboard-win" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c57002a5d9be777c1ef967e33674dac9ebd310d8893e4e3437b14d5f0f6372cc" +dependencies = [ + "error-code 3.0.0", +] + [[package]] name = "clipboard_macos" version = "0.1.0" @@ -1406,22 +1417,6 @@ version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" -[[package]] -name = "crossterm" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" -dependencies = [ - "bitflags 1.3.2", - "crossterm_winapi", - "libc", - "mio", - "parking_lot 0.12.1", - "signal-hook", - "signal-hook-mio", - "winapi", -] - [[package]] name = "crossterm" version = "0.27.0" @@ -1955,6 +1950,12 @@ dependencies = [ "str-buf", ] +[[package]] +name = "error-code" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "281e452d3bad4005426416cdba5ccfd4f5c1280e10099e21db27f7c1c28347fc" + [[package]] name = "euc" version = "0.5.3" @@ -1975,9 +1976,24 @@ dependencies = [ [[package]] name = "event-listener" -version = "2.5.3" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener", + "pin-project-lite", +] [[package]] name = "fallible-iterator" @@ -1999,13 +2015,13 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fd-lock" -version = "3.0.13" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" +checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947" dependencies = [ "cfg-if 1.0.0", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3789,17 +3805,6 @@ dependencies = [ "memoffset 0.6.5", ] -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if 1.0.0", - "libc", -] - [[package]] name = "nix" version = "0.27.1" @@ -4285,6 +4290,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + [[package]] name = "parking_lot" version = "0.11.2" @@ -4870,7 +4881,7 @@ dependencies = [ "bitflags 2.4.2", "cassowary", "compact_str", - "crossterm 0.27.0", + "crossterm", "indoc", "itertools 0.12.1", "lru", @@ -5365,21 +5376,20 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rustyline" -version = "12.0.0" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9" +checksum = "02a2d683a4ac90aeef5b1013933f6d977bd37d51ff3f4dad829d4931a7e6be86" dependencies = [ "bitflags 2.4.2", "cfg-if 1.0.0", - "clipboard-win 4.5.0", + "clipboard-win 5.0.0", "fd-lock", "home", "libc", "log", "memchr", - "nix 0.26.4", + "nix 0.27.1", "radix_trie", - "scopeguard", "unicode-segmentation", "unicode-width", "utf8parse", @@ -6435,18 +6445,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.19.15", -] - [[package]] name = "toml" version = "0.8.10" @@ -6475,8 +6473,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap 2.2.2", - "serde", - "serde_spanned", "toml_datetime", "winnow", ] @@ -7039,7 +7035,7 @@ dependencies = [ "specs", "tar", "timer-queue", - "toml 0.7.8", + "toml 0.8.10", "tracing", "vek 0.15.8", "veloren-common", @@ -7240,7 +7236,7 @@ dependencies = [ "cansi", "chrono", "clap", - "crossterm 0.26.1", + "crossterm", "hyper", "lazy_static", "mimalloc", diff --git a/client/Cargo.toml b/client/Cargo.toml index f459225045..5f4f252810 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -35,13 +35,13 @@ authc = { git = "https://gitlab.com/veloren/auth.git", rev = "abb1a705827984e117 #TODO: put bot in a different crate #bot only -async-channel = { version = "1.6", optional = true } +async-channel = { version = "2.1", optional = true } voxygen-i18n-helpers = { package = "veloren-voxygen-i18n-helpers", path = "../voxygen/i18n-helpers", optional = true } client-i18n = { package = "veloren-client-i18n", path = "i18n", optional = true } serde = { workspace = true, features = [ "rc" ], optional = true } ron = { workspace = true, optional = true } clap = { workspace = true, optional = true } -rustyline = { version = "12.0.0", optional = true } +rustyline = { version = "13.0.0", optional = true } ## logging common-frontend = { package = "veloren-common-frontend", path = "../common/frontend", optional = true } diff --git a/common/state/Cargo.toml b/common/state/Cargo.toml index a94ba64808..faa4b6e95b 100644 --- a/common/state/Cargo.toml +++ b/common/state/Cargo.toml @@ -31,7 +31,7 @@ specs = { workspace = true, features = ["serde", "storage-event-control", "deriv # Plugins scopeguard = "1.1.0" serde = { workspace = true, optional = true } -toml = { version = "0.7", optional = true } +toml = { version = "0.8", optional = true } tar = { version = "0.4.37", optional = true } wasmer = { version = "4.0.0", optional = true, default-features = false, features = ["sys", "wat", "cranelift"] } bincode = { workspace = true, optional = true } diff --git a/network/Cargo.toml b/network/Cargo.toml index 0fd16d0228..7aca6938e6 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -31,7 +31,7 @@ tracing = { workspace = true } prometheus = { workspace = true, optional = true } #async futures-util = { workspace = true, features = ["std"] } -async-channel = "1.6" #use for .close() channels +async-channel = "2.1" #use for .close() channels #mpsc channel registry lazy_static = { workspace = true } rand = { workspace = true } diff --git a/network/protocol/Cargo.toml b/network/protocol/Cargo.toml index de820f2a85..3f9522c6b8 100644 --- a/network/protocol/Cargo.toml +++ b/network/protocol/Cargo.toml @@ -27,7 +27,7 @@ bytes = "^1" hashbrown = { workspace = true } [dev-dependencies] -async-channel = "1.6" +async-channel = "2.1" tokio = { workspace = true, features = ["macros"] } criterion = { version = "0.5.1", default-features=false, features=["rayon", "cargo_bench_support", "async_tokio"]} diff --git a/server-cli/Cargo.toml b/server-cli/Cargo.toml index e6b7ca3028..9621edcc3f 100644 --- a/server-cli/Cargo.toml +++ b/server-cli/Cargo.toml @@ -39,7 +39,7 @@ tokio = { workspace = true, features = ["rt-multi-thread"] } num_cpus = "1.0" cansi = "2.2.1" clap = { workspace = true } -crossterm = "0.26" +crossterm = "0.27" lazy_static = { workspace = true } signal-hook = "0.3.6" shell-words = "1.0.0" diff --git a/server-cli/src/web/mod.rs b/server-cli/src/web/mod.rs index a73f95b456..eac86e37c8 100644 --- a/server-cli/src/web/mod.rs +++ b/server-cli/src/web/mod.rs @@ -1,6 +1,6 @@ use axum::{extract::State, response::IntoResponse, routing::get, Router}; use core::{future::Future, ops::Deref}; -use hyper::{header, http, Body, StatusCode}; +use hyper::{body::Body, header, http, StatusCode}; use prometheus::{Registry, TextEncoder}; use server::chat::ChatCache; use std::net::SocketAddr; @@ -16,7 +16,7 @@ pub async fn run( ) -> Result<(), hyper::Error> where S: Into, - F: Future, + F: Future + Send, R: Deref + Clone + Send + Sync + 'static, { let metrics = Router::new()