Fixes for 0.15 (#1449)

* Wasmtime 0.15.0 and Cranelift 0.62.0. (#1398) * Bump more ad-hoc versions. * Add build.rs to wasi-common's Cargo.toml. * Update the env var name in more places. * Remove a redundant echo.
bytecodealliance · Apr 3, 2020 · fde5ddf · fde5ddf
1 parent f6e3ab0
commit fde5ddf
Show file tree

Hide file tree

Showing 51 changed files with 231 additions and 222 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmtime-cli"
-version = "0.14.0"
+version = "0.15.0"
 authors = ["The Wasmtime Project Developers"]
 description = "Command-line interface for Wasmtime"
 license = "Apache-2.0 WITH LLVM-exception"
@@ -22,14 +22,14 @@ doc = false
 
 [dependencies]
 # Enable all supported architectures by default.
-wasmtime = { path = "crates/api", version = "0.14.0", default-features = false }
-wasmtime-debug = { path = "crates/debug", version = "0.14.0" }
-wasmtime-environ = { path = "crates/environ", version = "0.14.0" }
-wasmtime-jit = { path = "crates/jit", version = "0.14.0" }
-wasmtime-obj = { path = "crates/obj", version = "0.14.0" }
-wasmtime-wast = { path = "crates/wast", version = "0.14.0" }
-wasmtime-wasi = { path = "crates/wasi", version = "0.14.0" }
-wasi-common = { path = "crates/wasi-common", version = "0.14.0" }
+wasmtime = { path = "crates/api", version = "0.15.0", default-features = false }
+wasmtime-debug = { path = "crates/debug", version = "0.15.0" }
+wasmtime-environ = { path = "crates/environ", version = "0.15.0" }
+wasmtime-jit = { path = "crates/jit", version = "0.15.0" }
+wasmtime-obj = { path = "crates/obj", version = "0.15.0" }
+wasmtime-wast = { path = "crates/wast", version = "0.15.0" }
+wasmtime-wasi = { path = "crates/wasi", version = "0.15.0" }
+wasi-common = { path = "crates/wasi-common", version = "0.15.0" }
 structopt = { version = "0.3.5", features = ["color", "suggestions"] }
 faerie = "0.15.0"
 anyhow = "1.0.19"
@@ -41,7 +41,7 @@ libc = "0.2.60"
 rayon = "1.2.1"
 
 [dev-dependencies]
-wasmtime-runtime = { path = "crates/runtime", version = "0.14.0" }
+wasmtime-runtime = { path = "crates/runtime", version = "0.15.0" }
 more-asserts = "0.2.1"
 test-programs = { path = "crates/test-programs" }
 tempfile = "3.1.0"

diff --git a/cranelift/Cargo.toml b/cranelift/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "cranelift-tools"
 authors = ["The Cranelift Project Developers"]
-version = "0.61.0"
+version = "0.62.0"
 description = "Binaries for testing the Cranelift libraries"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://github.com/bytecodealliance/wasmtime/blob/master/cranelift/docs/index.md"
@@ -15,20 +15,20 @@ path = "src/clif-util.rs"
 
 [dependencies]
 cfg-if = "0.1"
-cranelift-codegen = { path = "codegen", version = "0.61.0" }
-cranelift-entity = { path = "entity", version = "0.61.0" }
-cranelift-reader = { path = "reader", version = "0.61.0" }
-cranelift-frontend = { path = "frontend", version = "0.61.0" }
-cranelift-serde = { path = "serde", version = "0.61.0", optional = true }
-cranelift-wasm = { path = "wasm", version = "0.61.0", optional = true }
-cranelift-native = { path = "native", version = "0.61.0" }
-cranelift-filetests = { path = "filetests", version = "0.61.0" }
-cranelift-module = { path = "module", version = "0.61.0" }
-cranelift-faerie = { path = "faerie", version = "0.61.0" }
-cranelift-object = { path = "object", version = "0.61.0" }
-cranelift-simplejit = { path = "simplejit", version = "0.61.0" }
-cranelift-preopt = { path = "preopt", version = "0.61.0" }
-cranelift = { path = "umbrella", version = "0.61.0" }
+cranelift-codegen = { path = "codegen", version = "0.62.0" }
+cranelift-entity = { path = "entity", version = "0.62.0" }
+cranelift-reader = { path = "reader", version = "0.62.0" }
+cranelift-frontend = { path = "frontend", version = "0.62.0" }
+cranelift-serde = { path = "serde", version = "0.62.0", optional = true }
+cranelift-wasm = { path = "wasm", version = "0.62.0", optional = true }
+cranelift-native = { path = "native", version = "0.62.0" }
+cranelift-filetests = { path = "filetests", version = "0.62.0" }
+cranelift-module = { path = "module", version = "0.62.0" }
+cranelift-faerie = { path = "faerie", version = "0.62.0" }
+cranelift-object = { path = "object", version = "0.62.0" }
+cranelift-simplejit = { path = "simplejit", version = "0.62.0" }
+cranelift-preopt = { path = "preopt", version = "0.62.0" }
+cranelift = { path = "umbrella", version = "0.62.0" }
 filecheck = "0.5.0"
 clap = "2.32.0"
 serde = "1.0.8"

diff --git a/cranelift/bforest/Cargo.toml b/cranelift/bforest/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-bforest"
-version = "0.61.0"
+version = "0.62.0"
 description = "A forest of B+-trees"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-bforest"
@@ -12,7 +12,7 @@ keywords = ["btree", "forest", "set", "map"]
 edition = "2018"
 
 [dependencies]
-cranelift-entity = { path = "../entity", version = "0.61.0", default-features = false }
+cranelift-entity = { path = "../entity", version = "0.62.0", default-features = false }
 
 [badges]
 maintenance = { status = "experimental" }
diff --git a/cranelift/codegen/Cargo.toml b/cranelift/codegen/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-codegen"
-version = "0.61.0"
+version = "0.62.0"
 description = "Low-level code generator library"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-codegen"
@@ -13,9 +13,9 @@ build = "build.rs"
 edition = "2018"
 
 [dependencies]
-cranelift-codegen-shared = { path = "./shared", version = "0.61.0" }
-cranelift-entity = { path = "../entity", version = "0.61.0" }
-cranelift-bforest = { path = "../bforest", version = "0.61.0" }
+cranelift-codegen-shared = { path = "./shared", version = "0.62.0" }
+cranelift-entity = { path = "../entity", version = "0.62.0" }
+cranelift-bforest = { path = "../bforest", version = "0.62.0" }
 hashbrown = { version = "0.7", optional = true }
 target-lexicon = "0.10"
 log = { version = "0.4.6", default-features = false }
@@ -30,7 +30,7 @@ byteorder = { version = "1.3.2", default-features = false }
 # accomodated in `tests`.
 
 [build-dependencies]
-cranelift-codegen-meta = { path = "meta", version = "0.61.0" }
+cranelift-codegen-meta = { path = "meta", version = "0.62.0" }
 
 [features]
 default = ["std", "unwind"]

diff --git a/cranelift/codegen/meta/Cargo.toml b/cranelift/codegen/meta/Cargo.toml
@@ -1,16 +1,16 @@
 [package]
 name = "cranelift-codegen-meta"
 authors = ["The Cranelift Project Developers"]
-version = "0.61.0"
+version = "0.62.0"
 description = "Metaprogram for cranelift-codegen code generator library"
 license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/bytecodealliance/wasmtime"
 readme = "README.md"
 edition = "2018"
 
 [dependencies]
-cranelift-codegen-shared = { path = "../shared", version = "0.61.0" }
-cranelift-entity = { path = "../../entity", version = "0.61.0" }
+cranelift-codegen-shared = { path = "../shared", version = "0.62.0" }
+cranelift-entity = { path = "../../entity", version = "0.62.0" }
 
 [badges]
 maintenance = { status = "experimental" }

diff --git a/cranelift/codegen/shared/Cargo.toml b/cranelift/codegen/shared/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-codegen-shared"
-version = "0.61.0"
+version = "0.62.0"
 description = "For code shared between cranelift-codegen-meta and cranelift-codegen"
 license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/bytecodealliance/wasmtime"

diff --git a/cranelift/entity/Cargo.toml b/cranelift/entity/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-entity"
-version = "0.61.0"
+version = "0.62.0"
 description = "Data structures using entity references as mapping keys"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-entity"

diff --git a/cranelift/faerie/Cargo.toml b/cranelift/faerie/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cranelift-faerie"
-version = "0.61.0"
+version = "0.62.0"
 authors = ["The Cranelift Project Developers"]
 description = "Emit Cranelift output to native object files with Faerie"
 repository = "https://github.com/bytecodealliance/wasmtime"
@@ -10,8 +10,8 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-cranelift-module = { path = "../module", version = "0.61.0" }
-cranelift-codegen = { path = "../codegen", version = "0.61.0", default-features = false, features = ["std"] }
+cranelift-module = { path = "../module", version = "0.62.0" }
+cranelift-codegen = { path = "../codegen", version = "0.62.0", default-features = false, features = ["std"] }
 faerie = "0.15.0"
 goblin = "0.1.0"
 anyhow = "1.0"

diff --git a/cranelift/filetests/Cargo.toml b/cranelift/filetests/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "cranelift-filetests"
 authors = ["The Cranelift Project Developers"]
-version = "0.61.0"
+version = "0.62.0"
 description = "Test driver and implementations of the filetest commands"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-filetests"
@@ -10,10 +10,10 @@ publish = false
 edition = "2018"
 
 [dependencies]
-cranelift-codegen = { path = "../codegen", version = "0.61.0", features = ["testing_hooks"] }
-cranelift-native = { path = "../native", version = "0.61.0" }
-cranelift-reader = { path = "../reader", version = "0.61.0" }
-cranelift-preopt = { path = "../preopt", version = "0.61.0" }
+cranelift-codegen = { path = "../codegen", version = "0.62.0", features = ["testing_hooks"] }
+cranelift-native = { path = "../native", version = "0.62.0" }
+cranelift-reader = { path = "../reader", version = "0.62.0" }
+cranelift-preopt = { path = "../preopt", version = "0.62.0" }
 file-per-thread-logger = "0.1.2"
 filecheck = "0.5.0"
 gimli = { version = "0.20.0", default-features = false, features = ["read"] }

diff --git a/cranelift/frontend/Cargo.toml b/cranelift/frontend/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-frontend"
-version = "0.61.0"
+version = "0.62.0"
 description = "Cranelift IR builder helper"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-frontend"
@@ -11,7 +11,7 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-cranelift-codegen = { path = "../codegen", version = "0.61.0", default-features = false }
+cranelift-codegen = { path = "../codegen", version = "0.62.0", default-features = false }
 target-lexicon = "0.10"
 log = { version = "0.4.6", default-features = false }
 hashbrown = { version = "0.7", optional = true }

diff --git a/cranelift/module/Cargo.toml b/cranelift/module/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cranelift-module"
-version = "0.61.0"
+version = "0.62.0"
 authors = ["The Cranelift Project Developers"]
 description = "Support for linking functions and data with Cranelift"
 repository = "https://github.com/bytecodealliance/wasmtime"
@@ -11,8 +11,8 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-cranelift-codegen = { path = "../codegen", version = "0.61.0", default-features = false }
-cranelift-entity = { path = "../entity", version = "0.61.0" }
+cranelift-codegen = { path = "../codegen", version = "0.62.0", default-features = false }
+cranelift-entity = { path = "../entity", version = "0.62.0" }
 hashbrown = { version = "0.6", optional = true }
 log = { version = "0.4.6", default-features = false }
 thiserror = "1.0.4"

diff --git a/cranelift/native/Cargo.toml b/cranelift/native/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cranelift-native"
-version = "0.61.0"
+version = "0.62.0"
 authors = ["The Cranelift Project Developers"]
 description = "Support for targeting the host with Cranelift"
 documentation = "https://docs.rs/cranelift-native"
@@ -11,7 +11,7 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-cranelift-codegen = { path = "../codegen", version = "0.61.0", default-features = false }
+cranelift-codegen = { path = "../codegen", version = "0.62.0", default-features = false }
 target-lexicon = "0.10"
 
 [target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies]

diff --git a/cranelift/object/Cargo.toml b/cranelift/object/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cranelift-object"
-version = "0.61.0"
+version = "0.62.0"
 authors = ["The Cranelift Project Developers"]
 description = "Emit Cranelift output to native object files with `object`"
 repository = "https://github.com/bytecodealliance/wasmtime"
@@ -10,8 +10,8 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-cranelift-module = { path = "../module", version = "0.61.0" }
-cranelift-codegen = { path = "../codegen", version = "0.61.0", default-features = false, features = ["std"] }
+cranelift-module = { path = "../module", version = "0.62.0" }
+cranelift-codegen = { path = "../codegen", version = "0.62.0", default-features = false, features = ["std"] }
 object = { version = "0.18", default-features = false, features = ["write"] }
 target-lexicon = "0.10"
 

diff --git a/cranelift/preopt/Cargo.toml b/cranelift/preopt/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-preopt"
-version = "0.61.0"
+version = "0.62.0"
 description = "Support for optimizations in Cranelift"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-preopt"
@@ -12,8 +12,8 @@ keywords = ["optimize", "compile", "compiler", "jit"]
 edition = "2018"
 
 [dependencies]
-cranelift-codegen = { path = "../codegen", version = "0.61.0", default-features = false }
-cranelift-entity = { path = "../entity", version = "0.61.0" }
+cranelift-codegen = { path = "../codegen", version = "0.62.0", default-features = false }
+cranelift-entity = { path = "../entity", version = "0.62.0" }
 # This is commented out because it doesn't build on Rust 1.25.0, which
 # cranelift currently supports.
 # rustc_apfloat = { version = "0.1.2", default-features = false }

diff --git a/cranelift/reader/Cargo.toml b/cranelift/reader/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-reader"
-version = "0.61.0"
+version = "0.62.0"
 description = "Cranelift textual IR reader"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-reader"
@@ -10,7 +10,7 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-cranelift-codegen = { path = "../codegen", version = "0.61.0" }
+cranelift-codegen = { path = "../codegen", version = "0.62.0" }
 target-lexicon = "0.10"
 
 [badges]

diff --git a/cranelift/serde/Cargo.toml b/cranelift/serde/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cranelift-serde"
-version = "0.61.0"
+version = "0.62.0"
 authors = ["The Cranelift Project Developers"]
 description = "Serializer/Deserializer for Cranelift IR"
 repository = "https://github.com/bytecodealliance/wasmtime"
@@ -18,8 +18,8 @@ clap = "2.32.0"
 serde = "1.0.8"
 serde_derive = "1.0.75"
 serde_json = "1.0.26"
-cranelift-codegen = { path = "../codegen", version = "0.61.0" }
-cranelift-reader = { path = "../reader", version = "0.61.0" }
+cranelift-codegen = { path = "../codegen", version = "0.62.0" }
+cranelift-reader = { path = "../reader", version = "0.62.0" }
 
 [badges]
 maintenance = { status = "experimental" }
diff --git a/cranelift/simplejit/Cargo.toml b/cranelift/simplejit/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cranelift-simplejit"
-version = "0.61.0"
+version = "0.62.0"
 authors = ["The Cranelift Project Developers"]
 description = "A simple JIT library backed by Cranelift"
 repository = "https://github.com/bytecodealliance/wasmtime"
@@ -10,9 +10,9 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-cranelift-module = { path = "../module", version = "0.61.0" }
-cranelift-native = { path = "../native", version = "0.61.0" }
-cranelift-codegen = { path = "../codegen", version = "0.61.0", default-features = false, features = ["std"] }
+cranelift-module = { path = "../module", version = "0.62.0" }
+cranelift-native = { path = "../native", version = "0.62.0" }
+cranelift-codegen = { path = "../codegen", version = "0.62.0", default-features = false, features = ["std"] }
 region = "2.0.0"
 libc = { version = "0.2.42" }
 errno = "0.2.4"
@@ -27,9 +27,9 @@ selinux-fix = ['memmap']
 default = []
 
 [dev-dependencies]
-cranelift = { path = "../umbrella", version = "0.61.0" }
-cranelift-frontend = { path = "../frontend", version = "0.61.0" }
-cranelift-entity = { path = "../entity", version = "0.61.0" }
+cranelift = { path = "../umbrella", version = "0.62.0" }
+cranelift-frontend = { path = "../frontend", version = "0.62.0" }
+cranelift-entity = { path = "../entity", version = "0.62.0" }
 
 [badges]
 maintenance = { status = "experimental" }
diff --git a/cranelift/umbrella/Cargo.toml b/cranelift/umbrella/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift"
-version = "0.61.0"
+version = "0.62.0"
 description = "Umbrella for commonly-used cranelift crates"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift"
@@ -12,8 +12,8 @@ keywords = ["compile", "compiler", "jit"]
 edition = "2018"
 
 [dependencies]
-cranelift-codegen = { path = "../codegen", version = "0.61.0", default-features = false }
-cranelift-frontend = { path = "../frontend", version = "0.61.0", default-features = false }
+cranelift-codegen = { path = "../codegen", version = "0.62.0", default-features = false }
+cranelift-frontend = { path = "../frontend", version = "0.62.0", default-features = false }
 
 [features]
 default = ["std"]