Merge branch 'master' into wasi-common

2019-11-08 06:53:18 +01:00
parent 001272fa7d 43b761ef5f
commit 73f85f5c4b
39 changed files with 692 additions and 398 deletions
--- a/wasmtime-api/Cargo.toml
+++ b/wasmtime-api/Cargo.toml
@@ -30,7 +30,6 @@ hashbrown = { version = "0.6.0", optional = true }
 [features]
 default = ["std"]
 std = ["cranelift-codegen/std", "cranelift-wasm/std", "wasmtime-environ/std", "wasmparser/std"]
-wasm-c-api = []
 core = ["hashbrown/nightly", "cranelift-codegen/core", "cranelift-wasm/core", "wasmtime-environ/core", "wasmparser/core"]

 [dev-dependencies]