T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch from hashmap_core to hashbrown.

Browse Source 
As suggested
[here](https://github.com/Amanieu/hashmap_core/pull/10#issuecomment-455866083).

This also allows us to re-enable the basic compile fuzz target.
This commit is contained in:
Dan Gohman
2019-01-22 04:24:19 -08:00
parent 8769febdbd
commit dae04be948
9 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/environ/Cargo.toml
View File

@@ -18,12 +18,12 @@ cranelift-wasm = "0.26.0"
cast = { version = "0.2.2", default-features = false }
failure = { version = "0.1.3", default-features = false }
failure_derive = { version = "0.1.3", default-features = false }
hashmap_core = { version = "0.1.9", optional = true }
hashbrown = { version = "0.1.8", optional = true }
[features]
default = ["std"]
std = ["cranelift-codegen/std", "cranelift-wasm/std"]
core = ["hashmap_core", "cranelift-codegen/core", "cranelift-wasm/core"]
core = ["hashbrown/nightly", "cranelift-codegen/core", "cranelift-wasm/core"]
[badges]
maintenance = { status = "experimental" }

2
lib/environ/src/lib.rs
View File

@@ -35,7 +35,7 @@ extern crate alloc as std;
extern crate std;
#[cfg(not(feature = "std"))]
use hashmap_core::HashMap;
use hashbrown::HashMap;
#[cfg(feature = "std")]
use std::collections::HashMap;

4
lib/jit/Cargo.toml
View File

@@ -22,12 +22,12 @@ region = "1.0.0"
failure = { version = "0.1.3", default-features = false }
failure_derive = { version = "0.1.3", default-features = false }
target-lexicon = { version = "0.2.0", default-features = false }
hashmap_core = { version = "0.1.9", optional = true }
hashbrown = { version = "0.1.8", optional = true }
[features]
default = ["std"]
std = ["cranelift-codegen/std", "cranelift-wasm/std"]
core = ["hashmap_core", "cranelift-codegen/core", "cranelift-wasm/core", "wasmtime-environ/core"]
core = ["hashbrown/nightly", "cranelift-codegen/core", "cranelift-wasm/core", "wasmtime-environ/core"]
[badges]
maintenance = { status = "experimental" }

2
lib/jit/src/lib.rs
View File

@@ -32,7 +32,7 @@ extern crate alloc as std;
extern crate std;
#[cfg(not(feature = "std"))]
use hashmap_core::{map as hash_map, HashMap};
use hashbrown::{map as hash_map, HashMap};
#[cfg(feature = "std")]
use std::collections::{hash_map, HashMap};

2
lib/runtime/src/lib.rs
View File

@@ -32,7 +32,7 @@ extern crate alloc as std;
extern crate std;
#[cfg(not(feature = "std"))]
use hashmap_core::{map as hash_map, HashMap};
use hashbrown::{map as hash_map, HashMap};
#[cfg(feature = "std")]
use std::collections::{hash_map, HashMap};