Merge #1696

1696: Prepare for 1.0.0-alpha4 release r=MarkMcCaskey a=MarkMcCaskey # Review - [x] Add a short description of the the change to the CHANGELOG.md file Co-authored-by: Mark McCaskey <[email protected]>
wasmerio · Oct 9, 2020 · 1089a4d · 1089a4d
2 parents f84fb2e + 2bb3243
commit 1089a4d
Show file tree

Hide file tree

Showing 29 changed files with 157 additions and 151 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,15 @@
 # Changelog
 
 ## **[Unreleased]**
+
+## 1.0.0-alpha4 - 2020-10-08
+- [#1691](https://github.com/wasmerio/wasmer/pull/1691) Bump minimum supported Rust version to 1.46.0
 - [#1690](https://github.com/wasmerio/wasmer/pull/1690) Fix `wasm_memorytype_limits` where `min` and `max` represents pages, not bytes. Additionally, fixes the max limit sentinel value.
+- [#1682](https://github.com/wasmerio/wasmer/pull/1682) Improve error reporting when making a memory with invalid settings.
 - [#1635](https://github.com/wasmerio/wasmer/pull/1635) Implement `wat2wasm` in the Wasm C API.
 - [#1636](https://github.com/wasmerio/wasmer/pull/1636) Implement `wasm_module_validate` in the Wasm C API.
 - [#1671](https://github.com/wasmerio/wasmer/pull/1671) Fix probestack firing inappropriately, and sometimes over/under allocating stack.
+- [#1660](https://github.com/wasmerio/wasmer/pull/1660) Fix issue preventing map-dir aliases starting with `/` from working properly.
 - [#1657](https://github.com/wasmerio/wasmer/pull/1657) Implement `wasm_trap_t` and `wasm_frame_t` for Wasm C API; add examples in Rust and C of exiting early with a host function.
 - [#1645](https://github.com/wasmerio/wasmer/pull/1645) Move the install script to https://github.com/wasmerio/wasmer-install
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-workspace"
-version = "1.0.0-alpha3"
+version = "1.0.0-alpha4"
 description = "Wasmer workspace"
 authors = ["Wasmer Engineering Team <[email protected]>"]
 repository = "https://github.com/wasmerio/wasmer"
@@ -10,19 +10,19 @@ publish = false
 autoexamples = false
 
 [dependencies]
-wasmer = { version = "1.0.0-alpha3", path = "lib/api", default-features = false }
-wasmer-compiler = { version = "1.0.0-alpha3", path = "lib/compiler" }
-wasmer-compiler-cranelift = { version = "1.0.0-alpha3", path = "lib/compiler-cranelift", optional = true }
-wasmer-compiler-singlepass = { version = "1.0.0-alpha3", path = "lib/compiler-singlepass", optional = true }
-wasmer-compiler-llvm = { version = "1.0.0-alpha3", path = "lib/compiler-llvm", optional = true }
-wasmer-engine = { version = "1.0.0-alpha3", path = "lib/engine" }
-wasmer-engine-jit = { version = "1.0.0-alpha3", path = "lib/engine-jit", optional = true }
-wasmer-engine-native = { version = "1.0.0-alpha3", path = "lib/engine-native", optional = true }
-wasmer-engine-object-file = { version = "1.0.0-alpha3", path = "lib/engine-object-file", optional = true }
-wasmer-wasi = { version = "1.0.0-alpha3", path = "lib/wasi", optional = true }
-wasmer-wast = { version = "1.0.0-alpha3", path = "tests/lib/wast", optional = true }
-wasmer-cache = { version = "1.0.0-alpha3", path = "lib/cache", optional = true }
-wasmer-types = { version = "1.0.0-alpha3", path = "lib/wasmer-types" }
+wasmer = { version = "1.0.0-alpha4", path = "lib/api", default-features = false }
+wasmer-compiler = { version = "1.0.0-alpha4", path = "lib/compiler" }
+wasmer-compiler-cranelift = { version = "1.0.0-alpha4", path = "lib/compiler-cranelift", optional = true }
+wasmer-compiler-singlepass = { version = "1.0.0-alpha4", path = "lib/compiler-singlepass", optional = true }
+wasmer-compiler-llvm = { version = "1.0.0-alpha4", path = "lib/compiler-llvm", optional = true }
+wasmer-engine = { version = "1.0.0-alpha4", path = "lib/engine" }
+wasmer-engine-jit = { version = "1.0.0-alpha4", path = "lib/engine-jit", optional = true }
+wasmer-engine-native = { version = "1.0.0-alpha4", path = "lib/engine-native", optional = true }
+wasmer-engine-object-file = { version = "1.0.0-alpha4", path = "lib/engine-object-file", optional = true }
+wasmer-wasi = { version = "1.0.0-alpha4", path = "lib/wasi", optional = true }
+wasmer-wast = { version = "1.0.0-alpha4", path = "tests/lib/wast", optional = true }
+wasmer-cache = { version = "1.0.0-alpha4", path = "lib/cache", optional = true }
+wasmer-types = { version = "1.0.0-alpha4", path = "lib/wasmer-types" }
 cfg-if = "0.1"
 
 [workspace]

diff --git a/Makefile b/Makefile
@@ -174,7 +174,8 @@ package-capi:
 	mkdir -p "package/include"
 	mkdir -p "package/lib"
 	cp lib/c-api/wasmer.h* package/include
-	cp lib/c-api/doc/index.md package/include/README.md
+	cp lib/c-api/wasmer_wasm.h* package/include
+	cp lib/c-api/doc/deprecated/index.md package/include/README.md
 ifeq ($(OS), Windows_NT)
 	cp target/release/wasmer_c_api.dll package/lib
 	cp target/release/wasmer_c_api.lib package/lib

diff --git a/lib/api/Cargo.toml b/lib/api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer"
-version = "1.0.0-alpha3"
+version = "1.0.0-alpha4"
 description = "High-performant WebAssembly runtime"
 categories = ["wasm"]
 keywords = ["wasm", "webassembly", "runtime", "vm"]
@@ -11,15 +11,15 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-wasmer-vm = { path = "../vm", version = "1.0.0-alpha3" }
-wasmer-compiler-singlepass = { path = "../compiler-singlepass", version = "1.0.0-alpha3", optional = true }
-wasmer-compiler-cranelift = { path = "../compiler-cranelift", version = "1.0.0-alpha3", optional = true }
-wasmer-compiler-llvm = { path = "../compiler-llvm", version = "1.0.0-alpha3", optional = true }
-wasmer-compiler = { path = "../compiler", version = "1.0.0-alpha3" }
-wasmer-engine = { path = "../engine", version = "1.0.0-alpha3" }
-wasmer-engine-jit = { path = "../engine-jit", version = "1.0.0-alpha3", optional = true }
-wasmer-engine-native = { path = "../engine-native", version = "1.0.0-alpha3", optional = true }
-wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha3" }
+wasmer-vm = { path = "../vm", version = "1.0.0-alpha4" }
+wasmer-compiler-singlepass = { path = "../compiler-singlepass", version = "1.0.0-alpha4", optional = true }
+wasmer-compiler-cranelift = { path = "../compiler-cranelift", version = "1.0.0-alpha4", optional = true }
+wasmer-compiler-llvm = { path = "../compiler-llvm", version = "1.0.0-alpha4", optional = true }
+wasmer-compiler = { path = "../compiler", version = "1.0.0-alpha4" }
+wasmer-engine = { path = "../engine", version = "1.0.0-alpha4" }
+wasmer-engine-jit = { path = "../engine-jit", version = "1.0.0-alpha4", optional = true }
+wasmer-engine-native = { path = "../engine-native", version = "1.0.0-alpha4", optional = true }
+wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha4" }
 indexmap = { version = "1.4", features = ["serde-1"] }
 cfg-if = "0.1"
 wat = { version = "1.0", optional = true }

diff --git a/lib/c-api/Cargo.toml b/lib/c-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-c-api"
-version = "1.0.0-alpha3"
+version = "1.0.0-alpha4"
 description = "Wasmer C API library"
 categories = ["wasm", "api-bindings"]
 keywords = ["wasm", "webassembly", "runtime"]
@@ -15,18 +15,18 @@ edition = "2018"
 crate-type = ["cdylib", "rlib", "staticlib"]
 
 [dependencies]
-wasmer = { version = "1.0.0-alpha3", path = "../api", default-features = false }
-wasmer-compiler = { version = "1.0.0-alpha3", path = "../compiler" }
-wasmer-compiler-cranelift = { version = "1.0.0-alpha3", path = "../compiler-cranelift", optional = true }
-wasmer-compiler-singlepass = { version = "1.0.0-alpha3", path = "../compiler-singlepass", optional = true }
-wasmer-compiler-llvm = { version = "1.0.0-alpha3", path = "../compiler-llvm", optional = true }
-wasmer-emscripten = { version = "1.0.0-alpha3", path = "../emscripten", optional = true }
-wasmer-engine = { version = "1.0.0-alpha3", path = "../engine" }
-wasmer-engine-jit = { version = "1.0.0-alpha3", path = "../engine-jit", optional = true }
-wasmer-engine-native = { version = "1.0.0-alpha3", path = "../engine-native", optional = true }
-wasmer-engine-object-file = { version = "1.0.0-alpha3", path = "../engine-object-file", optional = true }
-wasmer-wasi = { version = "1.0.0-alpha3", path = "../wasi", optional = true }
-wasmer-types = { version = "1.0.0-alpha3", path = "../wasmer-types" }
+wasmer = { version = "1.0.0-alpha4", path = "../api", default-features = false }
+wasmer-compiler = { version = "1.0.0-alpha4", path = "../compiler" }
+wasmer-compiler-cranelift = { version = "1.0.0-alpha4", path = "../compiler-cranelift", optional = true }
+wasmer-compiler-singlepass = { version = "1.0.0-alpha4", path = "../compiler-singlepass", optional = true }
+wasmer-compiler-llvm = { version = "1.0.0-alpha4", path = "../compiler-llvm", optional = true }
+wasmer-emscripten = { version = "1.0.0-alpha4", path = "../emscripten", optional = true }
+wasmer-engine = { version = "1.0.0-alpha4", path = "../engine" }
+wasmer-engine-jit = { version = "1.0.0-alpha4", path = "../engine-jit", optional = true }
+wasmer-engine-native = { version = "1.0.0-alpha4", path = "../engine-native", optional = true }
+wasmer-engine-object-file = { version = "1.0.0-alpha4", path = "../engine-object-file", optional = true }
+wasmer-wasi = { version = "1.0.0-alpha4", path = "../wasi", optional = true }
+wasmer-types = { version = "1.0.0-alpha4", path = "../wasmer-types" }
 cfg-if = "0.1"
 lazy_static = "1"
 libc = { version = "^0.2.69", default-features = false }
@@ -37,7 +37,7 @@ typetag = { version = "0.1", optional = true }
 paste = "0.1"
 # for generating code in the same way thot the wasm-c-api does
 # Commented out for now until we can find a solution to the exported function problem
-# wasmer-wasm-c-api = { version = "1.0.0-alpha3", path = "crates/wasm-c-api" }
+# wasmer-wasm-c-api = { version = "1.0.0-alpha4", path = "crates/wasm-c-api" }
 
 [features]
 default = [

diff --git a/lib/cache/Cargo.toml b/lib/cache/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-cache"
-version = "1.0.0-alpha3"
+version = "1.0.0-alpha4"
 description = "Cache system for Wasmer WebAssembly runtime"
 categories = ["wasm", "caching"]
 keywords = ["wasm", "webassembly", "cache"]
@@ -11,7 +11,7 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-wasmer = { path = "../api", version = "1.0.0-alpha3", default-features = false }
+wasmer = { path = "../api", version = "1.0.0-alpha4", default-features = false }
 memmap = "0.7"
 hex = "0.4"
 thiserror = "1"