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 'xMAC94x/update_crates' into 'master'

Browse Source 
update crates

See merge request veloren/veloren!2863
This commit is contained in:
Marcel 2021-09-20 13:31:14 +00:00
commit e472075b6a
18 changed files with 490 additions and 410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

856
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
client/Cargo.toml
View File

@ -21,7 +21,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", default-features = false, features = ["rt-multi-thread"] }
tokio = { version = "1.11", default-features = false, features = ["rt-multi-thread"] }
quinn = "0.7.2"
image = { version = "0.23.12", default-features = false, features = ["png"] }
num = "0.4"
@ -39,7 +39,7 @@ common-ecs = { package = "veloren-common-ecs", path = "../common/ecs", optional
serde = { version = "1.0", features = [ "rc", "derive" ], optional = true }
ron = { version = "0.6", default-features = false, optional = true }
clap = { version = "2.33", optional = true }
rustyline = { version = "8.0.0", optional = true }
rustyline = { version = "9.0.0", optional = true }
## logging
termcolor = { version = "1.1", optional = true }
common-frontend = { package = "veloren-common-frontend", path = "../common/frontend", optional = true }

2
common/Cargo.toml
View File

@ -24,7 +24,7 @@ common-base = { package = "veloren-common-base", path = "base" }
serde = { version = "1.0.110", features = ["derive", "rc"] }
# Util
enum-iterator = "0.6"
enum-iterator = "0.7"
vek = { version = "=0.14.1", features = ["serde"] }
# Strum

2
common/ecs/Cargo.toml
View File

@ -16,4 +16,4 @@ specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "s
[dev-dependencies]
#bench
float-cmp = "0.8.0"
float-cmp = "0.9.0"

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

@ -1,8 +1,8 @@
#![allow(incomplete_features)]
#![feature(
const_generics,
const_fn_floating_point_arithmetic,
const_evaluatable_checked
const_evaluatable_checked,
const_fn_floating_point_arithmetic
)]
pub mod msg;
pub mod sync;

1
common/src/lib.rs
View File

@ -7,7 +7,6 @@
arbitrary_enum_discriminant,
associated_type_defaults,
bool_to_option,
const_generics,
fundamental,
iter_map_while,
label_break_value,

2
common/state/Cargo.toml
View File

@ -31,7 +31,7 @@ specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "s
scopeguard = "1.1.0"
serde = { version = "1.0.110", features = ["derive"], optional = true }
toml = { version = "0.5.7", optional = true }
tar = { version = "0.4.30", optional = true }
tar = { version = "0.4.37", optional = true }
wasmer = { version = "2.0.0", optional = true, default-features = false, features = ["wat", "default-cranelift", "default-universal"] }
bincode = { version = "1.3.1", optional = true }
plugin-api = { package = "veloren-plugin-api", path = "../../plugin/api", optional = true }

4
network/Cargo.toml
View File

@ -22,7 +22,7 @@ bincode = "1.3.2"
serde = { version = "1.0" }
#sending
crossbeam-channel = "0.5"
tokio = { version = "1.2", default-features = false, features = ["io-util", "macros", "rt", "net", "time"] }
tokio = { version = "1.11", 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"]}
@ -47,7 +47,7 @@ hashbrown = { version = ">=0.9, <0.12" }
[dev-dependencies]
tracing-subscriber = { version = "0.2.3", default-features = false, features = ["env-filter", "fmt", "chrono", "ansi", "smallvec"] }
tokio = { version = "1.2", default-features = false, features = ["io-std", "fs", "rt-multi-thread"] }
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 }
shellexpand = "2.0.0"

2
network/protocol/Cargo.toml
View File

@ -28,7 +28,7 @@ hashbrown = { version = ">=0.9, <0.12" }
[dev-dependencies]
async-channel = "1.5.1"
tokio = { version = "^1", default-features = false, features = ["rt", "macros"] }
tokio = { version = "1.11", default-features = false, features = ["rt", "macros"] }
criterion = { version = "0.3.4", features = ["default", "async_tokio"] }
[[bench]]

4
server-cli/Cargo.toml
View File

@ -31,12 +31,12 @@ common-base = { package = "veloren-common-base", path = "../common/base" }
common-net = { package = "veloren-common-net", path = "../common/net" }
common-frontend = { package = "veloren-common-frontend", path = "../common/frontend" }
tokio = { version = "1", default-features = false, features = ["rt-multi-thread"] }
tokio = { version = "1.11", default-features = false, features = ["rt-multi-thread"] }
num_cpus = "1.0"
ansi-parser = "0.8"
clap = "2.33"
structopt = "0.3.13"
crossterm = "0.20"
crossterm = "0.21"
lazy_static = "1"
signal-hook = "0.3.6"
shell-words = "1.0.0"

2
server/Cargo.toml
View File

@ -33,7 +33,7 @@ num_cpus = "1.0"
tracing = "0.1"
vek = { version = "0.14.1", features = ["serde"] }
futures-util = "0.3.7"
tokio = { version = "1", default-features = false, features = ["rt"] }
tokio = { version = "1.11", default-features = false, features = ["rt"] }
prometheus-hyper = "0.1.2"
quinn = "0.7.2"
atomicwrites = "0.3.0"

4
voxygen/Cargo.toml
View File

@ -97,7 +97,7 @@ crossbeam-channel = "0.5"
# TODO: remove
directories-next = "2.0"
dot_vox = "4.0"
enum-iterator = "0.6"
enum-iterator = "0.7"
guillotiere = "0.6"
hashbrown = {version = "0.11", features = ["rayon", "serde", "nightly"]}
image = {version = "0.23.12", default-features = false, features = ["ico", "png"]}
@ -113,7 +113,7 @@ serde = {version = "1.0", features = [ "rc", "derive" ]}
strum = { version = "0.21", features = ["derive"] }
strum_macros = "0.21"
treeculler = "0.2"
tokio = { version = "1", default-features = false, features = ["rt-multi-thread"] }
tokio = { version = "1.11", default-features = false, features = ["rt-multi-thread"] }
num_cpus = "1.0"
# vec_map = { version = "0.8.2" }
# inline_tweak = "1.0.2"

1
voxygen/anim/src/lib.rs
View File

@ -1,4 +1,3 @@
#![feature(const_generics)]
#![feature(generic_associated_types)]
#![allow(incomplete_features)]
#[cfg(all(feature = "be-dyn-lib", feature = "use-dyn-lib"))]

2
voxygen/dynlib/Cargo.toml
View File

@ -7,5 +7,5 @@ edition = "2018"
[dependencies]
find_folder = {version = "0.3.0"}
libloading = {version = "0.7"}
notify = {version = "5.0.0-pre.2"}
notify = {version = "5.0.0-pre.13"}
tracing = "0.1"

6
voxygen/dynlib/src/lib.rs
View File

@ -1,5 +1,5 @@
use libloading::Library;
use notify::{immediate_watcher, EventKind, RecursiveMode, Watcher};
use notify::{recommended_watcher, EventKind, RecursiveMode, Watcher};
use std::{
process::{Command, Stdio},
sync::{mpsc, Mutex},
@ -130,7 +130,7 @@ pub fn init(
let (reload_send, reload_recv) = mpsc::channel();
// Start watcher
let mut watcher = immediate_watcher(move |res| event_fn(res, &reload_send)).unwrap();
let mut watcher = recommended_watcher(move |res| event_fn(res, &reload_send)).unwrap();
// Search for the source directory of the package being hot-reloaded.
let watch_dir = Search::Kids(1)
@ -142,7 +142,7 @@ pub fn init(
)
});
watcher.watch(watch_dir, RecursiveMode::Recursive).unwrap();
watcher.watch(&watch_dir, RecursiveMode::Recursive).unwrap();
// Start reloader that watcher signals
// "Debounces" events since I can't find the option to do this in the latest

1
voxygen/src/lib.rs
View File

@ -7,7 +7,6 @@
array_methods,
array_zip,
bool_to_option,
const_generics,
drain_filter,
once_cell,
trait_alias

2
world/Cargo.toml
View File

@ -17,7 +17,7 @@ common-net = { package = "veloren-common-net", path = "../common/net" }
bincode = "1.3.1"
bitvec = "0.22"
enum-iterator = "0.6"
enum-iterator = "0.7"
fxhash = "0.2.1"
image = { version = "0.23.12", default-features = false, features = ["png"] }
itertools = "0.10"

1
world/src/lib.rs
View File

@ -10,7 +10,6 @@
#![feature(
arbitrary_enum_discriminant,
bool_to_option,
const_generics,
const_panic,
label_break_value,
array_map