diff --git a/src/Cargo.lock b/src/Cargo.lock index ca66d164..9e8b5dbe 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -6,6 +6,17 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c251dce3391a07b43218ca070203ecb8f9f520d35ab71312296a59dbceab154" +[[package]] +name = "ahash" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f200cbb1e856866d9eade941cf3aa0c5d7dd36f74311c4273b494f4ef036957" +dependencies = [ + "getrandom 0.2.2", + "once_cell", + "version_check", +] + [[package]] name = "alloc_system" version = "0.0.0" @@ -80,6 +91,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + [[package]] name = "cloudabi" version = "0.0.3" @@ -134,9 +151,20 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc 0.2.70", - "wasi", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +dependencies = [ + "cfg-if 1.0.0", + "libc 0.2.70", + "wasi 0.10.2+wasi-snapshot-preview1", ] [[package]] @@ -147,7 +175,7 @@ dependencies = [ "freetype", "graphics_base", "graphics_server", - "hashbrown", + "hashbrown 0.11.0", "hecs", "minifb", "os", @@ -160,7 +188,7 @@ version = "0.1.0" dependencies = [ "cairo", "corepack", - "hashbrown", + "hashbrown 0.11.0", "hecs", "os", "serde", @@ -192,7 +220,7 @@ dependencies = [ "cairo", "corepack", "graphics_base", - "hashbrown", + "hashbrown 0.11.0", "hecs", "jpeg-decoder", "os", @@ -205,20 +233,29 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34f595585f103464d8d2f6e9864682d74c1601fed5e07d62b1c9058dba8246fb" +checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" dependencies = [ - "ahash", + "ahash 0.3.4", "autocfg 1.0.0", ] +[[package]] +name = "hashbrown" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "362385356d610bd1e5a408ddf8d022041774b683f345a1d2cfcb4f60f8ae2db5" +dependencies = [ + "ahash 0.7.2", +] + [[package]] name = "hecs" version = "0.2.12" source = "git+https://github.com/1tgr/hecs.git?rev=c87707007be7d13d4a727c1531cce535ee8a80cf#c87707007be7d13d4a727c1531cce535ee8a80cf" dependencies = [ - "hashbrown", + "hashbrown 0.8.2", ] [[package]] @@ -316,7 +353,7 @@ checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" dependencies = [ "bitflags", "cc", - "cfg-if", + "cfg-if 0.1.10", "libc 0.2.70", "void", ] @@ -364,9 +401,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.3.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c601810575c99596d4afc46f78a678c80105117c379eb3650cf99b8a21ce5b" +checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" [[package]] name = "orbclient" @@ -441,7 +478,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ - "getrandom", + "getrandom 0.1.14", "libc 0.2.70", "rand_chacha 0.2.2", "rand_core 0.5.1", @@ -489,7 +526,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" dependencies = [ - "getrandom", + "getrandom 0.1.14", ] [[package]] @@ -639,7 +676,7 @@ version = "0.32.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34e71125077d297d57e4c1acfe8981b5bdfbf5a20e7b589abfdcb33bf1127f86" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc 0.2.70", ] @@ -714,7 +751,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc 0.2.70", "rand 0.7.3", "redox_syscall", @@ -743,6 +780,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" +[[package]] +name = "version_check" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" + [[package]] name = "void" version = "1.0.2" @@ -755,6 +798,12 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + [[package]] name = "wayland-client" version = "0.25.0" diff --git a/src/graphics/Cargo.toml b/src/graphics/Cargo.toml index af6e0159..98706dae 100644 --- a/src/graphics/Cargo.toml +++ b/src/graphics/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" cairo = { path = "../cairo" } freetype = { path = "../freetype" } graphics_base = { path = "../graphics_base" } -hashbrown = { version = "0.8", default-features = false } +hashbrown = { version = "0.11", default-features = false } hecs = { version = "0.2", default-features = false, features = ["single_threaded"], git = "https://github.com/1tgr/hecs.git", rev = "c87707007be7d13d4a727c1531cce535ee8a80cf" } [target.'cfg(target_os="rust_os")'.dependencies] diff --git a/src/graphics_base/Cargo.toml b/src/graphics_base/Cargo.toml index 4bdd4b22..eae2f95d 100644 --- a/src/graphics_base/Cargo.toml +++ b/src/graphics_base/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] cairo = { path = "../cairo" } -hashbrown = { version = "0.8", default-features = false, features = ["ahash"] } +hashbrown = { version = "0.11", default-features = false, features = ["ahash"] } hecs = { version = "0.2", default-features = false, features = ["single_threaded"], git = "https://github.com/1tgr/hecs.git", rev = "c87707007be7d13d4a727c1531cce535ee8a80cf" } serde = { version = "1", default-features = false, features = ["alloc"] } serde_derive = "1" diff --git a/src/graphics_server/Cargo.toml b/src/graphics_server/Cargo.toml index 1e0f09c0..a3c9b1a1 100644 --- a/src/graphics_server/Cargo.toml +++ b/src/graphics_server/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] cairo = { path = "../cairo" } graphics_base = { path = "../graphics_base" } -hashbrown = { version = "0.8", default-features = false } +hashbrown = { version = "0.11", default-features = false } hecs = { version = "0.2", default-features = false, features = ["single_threaded"], git = "https://github.com/1tgr/hecs.git", rev = "c87707007be7d13d4a727c1531cce535ee8a80cf" } jpeg-decoder = { version = "0.1", default-features = false, git = "https://github.com/1tgr/jpeg-decoder.git", rev = "f63a32c5154485e1d22e01384a9f78c6b1c4225b" } serde = { version = "1", default-features = false, features = ["alloc"] }