Merge branch 'xMAC94x/dependencies' into 'master'

update dependencies

See merge request veloren/veloren!2577
This commit is contained in:
Marcel 2021-07-08 16:40:37 +00:00
commit 8bb5fb6c14
6 changed files with 319 additions and 400 deletions

699
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -26,8 +26,8 @@ enum-iterator = "0.6"
vek = { version = "=0.14.1", features = ["serde"] }
# Strum
strum = "0.20"
strum_macros = "0.20"
strum = "0.21"
strum_macros = "0.21"
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
approx = "0.4.0"

View File

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

View File

@ -110,8 +110,8 @@ rayon = "1.5"
rodio = {version = "0.14", default-features = false, features = ["vorbis"]}
ron = {version = "0.6", default-features = false}
serde = {version = "1.0", features = [ "rc", "derive" ]}
strum = "0.20"
strum_macros = "0.20"
strum = "0.21"
strum_macros = "0.21"
treeculler = "0.2"
tokio = { version = "1", default-features = false, features = ["rt-multi-thread"] }
num_cpus = "1.0"

View File

@ -18,13 +18,13 @@ serde = { version = "1.0", features = ["derive"] }
tracing = "0.1"
# Diagnostic
ron = "0.6"
git2 = { version = "0.12", default-features = false, optional = true }
git2 = { version = "0.13", default-features = false, optional = true }
# Binary
clap = { version = "2.33", features = ["suggestions"], default-features = false, optional = true }
[dev-dependencies]
git2 = { version = "0.12", default-features = false }
git2 = { version = "0.13", default-features = false }
[features]
bin = ["git2", "clap"]

View File

@ -44,7 +44,7 @@ flate2 = { version = "1.0.20", optional = true }
num-traits = { version = "0.2", optional = true }
fallible-iterator = { version = "0.2.0", optional = true }
kiddo = { version = "0.1.4", optional = true }
rstar = { version = "0.8.3", optional = true }
rstar = { version = "0.9", optional = true }
clap = { version = "2.33.3", optional = true }
@ -57,7 +57,7 @@ minifb = "0.19.1"
rusqlite = { version = "0.24.2", features = ["array", "vtab", "bundled", "trace"] }
svg_fmt = "0.4"
structopt = "0.3"
strum = "0.20"
strum = "0.21"
[[bench]]
harness = false