From 8e6c8ce50e00e13477f4af169ce99e8773c47b03 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Sat, 28 Nov 2020 11:05:55 +0100 Subject: [PATCH] Update ahash to 0.6 --- Cargo.lock | 28 +++++++++++++++++++++++++--- egui/Cargo.toml | 3 +-- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f6b1d2c8..38b5c244 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -29,9 +29,14 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "ahash" -version = "0.4.6" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6789e291be47ace86a60303502173d84af8327e3627ecf334356ee0f87a164c" +checksum = "865f8b0b3fced577b7df82e9b0eb7609595d7209c0b39e78d0646672e244b1b1" +dependencies = [ + "getrandom", + "lazy_static", + "version_check", +] [[package]] name = "andrew" @@ -667,6 +672,17 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" +[[package]] +name = "getrandom" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee8025cf36f917e6a52cce185b7c7177689b838b7ec138364e50cc2277a56cf4" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + [[package]] name = "gimli" version = "0.23.0" @@ -1608,7 +1624,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", - "wasi", + "wasi 0.10.0+wasi-snapshot-preview1", "winapi 0.3.9", ] @@ -1666,6 +1682,12 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "wasi" +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.0+wasi-snapshot-preview1" diff --git a/egui/Cargo.toml b/egui/Cargo.toml index 7be942df..3d9d5ded 100644 --- a/egui/Cargo.toml +++ b/egui/Cargo.toml @@ -20,8 +20,7 @@ include = [ [lib] [dependencies] -# Can't upgrade ahash until we can use it within wasmtime (https://github.com/tkaitchuck/aHash/issues/59) -ahash = { version = "0.4", features = ["std"], default-features = false } +ahash = { version = "0.6", features = ["std"], default-features = false } parking_lot = "0.11" rusttype = "0.9" serde = { version = "1", features = ["derive"], optional = true }