Skip to content

Commit

Permalink
Merge #1942
Browse files Browse the repository at this point in the history 
1942: Prepare for 1.0.0-beta2 release r=MarkMcCaskey a=MarkMcCaskey

Let's get some of the super useful changes we've been making into the hands of our users!

# Review

- [x] Add a short description of the the change to the CHANGELOG.md file


Co-authored-by: Mark McCaskey <[email protected]>
  • Loading branch information
@bors
bors[bot] and Mark McCaskey authored Dec 16, 2020
2 parents 22c7bc8 + 59df691 commit d24981a
Show file tree
Hide file tree
Showing 30 changed files with 143 additions and 158 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

## **[Unreleased]**

## 1.0.0-beta2 - 2020-12-16

### Added

* [#1916](https://github.com/wasmerio/wasmer/pull/1916) Add the `WASMER_VERSION*` constants with the `wasmer_version*` functions in the Wasmer C API
Expand All @@ -26,6 +28,7 @@

### Fixed

- [#1865](https://github.com/wasmerio/wasmer/pull/1865) Fix memory leaks with host function environments.
- [#1870](https://github.com/wasmerio/wasmer/pull/1870) Fixed Trap instruction address maps in Singlepass
* [#1914](https://github.com/wasmerio/wasmer/pull/1914) Implemented `TryFrom<Bytes> for Pages` instead of `From<Bytes> for Pages` to properly handle overflow errors

Expand Down
23 changes: 2 additions & 21 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 16 additions & 16 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wasmer-workspace"
version = "1.0.0-beta1"
version = "1.0.0-beta2"
description = "Wasmer workspace"
authors = ["Wasmer Engineering Team <[email protected]>"]
repository = "https://github.com/wasmerio/wasmer"
Expand All @@ -10,21 +10,21 @@ publish = false
autoexamples = false

[dependencies]
wasmer = { version = "1.0.0-beta1", path = "lib/api", default-features = false }
wasmer-compiler = { version = "1.0.0-beta1", path = "lib/compiler" }
wasmer-compiler-cranelift = { version = "1.0.0-beta1", path = "lib/compiler-cranelift", optional = true }
wasmer-compiler-singlepass = { version = "1.0.0-beta1", path = "lib/compiler-singlepass", optional = true }
wasmer-compiler-llvm = { version = "1.0.0-beta1", path = "lib/compiler-llvm", optional = true }
wasmer-emscripten = { version = "1.0.0-beta1", path = "lib/emscripten", optional = true }
wasmer-engine = { version = "1.0.0-beta1", path = "lib/engine" }
wasmer-engine-jit = { version = "1.0.0-beta1", path = "lib/engine-jit", optional = true }
wasmer-engine-native = { version = "1.0.0-beta1", path = "lib/engine-native", optional = true }
wasmer-engine-object-file = { version = "1.0.0-beta1", path = "lib/engine-object-file", optional = true }
wasmer-wasi = { version = "1.0.0-beta1", path = "lib/wasi", optional = true }
wasmer-wast = { version = "1.0.0-beta1", path = "tests/lib/wast", optional = true }
wasmer-cache = { version = "1.0.0-beta1", path = "lib/cache", optional = true }
wasmer-types = { version = "1.0.0-beta1", path = "lib/wasmer-types" }
wasmer-middlewares = { version = "1.0.0-beta1", path = "lib/middlewares", optional = true }
wasmer = { version = "1.0.0-beta2", path = "lib/api", default-features = false }
wasmer-compiler = { version = "1.0.0-beta2", path = "lib/compiler" }
wasmer-compiler-cranelift = { version = "1.0.0-beta2", path = "lib/compiler-cranelift", optional = true }
wasmer-compiler-singlepass = { version = "1.0.0-beta2", path = "lib/compiler-singlepass", optional = true }
wasmer-compiler-llvm = { version = "1.0.0-beta2", path = "lib/compiler-llvm", optional = true }
wasmer-emscripten = { version = "1.0.0-beta2", path = "lib/emscripten", optional = true }
wasmer-engine = { version = "1.0.0-beta2", path = "lib/engine" }
wasmer-engine-jit = { version = "1.0.0-beta2", path = "lib/engine-jit", optional = true }
wasmer-engine-native = { version = "1.0.0-beta2", path = "lib/engine-native", optional = true }
wasmer-engine-object-file = { version = "1.0.0-beta2", path = "lib/engine-object-file", optional = true }
wasmer-wasi = { version = "1.0.0-beta2", path = "lib/wasi", optional = true }
wasmer-wast = { version = "1.0.0-beta2", path = "tests/lib/wast", optional = true }
wasmer-cache = { version = "1.0.0-beta2", path = "lib/cache", optional = true }
wasmer-types = { version = "1.0.0-beta2", path = "lib/wasmer-types" }
wasmer-middlewares = { version = "1.0.0-beta2", path = "lib/middlewares", optional = true }
cfg-if = "1.0"

[workspace]
Expand Down
22 changes: 11 additions & 11 deletions lib/api/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wasmer"
version = "1.0.0-beta1"
version = "1.0.0-beta2"
description = "High-performant WebAssembly runtime"
categories = ["wasm"]
keywords = ["wasm", "webassembly", "runtime", "vm"]
Expand All @@ -11,16 +11,16 @@ readme = "README.md"
edition = "2018"

[dependencies]
wasmer-vm = { path = "../vm", version = "1.0.0-beta1" }
wasmer-compiler-singlepass = { path = "../compiler-singlepass", version = "1.0.0-beta1", optional = true }
wasmer-compiler-cranelift = { path = "../compiler-cranelift", version = "1.0.0-beta1", optional = true }
wasmer-compiler-llvm = { path = "../compiler-llvm", version = "1.0.0-beta1", optional = true }
wasmer-compiler = { path = "../compiler", version = "1.0.0-beta1" }
wasmer-derive = { path = "../derive", version = "1.0.0-beta1" }
wasmer-engine = { path = "../engine", version = "1.0.0-beta1" }
wasmer-engine-jit = { path = "../engine-jit", version = "1.0.0-beta1", optional = true }
wasmer-engine-native = { path = "../engine-native", version = "1.0.0-beta1", optional = true }
wasmer-types = { path = "../wasmer-types", version = "1.0.0-beta1" }
wasmer-vm = { path = "../vm", version = "1.0.0-beta2" }
wasmer-compiler-singlepass = { path = "../compiler-singlepass", version = "1.0.0-beta2", optional = true }
wasmer-compiler-cranelift = { path = "../compiler-cranelift", version = "1.0.0-beta2", optional = true }
wasmer-compiler-llvm = { path = "../compiler-llvm", version = "1.0.0-beta2", optional = true }
wasmer-compiler = { path = "../compiler", version = "1.0.0-beta2" }
wasmer-derive = { path = "../derive", version = "1.0.0-beta2" }
wasmer-engine = { path = "../engine", version = "1.0.0-beta2" }
wasmer-engine-jit = { path = "../engine-jit", version = "1.0.0-beta2", optional = true }
wasmer-engine-native = { path = "../engine-native", version = "1.0.0-beta2", optional = true }
wasmer-types = { path = "../wasmer-types", version = "1.0.0-beta2" }
indexmap = { version = "1.4", features = ["serde-1"] }
cfg-if = "0.1"
wat = { version = "1.0", optional = true }
Expand Down
28 changes: 14 additions & 14 deletions lib/c-api/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wasmer-c-api"
version = "1.0.0-beta1"
version = "1.0.0-beta2"
description = "Wasmer C API library"
categories = ["wasm", "api-bindings"]
keywords = ["wasm", "webassembly", "runtime"]
Expand All @@ -15,18 +15,18 @@ edition = "2018"
crate-type = ["cdylib", "rlib", "staticlib"]

[dependencies]
wasmer = { version = "1.0.0-beta1", path = "../api", default-features = false }
wasmer-compiler = { version = "1.0.0-beta1", path = "../compiler" }
wasmer-compiler-cranelift = { version = "1.0.0-beta1", path = "../compiler-cranelift", optional = true }
wasmer-compiler-singlepass = { version = "1.0.0-beta1", path = "../compiler-singlepass", optional = true }
wasmer-compiler-llvm = { version = "1.0.0-beta1", path = "../compiler-llvm", optional = true }
wasmer-emscripten = { version = "1.0.0-beta1", path = "../emscripten", optional = true }
wasmer-engine = { version = "1.0.0-beta1", path = "../engine" }
wasmer-engine-jit = { version = "1.0.0-beta1", path = "../engine-jit", optional = true }
wasmer-engine-native = { version = "1.0.0-beta1", path = "../engine-native", optional = true }
wasmer-engine-object-file = { version = "1.0.0-beta1", path = "../engine-object-file", optional = true }
wasmer-wasi = { version = "1.0.0-beta1", path = "../wasi", optional = true }
wasmer-types = { version = "1.0.0-beta1", path = "../wasmer-types" }
wasmer = { version = "1.0.0-beta2", path = "../api", default-features = false }
wasmer-compiler = { version = "1.0.0-beta2", path = "../compiler" }
wasmer-compiler-cranelift = { version = "1.0.0-beta2", path = "../compiler-cranelift", optional = true }
wasmer-compiler-singlepass = { version = "1.0.0-beta2", path = "../compiler-singlepass", optional = true }
wasmer-compiler-llvm = { version = "1.0.0-beta2", path = "../compiler-llvm", optional = true }
wasmer-emscripten = { version = "1.0.0-beta2", path = "../emscripten", optional = true }
wasmer-engine = { version = "1.0.0-beta2", path = "../engine" }
wasmer-engine-jit = { version = "1.0.0-beta2", path = "../engine-jit", optional = true }
wasmer-engine-native = { version = "1.0.0-beta2", path = "../engine-native", optional = true }
wasmer-engine-object-file = { version = "1.0.0-beta2", path = "../engine-object-file", optional = true }
wasmer-wasi = { version = "1.0.0-beta2", path = "../wasi", optional = true }
wasmer-types = { version = "1.0.0-beta2", path = "../wasmer-types" }
cfg-if = "1.0"
lazy_static = "1.4"
libc = { version = "^0.2", default-features = false }
Expand All @@ -37,7 +37,7 @@ typetag = { version = "0.1", optional = true }
paste = "1.0"
# 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-beta1", path = "crates/wasm-c-api" }
# wasmer-wasm-c-api = { version = "1.0.0-beta2", path = "crates/wasm-c-api" }

[dev-dependencies]
inline-c = "0.1.4"
Expand Down
4 changes: 2 additions & 2 deletions lib/cache/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wasmer-cache"
version = "1.0.0-beta1"
version = "1.0.0-beta2"
description = "Cache system for Wasmer WebAssembly runtime"
categories = ["wasm", "caching"]
keywords = ["wasm", "webassembly", "cache"]
Expand All @@ -11,7 +11,7 @@ readme = "README.md"
edition = "2018"

[dependencies]
wasmer = { path = "../api", version = "1.0.0-beta1", default-features = false }
wasmer = { path = "../api", version = "1.0.0-beta2", default-features = false }
hex = "0.4"
thiserror = "1"
blake3 = "0.3"
34 changes: 17 additions & 17 deletions lib/cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wasmer-cli"
version = "1.0.0-beta1"
version = "1.0.0-beta2"
description = "Wasmer CLI"
categories = ["wasm", "command-line-interface"]
keywords = ["wasm", "webassembly", "cli"]
Expand All @@ -17,22 +17,22 @@ path = "src/bin/wasmer.rs"
doc = false

[dependencies]
wasmer = { version = "1.0.0-beta1", path = "../api", default-features = false }
wasmer-compiler = { version = "1.0.0-beta1", path = "../compiler" }
wasmer-compiler-cranelift = { version = "1.0.0-beta1", path = "../compiler-cranelift", optional = true }
wasmer-compiler-singlepass = { version = "1.0.0-beta1", path = "../compiler-singlepass", optional = true }
wasmer-compiler-llvm = { version = "1.0.0-beta1", path = "../compiler-llvm", optional = true }
wasmer-emscripten = { version = "1.0.0-beta1", path = "../emscripten", optional = true }
wasmer-engine = { version = "1.0.0-beta1", path = "../engine" }
wasmer-engine-jit = { version = "1.0.0-beta1", path = "../engine-jit", optional = true }
wasmer-engine-native = { version = "1.0.0-beta1", path = "../engine-native", optional = true }
wasmer-engine-object-file = { version = "1.0.0-beta1", path = "../engine-object-file", optional = true }
wasmer-vm = { version = "1.0.0-beta1", path = "../vm" }
wasmer-wasi = { version = "1.0.0-beta1", path = "../wasi", optional = true }
wasmer-wasi-experimental-io-devices = { version = "1.0.0-beta1", path = "../wasi-experimental-io-devices", optional = true }
wasmer-wast = { version = "1.0.0-beta1", path = "../../tests/lib/wast", optional = true }
wasmer-cache = { version = "1.0.0-beta1", path = "../cache", optional = true }
wasmer-types = { version = "1.0.0-beta1", path = "../wasmer-types" }
wasmer = { version = "1.0.0-beta2", path = "../api", default-features = false }
wasmer-compiler = { version = "1.0.0-beta2", path = "../compiler" }
wasmer-compiler-cranelift = { version = "1.0.0-beta2", path = "../compiler-cranelift", optional = true }
wasmer-compiler-singlepass = { version = "1.0.0-beta2", path = "../compiler-singlepass", optional = true }
wasmer-compiler-llvm = { version = "1.0.0-beta2", path = "../compiler-llvm", optional = true }
wasmer-emscripten = { version = "1.0.0-beta2", path = "../emscripten", optional = true }
wasmer-engine = { version = "1.0.0-beta2", path = "../engine" }
wasmer-engine-jit = { version = "1.0.0-beta2", path = "../engine-jit", optional = true }
wasmer-engine-native = { version = "1.0.0-beta2", path = "../engine-native", optional = true }
wasmer-engine-object-file = { version = "1.0.0-beta2", path = "../engine-object-file", optional = true }
wasmer-vm = { version = "1.0.0-beta2", path = "../vm" }
wasmer-wasi = { version = "1.0.0-beta2", path = "../wasi", optional = true }
wasmer-wasi-experimental-io-devices = { version = "1.0.0-beta2", path = "../wasi-experimental-io-devices", optional = true }
wasmer-wast = { version = "1.0.0-beta2", path = "../../tests/lib/wast", optional = true }
wasmer-cache = { version = "1.0.0-beta2", path = "../cache", optional = true }
wasmer-types = { version = "1.0.0-beta2", path = "../wasmer-types" }
atty = "0.2"
colored = "2.0"
anyhow = "1.0"
Expand Down
8 changes: 4 additions & 4 deletions lib/compiler-cranelift/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wasmer-compiler-cranelift"
version = "1.0.0-beta1"
version = "1.0.0-beta2"
description = "Cranelift compiler for Wasmer WebAssembly runtime"
categories = ["wasm"]
keywords = ["wasm", "webassembly", "compiler", "cranelift"]
Expand All @@ -12,9 +12,9 @@ readme = "README.md"
edition = "2018"

[dependencies]
wasmer-compiler = { path = "../compiler", version = "1.0.0-beta1", features = ["translator"], default-features = false }
wasmer-vm = { path = "../vm", version = "1.0.0-beta1" }
wasmer-types = { path = "../wasmer-types", version = "1.0.0-beta1", default-features = false, features = ["std"] }
wasmer-compiler = { path = "../compiler", version = "1.0.0-beta2", features = ["translator"], default-features = false }
wasmer-vm = { path = "../vm", version = "1.0.0-beta2" }
wasmer-types = { path = "../wasmer-types", version = "1.0.0-beta2", default-features = false, features = ["std"] }
cranelift-codegen = { version = "0.68", default-features = false, features = ["x86", "arm64"] }
cranelift-frontend = { version = "0.68", default-features = false }
tracing = "0.1"
Expand Down
8 changes: 4 additions & 4 deletions lib/compiler-llvm/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wasmer-compiler-llvm"
version = "1.0.0-beta1"
version = "1.0.0-beta2"
description = "LLVM compiler for Wasmer WebAssembly runtime"
categories = ["wasm"]
keywords = ["wasm", "webassembly", "compiler", "llvm"]
Expand All @@ -12,9 +12,9 @@ readme = "README.md"
edition = "2018"

[dependencies]
wasmer-compiler = { path = "../compiler", version = "1.0.0-beta1", features = ["translator"] }
wasmer-vm = { path = "../vm", version = "1.0.0-beta1" }
wasmer-types = { path = "../wasmer-types", version = "1.0.0-beta1" }
wasmer-compiler = { path = "../compiler", version = "1.0.0-beta2", features = ["translator"] }
wasmer-vm = { path = "../vm", version = "1.0.0-beta2" }
wasmer-types = { path = "../wasmer-types", version = "1.0.0-beta2" }
target-lexicon = { version = "0.11", default-features = false }
smallvec = "1.5"
goblin = "0.2"
Expand Down
8 changes: 4 additions & 4 deletions lib/compiler-singlepass/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wasmer-compiler-singlepass"
version = "1.0.0-beta1"
version = "1.0.0-beta2"
description = "Singlepass compiler for Wasmer WebAssembly runtime"
categories = ["wasm"]
keywords = ["wasm", "webassembly", "compiler", "singlepass"]
Expand All @@ -12,9 +12,9 @@ readme = "README.md"
edition = "2018"

[dependencies]
wasmer-compiler = { path = "../compiler", version = "1.0.0-beta1", features = ["translator"], default-features = false }
wasmer-vm = { path = "../vm", version = "1.0.0-beta1" }
wasmer-types = { path = "../wasmer-types", version = "1.0.0-beta1", default-features = false, features = ["std"] }
wasmer-compiler = { path = "../compiler", version = "1.0.0-beta2", features = ["translator"], default-features = false }
wasmer-vm = { path = "../vm", version = "1.0.0-beta2" }
wasmer-types = { path = "../wasmer-types", version = "1.0.0-beta2", default-features = false, features = ["std"] }
rayon = "1.5"
hashbrown = { version = "0.9", optional = true }
serde = { version = "1.0", features = ["derive"] }
Expand Down
6 changes: 3 additions & 3 deletions lib/compiler/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wasmer-compiler"
version = "1.0.0-beta1"
version = "1.0.0-beta2"
description = "Base compiler abstraction for Wasmer WebAssembly runtime"
categories = ["wasm", "no-std"]
keywords = ["wasm", "webassembly", "compiler"]
Expand All @@ -11,8 +11,8 @@ readme = "README.md"
edition = "2018"

[dependencies]
wasmer-vm = { path = "../vm", version = "1.0.0-beta1" }
wasmer-types = { path = "../wasmer-types", version = "1.0.0-beta1", default-features = false }
wasmer-vm = { path = "../vm", version = "1.0.0-beta2" }
wasmer-types = { path = "../wasmer-types", version = "1.0.0-beta2", default-features = false }
wasmparser = { version = "0.65", optional = true, default-features = false }
target-lexicon = { version = "0.11", default-features = false }
enumset = "1.0"
Expand Down
20 changes: 10 additions & 10 deletions lib/deprecated/runtime-core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ edition = "2018"
maintenance = { status = "deprecated" }

[dependencies]
wasmer-types = { path = "../../wasmer-types", version = "1.0.0-beta1" }
wasmer = { path = "../../api", version = "1.0.0-beta1", features = ["deprecated"] }
wasmer-cache = { path = "../../cache", version = "1.0.0-beta1" }
wasmer-compiler = { path = "../../compiler", version = "1.0.0-beta1", features = ["translator"] }
wasmer-compiler-llvm = { path = "../../compiler-llvm", version = "1.0.0-beta1", optional = true }
wasmer-compiler-cranelift = { path = "../../compiler-cranelift", version = "1.0.0-beta1", optional = true }
wasmer-compiler-singlepass = { path = "../../compiler-singlepass", version = "1.0.0-beta1", optional = true }
wasmer-engine = { path = "../../engine", version = "1.0.0-beta1" }
wasmer-engine-jit = { path = "../../engine-jit", version = "1.0.0-beta1" }
wasmer-vm = { path = "../../vm", version = "1.0.0-beta1" }
wasmer-types = { path = "../../wasmer-types", version = "1.0.0-beta2" }
wasmer = { path = "../../api", version = "1.0.0-beta2", features = ["deprecated"] }
wasmer-cache = { path = "../../cache", version = "1.0.0-beta2" }
wasmer-compiler = { path = "../../compiler", version = "1.0.0-beta2", features = ["translator"] }
wasmer-compiler-llvm = { path = "../../compiler-llvm", version = "1.0.0-beta2", optional = true }
wasmer-compiler-cranelift = { path = "../../compiler-cranelift", version = "1.0.0-beta2", optional = true }
wasmer-compiler-singlepass = { path = "../../compiler-singlepass", version = "1.0.0-beta2", optional = true }
wasmer-engine = { path = "../../engine", version = "1.0.0-beta2" }
wasmer-engine-jit = { path = "../../engine-jit", version = "1.0.0-beta2" }
wasmer-vm = { path = "../../vm", version = "1.0.0-beta2" }
lazy_static = "1.4"

[build-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions lib/derive/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wasmer-derive"
version = "1.0.0-beta1"
version = "1.0.0-beta2"
description = "Wasmer derive macros"
authors = ["Wasmer Engineering Team <[email protected]>"]
repository = "https://github.com/wasmerio/wasmer"
Expand All @@ -17,5 +17,5 @@ proc-macro2 = "1"
proc-macro-error = "1.0.0"

[dev-dependencies]
wasmer = { path = "../api", version = "1.0.0-beta1" }
wasmer = { path = "../api", version = "1.0.0-beta2" }
compiletest_rs = "0.5"
4 changes: 2 additions & 2 deletions lib/emscripten/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wasmer-emscripten"
version = "1.0.0-beta1"
version = "1.0.0-beta2"
description = "Emscripten implementation library for Wasmer WebAssembly runtime"
categories = ["wasm", "os"]
keywords = ["wasm", "webassembly", "abi", "emscripten", "posix"]
Expand All @@ -16,7 +16,7 @@ lazy_static = "1.4"
libc = "^0.2"
log = "0.4"
time = "0.1"
wasmer = { path = "../api", version = "1.0.0-beta1", default-features = false }
wasmer = { path = "../api", version = "1.0.0-beta2", default-features = false }

[target.'cfg(windows)'.dependencies]
getrandom = "0.2"
Loading

0 comments on commit d24981a

Please sign in to comment.