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

update few dependencies

Browse Source
This commit is contained in:
Marcel Märtens 2024-02-06 18:49:48 +01:00
parent be6a99acb4
commit b0bef3ebbf
7 changed files with 61 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
Cargo.lock generated
View File

@ -329,13 +329,15 @@ dependencies = [
[[package]] [[package]]
name = "async-channel" name = "async-channel"
version = "1.9.0" version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c"
dependencies = [ dependencies = [
"concurrent-queue", "concurrent-queue",
"event-listener", "event-listener",
"event-listener-strategy",
"futures-core", "futures-core",
"pin-project-lite",
] ]
[[package]] [[package]]
@ -895,11 +897,20 @@ version = "4.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362"
dependencies = [ dependencies = [
"error-code", "error-code 2.3.1",
"str-buf", "str-buf",
"winapi", "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]] [[package]]
name = "clipboard_macos" name = "clipboard_macos"
version = "0.1.0" version = "0.1.0"
@ -1406,22 +1417,6 @@ version = "0.8.19"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" 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]] [[package]]
name = "crossterm" name = "crossterm"
version = "0.27.0" version = "0.27.0"
@ -1955,6 +1950,12 @@ dependencies = [
"str-buf", "str-buf",
] ]
[[package]]
name = "error-code"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "281e452d3bad4005426416cdba5ccfd4f5c1280e10099e21db27f7c1c28347fc"
[[package]] [[package]]
name = "euc" name = "euc"
version = "0.5.3" version = "0.5.3"
@ -1975,9 +1976,24 @@ dependencies = [
[[package]] [[package]]
name = "event-listener" name = "event-listener"
version = "2.5.3" version = "4.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index" 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]] [[package]]
name = "fallible-iterator" name = "fallible-iterator"
@ -1999,13 +2015,13 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
[[package]] [[package]]
name = "fd-lock" name = "fd-lock"
version = "3.0.13" version = "4.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"rustix", "rustix",
"windows-sys 0.48.0", "windows-sys 0.52.0",
] ]
[[package]] [[package]]
@ -3789,17 +3805,6 @@ dependencies = [
"memoffset 0.6.5", "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]] [[package]]
name = "nix" name = "nix"
version = "0.27.1" version = "0.27.1"
@ -4285,6 +4290,12 @@ dependencies = [
"num-traits", "num-traits",
] ]
[[package]]
name = "parking"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
[[package]] [[package]]
name = "parking_lot" name = "parking_lot"
version = "0.11.2" version = "0.11.2"
@ -4870,7 +4881,7 @@ dependencies = [
"bitflags 2.4.2", "bitflags 2.4.2",
"cassowary", "cassowary",
"compact_str", "compact_str",
"crossterm 0.27.0", "crossterm",
"indoc", "indoc",
"itertools 0.12.1", "itertools 0.12.1",
"lru", "lru",
@ -5365,21 +5376,20 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
[[package]] [[package]]
name = "rustyline" name = "rustyline"
version = "12.0.0" version = "13.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9" checksum = "02a2d683a4ac90aeef5b1013933f6d977bd37d51ff3f4dad829d4931a7e6be86"
dependencies = [ dependencies = [
"bitflags 2.4.2", "bitflags 2.4.2",
"cfg-if 1.0.0", "cfg-if 1.0.0",
"clipboard-win 4.5.0", "clipboard-win 5.0.0",
"fd-lock", "fd-lock",
"home", "home",
"libc", "libc",
"log", "log",
"memchr", "memchr",
"nix 0.26.4", "nix 0.27.1",
"radix_trie", "radix_trie",
"scopeguard",
"unicode-segmentation", "unicode-segmentation",
"unicode-width", "unicode-width",
"utf8parse", "utf8parse",
@ -6435,18 +6445,6 @@ dependencies = [
"serde", "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]] [[package]]
name = "toml" name = "toml"
version = "0.8.10" version = "0.8.10"
@ -6475,8 +6473,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
dependencies = [ dependencies = [
"indexmap 2.2.2", "indexmap 2.2.2",
"serde",
"serde_spanned",
"toml_datetime", "toml_datetime",
"winnow", "winnow",
] ]
@ -7039,7 +7035,7 @@ dependencies = [
"specs", "specs",
"tar", "tar",
"timer-queue", "timer-queue",
"toml 0.7.8", "toml 0.8.10",
"tracing", "tracing",
"vek 0.15.8", "vek 0.15.8",
"veloren-common", "veloren-common",
@ -7240,7 +7236,7 @@ dependencies = [
"cansi", "cansi",
"chrono", "chrono",
"clap", "clap",
"crossterm 0.26.1", "crossterm",
"hyper", "hyper",
"lazy_static", "lazy_static",
"mimalloc", "mimalloc",

4
client/Cargo.toml
View File

@ -35,13 +35,13 @@ authc = { git = "https://gitlab.com/veloren/auth.git", rev = "abb1a705827984e117
#TODO: put bot in a different crate #TODO: put bot in a different crate
#bot only #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 } voxygen-i18n-helpers = { package = "veloren-voxygen-i18n-helpers", path = "../voxygen/i18n-helpers", optional = true }
client-i18n = { package = "veloren-client-i18n", path = "i18n", optional = true } client-i18n = { package = "veloren-client-i18n", path = "i18n", optional = true }
serde = { workspace = true, features = [ "rc" ], optional = true } serde = { workspace = true, features = [ "rc" ], optional = true }
ron = { workspace = true, optional = true } ron = { workspace = true, optional = true }
clap = { workspace = true, optional = true } clap = { workspace = true, optional = true }
rustyline = { version = "12.0.0", optional = true } rustyline = { version = "13.0.0", optional = true }
## logging ## logging
common-frontend = { package = "veloren-common-frontend", path = "../common/frontend", optional = true } common-frontend = { package = "veloren-common-frontend", path = "../common/frontend", optional = true }

2
common/state/Cargo.toml
View File

@ -31,7 +31,7 @@ specs = { workspace = true, features = ["serde", "storage-event-control", "deriv
# Plugins # Plugins
scopeguard = "1.1.0" scopeguard = "1.1.0"
serde = { workspace = true, optional = true } serde = { workspace = true, optional = true }
toml = { version = "0.7", optional = true } toml = { version = "0.8", optional = true }
tar = { version = "0.4.37", optional = true } tar = { version = "0.4.37", optional = true }
wasmer = { version = "4.0.0", optional = true, default-features = false, features = ["sys", "wat", "cranelift"] } wasmer = { version = "4.0.0", optional = true, default-features = false, features = ["sys", "wat", "cranelift"] }
bincode = { workspace = true, optional = true } bincode = { workspace = true, optional = true }

2
network/Cargo.toml
View File

@ -31,7 +31,7 @@ tracing = { workspace = true }
prometheus = { workspace = true, optional = true } prometheus = { workspace = true, optional = true }
#async #async
futures-util = { workspace = true, features = ["std"] } 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 #mpsc channel registry
lazy_static = { workspace = true } lazy_static = { workspace = true }
rand = { workspace = true } rand = { workspace = true }

2
network/protocol/Cargo.toml
View File

@ -27,7 +27,7 @@ bytes = "^1"
hashbrown = { workspace = true } hashbrown = { workspace = true }
[dev-dependencies] [dev-dependencies]
async-channel = "1.6" async-channel = "2.1"
tokio = { workspace = true, features = ["macros"] } tokio = { workspace = true, features = ["macros"] }
criterion = { version = "0.5.1", default-features=false, features=["rayon", "cargo_bench_support", "async_tokio"]} criterion = { version = "0.5.1", default-features=false, features=["rayon", "cargo_bench_support", "async_tokio"]}

2
server-cli/Cargo.toml
View File

@ -39,7 +39,7 @@ tokio = { workspace = true, features = ["rt-multi-thread"] }
num_cpus = "1.0" num_cpus = "1.0"
cansi = "2.2.1" cansi = "2.2.1"
clap = { workspace = true } clap = { workspace = true }
crossterm = "0.26" crossterm = "0.27"
lazy_static = { workspace = true } lazy_static = { workspace = true }
signal-hook = "0.3.6" signal-hook = "0.3.6"
shell-words = "1.0.0" shell-words = "1.0.0"

4
server-cli/src/web/mod.rs
View File

@ -1,6 +1,6 @@
use axum::{extract::State, response::IntoResponse, routing::get, Router}; use axum::{extract::State, response::IntoResponse, routing::get, Router};
use core::{future::Future, ops::Deref}; use core::{future::Future, ops::Deref};
use hyper::{header, http, Body, StatusCode}; use hyper::{body::Body, header, http, StatusCode};
use prometheus::{Registry, TextEncoder}; use prometheus::{Registry, TextEncoder};
use server::chat::ChatCache; use server::chat::ChatCache;
use std::net::SocketAddr; use std::net::SocketAddr;
@ -16,7 +16,7 @@ pub async fn run<S, F, R>(
) -> Result<(), hyper::Error> ) -> Result<(), hyper::Error>
where where
S: Into<SocketAddr>, S: Into<SocketAddr>,
F: Future<Output = ()>, F: Future<Output = ()> + Send,
R: Deref<Target = Registry> + Clone + Send + Sync + 'static, R: Deref<Target = Registry> + Clone + Send + Sync + 'static,
{ {
let metrics = Router::new() let metrics = Router::new()