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

Browse Source 
switch to hashbrown 0.11 and specs 0.16.2

See merge request veloren/veloren!2390
This commit is contained in:
Marcel 2021-06-07 14:31:58 +00:00
commit 7e8bebdfa1
11 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Cargo.lock generated
View File

@ -2235,8 +2235,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
dependencies = [ dependencies = [
"ahash 0.4.7", "ahash 0.4.7",
"rayon",
"serde",
] ]
[[package]] [[package]]
@ -2246,6 +2244,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
dependencies = [ dependencies = [
"ahash 0.7.4", "ahash 0.7.4",
"rayon",
"serde",
] ]
[[package]] [[package]]
@ -4822,12 +4822,12 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
[[package]] [[package]]
name = "shred" name = "shred"
version = "0.11.1" version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3a9dff29ab65f4b7b4a5a38ca78e73b35eb8ffd7d4b5e5a77fc6936a1735eab" checksum = "eb0210289d693217926314867c807e0b7b42f7e23c136adb31f8697f5bf242d3"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"hashbrown 0.9.1", "hashbrown 0.11.2",
"mopa", "mopa",
"rayon", "rayon",
"shred-derive", "shred-derive",
@ -4968,11 +4968,11 @@ dependencies = [
[[package]] [[package]]
name = "specs" name = "specs"
version = "0.16.1" version = "0.16.2"
source = "git+https://github.com/amethyst/specs.git?rev=5a9b71035007be0e3574f35184acac1cd4530496#5a9b71035007be0e3574f35184acac1cd4530496" source = "git+https://github.com/amethyst/specs.git?rev=f985bec5d456f7b0dd8aae99848f9473c2cd9d46#f985bec5d456f7b0dd8aae99848f9473c2cd9d46"
dependencies = [ dependencies = [
"crossbeam-queue", "crossbeam-queue",
"hashbrown 0.9.1", "hashbrown 0.11.2",
"hibitset", "hibitset",
"log", "log",
"rayon", "rayon",
@ -4986,7 +4986,7 @@ dependencies = [
[[package]] [[package]]
name = "specs-derive" name = "specs-derive"
version = "0.4.1" version = "0.4.1"
source = "git+https://github.com/amethyst/specs.git?rev=5a9b71035007be0e3574f35184acac1cd4530496#5a9b71035007be0e3574f35184acac1cd4530496" source = "git+https://github.com/amethyst/specs.git?rev=f985bec5d456f7b0dd8aae99848f9473c2cd9d46#f985bec5d456f7b0dd8aae99848f9473c2cd9d46"
dependencies = [ dependencies = [
"proc-macro2 1.0.27", "proc-macro2 1.0.27",
"quote 1.0.9", "quote 1.0.9",
@ -4996,7 +4996,7 @@ dependencies = [
[[package]] [[package]]
name = "specs-idvs" name = "specs-idvs"
version = "0.1.1" version = "0.1.1"
source = "git+https://gitlab.com/veloren/specs-idvs.git?rev=b65fb220e94f5d3c9bc30074a076149763795556#b65fb220e94f5d3c9bc30074a076149763795556" source = "git+https://gitlab.com/veloren/specs-idvs.git?rev=8be2abcddf8f524cb5876e8dd20a7e47cfaf7573#8be2abcddf8f524cb5876e8dd20a7e47cfaf7573"
dependencies = [ dependencies = [
"specs", "specs",
] ]
@ -5732,7 +5732,7 @@ dependencies = [
"byteorder", "byteorder",
"clap", "clap",
"futures-util", "futures-util",
"hashbrown 0.9.1", "hashbrown 0.11.2",
"image", "image",
"num 0.4.0", "num 0.4.0",
"quinn", "quinn",
@ -5768,7 +5768,7 @@ dependencies = [
"csv", "csv",
"dot_vox", "dot_vox",
"enum-iterator", "enum-iterator",
"hashbrown 0.9.1", "hashbrown 0.11.2",
"indexmap", "indexmap",
"lazy_static", "lazy_static",
"num-derive", "num-derive",
@ -5846,7 +5846,7 @@ version = "0.9.0"
dependencies = [ dependencies = [
"bincode", "bincode",
"flate2", "flate2",
"hashbrown 0.9.1", "hashbrown 0.11.2",
"image", "image",
"num-traits", "num-traits",
"serde", "serde",
@ -5863,7 +5863,7 @@ name = "veloren-common-state"
version = "0.9.0" version = "0.9.0"
dependencies = [ dependencies = [
"bincode", "bincode",
"hashbrown 0.9.1", "hashbrown 0.11.2",
"num_cpus", "num_cpus",
"rayon", "rayon",
"scopeguard", "scopeguard",
@ -5885,7 +5885,7 @@ dependencies = [
name = "veloren-common-systems" name = "veloren-common-systems"
version = "0.9.0" version = "0.9.0"
dependencies = [ dependencies = [
"hashbrown 0.9.1", "hashbrown 0.11.2",
"indexmap", "indexmap",
"ordered-float 2.5.1", "ordered-float 2.5.1",
"rand 0.8.3", "rand 0.8.3",
@ -5907,7 +5907,7 @@ dependencies = [
"clap", "clap",
"deunicode", "deunicode",
"git2", "git2",
"hashbrown 0.9.1", "hashbrown 0.11.2",
"ron", "ron",
"serde", "serde",
"tracing", "tracing",
@ -5998,7 +5998,7 @@ dependencies = [
"chrono", "chrono",
"crossbeam-channel", "crossbeam-channel",
"futures-util", "futures-util",
"hashbrown 0.9.1", "hashbrown 0.11.2",
"humantime", "humantime",
"itertools 0.10.0", "itertools 0.10.0",
"lazy_static", "lazy_static",
@ -6082,7 +6082,7 @@ dependencies = [
"gilrs", "gilrs",
"glyph_brush", "glyph_brush",
"guillotiere", "guillotiere",
"hashbrown 0.9.1", "hashbrown 0.11.2",
"iced_native", "iced_native",
"iced_winit", "iced_winit",
"image", "image",
@ -6162,7 +6162,7 @@ dependencies = [
"enum-iterator", "enum-iterator",
"flate2", "flate2",
"fxhash", "fxhash",
"hashbrown 0.9.1", "hashbrown 0.11.2",
"image", "image",
"itertools 0.10.0", "itertools 0.10.0",
"lazy_static", "lazy_static",

4
client/Cargo.toml
View File

@ -28,9 +28,9 @@ image = { version = "0.23.12", default-features = false, features = ["png"] }
num = "0.4" num = "0.4"
tracing = { version = "0.1", default-features = false } tracing = { version = "0.1", default-features = false }
rayon = "1.5" rayon = "1.5"
specs = { git = "https://github.com/amethyst/specs.git", rev = "5a9b71035007be0e3574f35184acac1cd4530496" } specs = { git = "https://github.com/amethyst/specs.git", rev = "f985bec5d456f7b0dd8aae99848f9473c2cd9d46" }
vek = { version = "=0.14.1", features = ["serde"] } vek = { version = "=0.14.1", features = ["serde"] }
hashbrown = { version = "0.9", features = ["rayon", "serde", "nightly"] } hashbrown = { version = "0.11", features = ["rayon", "serde", "nightly"] }
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "fb3dcbc4962b367253f8f2f92760ef44d2679c9a" } authc = { git = "https://gitlab.com/veloren/auth.git", rev = "fb3dcbc4962b367253f8f2f92760ef44d2679c9a" }
#TODO: put bot in a different crate #TODO: put bot in a different crate

6
common/Cargo.toml
View File

@ -53,7 +53,7 @@ csv = { version = "1.1.3", optional = true }
structopt = { version = "0.3.13", optional = true } structopt = { version = "0.3.13", optional = true }
# Data structures # Data structures
hashbrown = { version = "0.9", features = ["rayon", "serde", "nightly"] } hashbrown = { version = "0.11", features = ["rayon", "serde", "nightly"] }
slotmap = { version = "1.0", features = ["serde"] } slotmap = { version = "1.0", features = ["serde"] }
indexmap = "1.3.0" indexmap = "1.3.0"
slab = "0.4.2" slab = "0.4.2"
@ -63,8 +63,8 @@ strum = "0.20"
strum_macros = "0.20" strum_macros = "0.20"
# ECS # ECS
specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control", "nightly"], rev = "5a9b71035007be0e3574f35184acac1cd4530496" } specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control", "nightly"], rev = "f985bec5d456f7b0dd8aae99848f9473c2cd9d46" }
specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", rev = "b65fb220e94f5d3c9bc30074a076149763795556" } specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", rev = "8be2abcddf8f524cb5876e8dd20a7e47cfaf7573" }
[dev-dependencies] [dev-dependencies]
#bench #bench

2
common/ecs/Cargo.toml
View File

@ -13,7 +13,7 @@ tracing = { version = "0.1", default-features = false }
common-base = { package = "veloren-common-base", path = "../base" } common-base = { package = "veloren-common-base", path = "../base" }
# ECS # ECS
specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control"], rev = "5a9b71035007be0e3574f35184acac1cd4530496" } specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control"], rev = "f985bec5d456f7b0dd8aae99848f9473c2cd9d46" }
[dev-dependencies] [dev-dependencies]
#bench #bench

6
common/net/Cargo.toml
View File

@ -23,11 +23,11 @@ vek = { version = "=0.14.1", features = ["serde"] }
tracing = { version = "0.1", default-features = false } tracing = { version = "0.1", default-features = false }
# Data structures # Data structures
hashbrown = { version = "0.9", features = ["rayon", "serde", "nightly"] } hashbrown = { version = "0.11", features = ["rayon", "serde", "nightly"] }
# ECS # ECS
specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control"], rev = "5a9b71035007be0e3574f35184acac1cd4530496" } specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control"], rev = "f985bec5d456f7b0dd8aae99848f9473c2cd9d46" }
specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", rev = "b65fb220e94f5d3c9bc30074a076149763795556" } specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", rev = "8be2abcddf8f524cb5876e8dd20a7e47cfaf7573" }
# Serde # Serde
serde = { version = "1.0.110", features = ["derive"] } serde = { version = "1.0.110", features = ["derive"] }

4
common/state/Cargo.toml
View File

@ -23,10 +23,10 @@ tracing = { version = "0.1", default-features = false }
vek = { version = "=0.14.1", features = ["serde"] } vek = { version = "=0.14.1", features = ["serde"] }
# Data structures # Data structures
hashbrown = { version = "0.9", features = ["rayon", "serde", "nightly"] } hashbrown = { version = "0.11", features = ["rayon", "serde", "nightly"] }
# ECS # ECS
specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control", "derive"], rev = "5a9b71035007be0e3574f35184acac1cd4530496" } specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control", "derive"], rev = "f985bec5d456f7b0dd8aae99848f9473c2cd9d46" }
# Plugins # Plugins
scopeguard = "1.1.0" scopeguard = "1.1.0"

4
common/systems/Cargo.toml
View File

@ -23,12 +23,12 @@ vek = { version = "=0.14.1", features = ["serde"] }
ordered-float = { version = "2.0.1", default-features = false } ordered-float = { version = "2.0.1", default-features = false }
# Data structures # Data structures
hashbrown = { version = "0.9", features = ["rayon", "serde", "nightly"] } hashbrown = { version = "0.11", features = ["rayon", "serde", "nightly"] }
indexmap = "1.3.0" indexmap = "1.3.0"
slab = "0.4.2" slab = "0.4.2"
# ECS # ECS
specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control", "derive"], rev = "5a9b71035007be0e3574f35184acac1cd4530496" } specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control", "derive"], rev = "f985bec5d456f7b0dd8aae99848f9473c2cd9d46" }
# Tweak running code # Tweak running code
# inline_tweak = { version = "1.0.8", features = ["release_tweak"] } # inline_tweak = { version = "1.0.8", features = ["release_tweak"] }

6
server/Cargo.toml
View File

@ -24,8 +24,8 @@ network = { package = "veloren-network", path = "../network", features = ["metri
# inline_tweak = "1.0.8" # inline_tweak = "1.0.8"
specs = { git = "https://github.com/amethyst/specs.git", features = ["shred-derive"], rev = "5a9b71035007be0e3574f35184acac1cd4530496" } specs = { git = "https://github.com/amethyst/specs.git", features = ["shred-derive"], rev = "f985bec5d456f7b0dd8aae99848f9473c2cd9d46" }
specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", rev = "b65fb220e94f5d3c9bc30074a076149763795556" } specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", rev = "8be2abcddf8f524cb5876e8dd20a7e47cfaf7573" }
num_cpus = "1.0" num_cpus = "1.0"
tracing = "0.1" tracing = "0.1"
@ -44,7 +44,7 @@ ron = { version = "0.6", default-features = false }
serde = { version = "1.0.110", features = ["derive"] } serde = { version = "1.0.110", features = ["derive"] }
serde_json = "1.0.50" serde_json = "1.0.50"
rand = { version = "0.8", features = ["small_rng"] } rand = { version = "0.8", features = ["small_rng"] }
hashbrown = { version = "0.9", features = ["rayon", "serde", "nightly"] } hashbrown = { version = "0.11", features = ["rayon", "serde", "nightly"] }
rayon = "1.5" rayon = "1.5"
crossbeam-channel = "0.5" crossbeam-channel = "0.5"
prometheus = { version = "0.12", default-features = false} prometheus = { version = "0.12", default-features = false}

6
voxygen/Cargo.toml
View File

@ -61,8 +61,8 @@ glyph_brush = "0.7.0"
keyboard-keynames = { git = "https://gitlab.com/Frinksy/keyboard-keynames.git", rev = "a97ae509cdb9dc70cf1bf0af762d2d1d3a0d6e0c" } keyboard-keynames = { git = "https://gitlab.com/Frinksy/keyboard-keynames.git", rev = "a97ae509cdb9dc70cf1bf0af762d2d1d3a0d6e0c" }
# ECS # ECS
specs = {git = "https://github.com/amethyst/specs.git", rev = "5a9b71035007be0e3574f35184acac1cd4530496"} specs = {git = "https://github.com/amethyst/specs.git", rev = "f985bec5d456f7b0dd8aae99848f9473c2cd9d46"}
specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", rev = "b65fb220e94f5d3c9bc30074a076149763795556" } specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", rev = "8be2abcddf8f524cb5876e8dd20a7e47cfaf7573" }
# Mathematics # Mathematics
vek = {version = "=0.14.1", features = ["serde"]} vek = {version = "=0.14.1", features = ["serde"]}
@ -87,7 +87,7 @@ dot_vox = "4.0"
enum-iterator = "0.6" enum-iterator = "0.6"
futures-executor = "0.3" futures-executor = "0.3"
guillotiere = "0.6" guillotiere = "0.6"
hashbrown = {version = "0.9", features = ["rayon", "serde", "nightly"]} hashbrown = {version = "0.11", features = ["rayon", "serde", "nightly"]}
image = {version = "0.23.12", default-features = false, features = ["ico", "png"]} image = {version = "0.23.12", default-features = false, features = ["ico", "png"]}
lazy_static = "1.4.0" lazy_static = "1.4.0"
native-dialog = { version = "0.5.2", optional = true } native-dialog = { version = "0.5.2", optional = true }

2
voxygen/i18n/Cargo.toml
View File

@ -11,7 +11,7 @@ required-features = ["bin"]
[dependencies] [dependencies]
# Assets # Assets
hashbrown = { version = "0.9", features = ["serde", "nightly"] } hashbrown = { version = "0.11", features = ["serde", "nightly"] }
common-assets = {package = "veloren-common-assets", path = "../../common/assets"} common-assets = {package = "veloren-common-assets", path = "../../common/assets"}
deunicode = "1.0" deunicode = "1.0"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }

2
world/Cargo.toml
View File

@ -25,7 +25,7 @@ vek = { version = "0.14.1", features = ["serde"] }
noise = { version = "0.7", default-features = false } noise = { version = "0.7", default-features = false }
num = "0.4" num = "0.4"
ordered-float = "2.0.1" ordered-float = "2.0.1"
hashbrown = { version = "0.9", features = ["rayon", "serde", "nightly"] } hashbrown = { version = "0.11", features = ["rayon", "serde", "nightly"] }
lazy_static = "1.4.0" lazy_static = "1.4.0"
tracing = { version = "0.1", default-features = false } tracing = { version = "0.1", default-features = false }
rand = "0.8" rand = "0.8"