From 19e2a46aafd9c03896ab3efe975f42d65245b52d Mon Sep 17 00:00:00 2001 From: Pat Hickey Date: Mon, 17 Aug 2020 15:05:16 -0700 Subject: [PATCH 1/3] bump to latest wasi submodule witx is now 0.8.6. --- Cargo.lock | 15 +++------------ crates/wasi-common/WASI | 2 +- crates/wasi-common/wig/Cargo.toml | 2 +- crates/wiggle/Cargo.toml | 2 +- crates/wiggle/generate/Cargo.toml | 2 +- crates/wiggle/macro/Cargo.toml | 2 +- crates/wiggle/wasmtime/Cargo.toml | 2 +- crates/wiggle/wasmtime/macro/Cargo.toml | 2 +- 8 files changed, 10 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index aeab366d6d..0e80ab54d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2644,7 +2644,7 @@ version = "0.19.0" dependencies = [ "anyhow", "wasmtime", - "wast 21.0.0", + "wast 22.0.0", ] [[package]] @@ -2668,15 +2668,6 @@ dependencies = [ "witx", ] -[[package]] -name = "wast" -version = "11.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df4d67ba9266f4fcaf2e8a1afadc5e2a959e51aecc07b1ecbdf85a6ddaf08bde" -dependencies = [ - "leb128", -] - [[package]] name = "wast" version = "21.0.0" @@ -2803,7 +2794,7 @@ dependencies = [ [[package]] name = "witx" -version = "0.8.5" +version = "0.8.7" dependencies = [ "anyhow", "diff", @@ -2811,7 +2802,7 @@ dependencies = [ "pretty_env_logger", "structopt", "thiserror", - "wast 11.0.0", + "wast 22.0.0", ] [[package]] diff --git a/crates/wasi-common/WASI b/crates/wasi-common/WASI index 2b027d91c2..71f0425147 160000 --- a/crates/wasi-common/WASI +++ b/crates/wasi-common/WASI @@ -1 +1 @@ -Subproject commit 2b027d91c29e6141a3768e638076daa23f51621c +Subproject commit 71f042514728e425a9b1b251c7f6daaa44301f4a diff --git a/crates/wasi-common/wig/Cargo.toml b/crates/wasi-common/wig/Cargo.toml index b7681ab0ad..11afea8b1d 100644 --- a/crates/wasi-common/wig/Cargo.toml +++ b/crates/wasi-common/wig/Cargo.toml @@ -18,7 +18,7 @@ test = false quote = "1.0.2" proc-macro2 = "1.0.6" heck = "0.3.1" -witx = { path = "../WASI/tools/witx", version = "0.8.5" } +witx = { path = "../WASI/tools/witx", version = "0.8.7" } [badges] maintenance = { status = "actively-developed" } diff --git a/crates/wiggle/Cargo.toml b/crates/wiggle/Cargo.toml index ad85032a1e..171694d437 100644 --- a/crates/wiggle/Cargo.toml +++ b/crates/wiggle/Cargo.toml @@ -12,7 +12,7 @@ include = ["src/**/*", "LICENSE"] [dependencies] thiserror = "1" -witx = { path = "../wasi-common/WASI/tools/witx", version = "0.8.5", optional = true } +witx = { path = "../wasi-common/WASI/tools/witx", version = "0.8.7", optional = true } wiggle-macro = { path = "macro", version = "0.19.0" } tracing = "0.1.15" diff --git a/crates/wiggle/generate/Cargo.toml b/crates/wiggle/generate/Cargo.toml index e763131acd..632b649153 100644 --- a/crates/wiggle/generate/Cargo.toml +++ b/crates/wiggle/generate/Cargo.toml @@ -14,7 +14,7 @@ include = ["src/**/*", "LICENSE"] [lib] [dependencies] -witx = { version = "0.8.5", path = "../../wasi-common/WASI/tools/witx" } +witx = { version = "0.8.7", path = "../../wasi-common/WASI/tools/witx" } quote = "1.0" proc-macro2 = "1.0" heck = "0.3" diff --git a/crates/wiggle/macro/Cargo.toml b/crates/wiggle/macro/Cargo.toml index af8e3e87b1..89710387a3 100644 --- a/crates/wiggle/macro/Cargo.toml +++ b/crates/wiggle/macro/Cargo.toml @@ -22,7 +22,7 @@ doctest = false [dependencies] wiggle-generate = { path = "../generate", version = "0.19.0" } -witx = { path = "../../wasi-common/WASI/tools/witx", version = "0.8.5" } +witx = { path = "../../wasi-common/WASI/tools/witx", version = "0.8.7" } quote = "1.0" syn = { version = "1.0", features = ["full"] } diff --git a/crates/wiggle/wasmtime/Cargo.toml b/crates/wiggle/wasmtime/Cargo.toml index d309be1459..ea20ae9ecb 100644 --- a/crates/wiggle/wasmtime/Cargo.toml +++ b/crates/wiggle/wasmtime/Cargo.toml @@ -13,7 +13,7 @@ include = ["src/**/*", "LICENSE"] [dependencies] wasmtime = { path = "../../wasmtime", version = "0.19.0", default-features = false } wasmtime-wiggle-macro = { path = "./macro", version = "0.19.0" } -witx = { path = "../../wasi-common/WASI/tools/witx", version = "0.8.5", optional = true } +witx = { path = "../../wasi-common/WASI/tools/witx", version = "0.8.7", optional = true } wiggle = { path = "..", version = "0.19.0" } [badges] diff --git a/crates/wiggle/wasmtime/macro/Cargo.toml b/crates/wiggle/wasmtime/macro/Cargo.toml index 6a7c4ac521..642885795f 100644 --- a/crates/wiggle/wasmtime/macro/Cargo.toml +++ b/crates/wiggle/wasmtime/macro/Cargo.toml @@ -15,7 +15,7 @@ proc-macro = true test = false [dependencies] -witx = { path = "../../../wasi-common/WASI/tools/witx", version = "0.8.5" } +witx = { path = "../../../wasi-common/WASI/tools/witx", version = "0.8.7" } wiggle-generate = { path = "../../generate", version = "0.19.0" } quote = "1.0" syn = { version = "1.0", features = ["full", "extra-traits"] } From a8ecb451f146b40e8dea2f4f775ba61c49415b38 Mon Sep 17 00:00:00 2001 From: Pat Hickey Date: Mon, 17 Aug 2020 15:17:39 -0700 Subject: [PATCH 2/3] wasmtime-wast: bump wast dependency to 22.0.0 --- crates/wast/Cargo.toml | 2 +- crates/wast/src/wast.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/wast/Cargo.toml b/crates/wast/Cargo.toml index f402f25ca5..5c405d5628 100644 --- a/crates/wast/Cargo.toml +++ b/crates/wast/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" [dependencies] anyhow = "1.0.19" wasmtime = { path = "../wasmtime", version = "0.19.0", default-features = false } -wast = "21.0.0" +wast = "22.0.0" [badges] maintenance = { status = "actively-developed" } diff --git a/crates/wast/src/wast.rs b/crates/wast/src/wast.rs index 9315c19033..f9475d0eb6 100644 --- a/crates/wast/src/wast.rs +++ b/crates/wast/src/wast.rs @@ -409,7 +409,7 @@ fn val_matches(actual: &Val, expected: &wast::AssertExpression) -> Result (Val::F32(a), wast::AssertExpression::F32(b)) => f32_matches(*a, b), (Val::F64(a), wast::AssertExpression::F64(b)) => f64_matches(*a, b), (Val::V128(a), wast::AssertExpression::V128(b)) => v128_matches(*a, b), - (Val::ExternRef(x), wast::AssertExpression::RefNull(HeapType::Extern)) => x.is_none(), + (Val::ExternRef(x), wast::AssertExpression::RefNull(Some(HeapType::Extern))) => x.is_none(), (Val::ExternRef(x), wast::AssertExpression::RefExtern(y)) => { if let Some(x) = x { let x = x @@ -421,7 +421,7 @@ fn val_matches(actual: &Val, expected: &wast::AssertExpression) -> Result false } } - (Val::FuncRef(x), wast::AssertExpression::RefNull(HeapType::Func)) => x.is_none(), + (Val::FuncRef(x), wast::AssertExpression::RefNull(_)) => x.is_none(), _ => bail!( "don't know how to compare {:?} and {:?} yet", actual, From bacf470a3e3ded16577b6e4d19309dea21a87021 Mon Sep 17 00:00:00 2001 From: Pat Hickey Date: Mon, 17 Aug 2020 16:03:35 -0700 Subject: [PATCH 3/3] bump all `wat` dependencies to 1.0.23 this gets us down to one version of `wast` in dependency tree! --- Cargo.lock | 29 ++++++++++------------------- Cargo.toml | 2 +- cranelift/wasm/Cargo.toml | 2 +- crates/c-api/Cargo.toml | 2 +- crates/fuzzing/Cargo.toml | 2 +- crates/lightbeam/Cargo.toml | 2 +- crates/test-programs/Cargo.toml | 2 +- 7 files changed, 16 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0e80ab54d2..9e19c67c2e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -392,7 +392,7 @@ dependencies = [ "smallvec", "target-lexicon", "thiserror", - "wast 22.0.0", + "wast", ] [[package]] @@ -1303,7 +1303,7 @@ dependencies = [ "peepmatic-test-operator", "peepmatic-traits", "serde", - "wast 22.0.0", + "wast", "z3", ] @@ -1331,7 +1331,7 @@ dependencies = [ "peepmatic-traits", "rand 0.7.3", "serde", - "wast 22.0.0", + "wast", ] [[package]] @@ -1356,7 +1356,7 @@ dependencies = [ "serde", "serde_test", "thiserror", - "wast 22.0.0", + "wast", ] [[package]] @@ -1377,7 +1377,7 @@ version = "0.66.0" dependencies = [ "peepmatic-traits", "serde", - "wast 22.0.0", + "wast", ] [[package]] @@ -2644,7 +2644,7 @@ version = "0.19.0" dependencies = [ "anyhow", "wasmtime", - "wast 22.0.0", + "wast", ] [[package]] @@ -2668,15 +2668,6 @@ dependencies = [ "witx", ] -[[package]] -name = "wast" -version = "21.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b1844f66a2bc8526d71690104c0e78a8e59ffa1597b7245769d174ebb91deb5" -dependencies = [ - "leb128", -] - [[package]] name = "wast" version = "22.0.0" @@ -2688,11 +2679,11 @@ dependencies = [ [[package]] name = "wat" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce85d72b74242c340e9e3492cfb602652d7bb324c3172dd441b5577e39a2e18c" +checksum = "f888158d9a4b7c39b859f72a435019835b64097c749f4f28d319004ca5a520b8" dependencies = [ - "wast 21.0.0", + "wast", ] [[package]] @@ -2802,7 +2793,7 @@ dependencies = [ "pretty_env_logger", "structopt", "thiserror", - "wast 22.0.0", + "wast", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 4e665313e0..a6001bcf35 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,7 +37,7 @@ anyhow = "1.0.19" target-lexicon = { version = "0.10.0", default-features = false } pretty_env_logger = "0.4.0" file-per-thread-logger = "0.1.1" -wat = "1.0.18" +wat = "1.0.23" libc = "0.2.60" log = "0.4.8" rayon = "1.2.1" diff --git a/cranelift/wasm/Cargo.toml b/cranelift/wasm/Cargo.toml index 1237ca4956..5c1b1b4f4e 100644 --- a/cranelift/wasm/Cargo.toml +++ b/cranelift/wasm/Cargo.toml @@ -22,7 +22,7 @@ serde = { version = "1.0.94", features = ["derive"], optional = true } thiserror = "1.0.4" [dev-dependencies] -wat = "1.0.18" +wat = "1.0.23" target-lexicon = "0.10" # Enable the riscv feature for cranelift-codegen, as some tests require it cranelift-codegen = { path = "../codegen", version = "0.66.0", default-features = false, features = ["riscv"] } diff --git a/crates/c-api/Cargo.toml b/crates/c-api/Cargo.toml index fc4704e282..1e0dd86b14 100644 --- a/crates/c-api/Cargo.toml +++ b/crates/c-api/Cargo.toml @@ -24,7 +24,7 @@ wasmtime = { path = "../wasmtime", default-features = false } wasmtime-c-api-macros = { path = "macros" } # Optional dependency for the `wat2wasm` API -wat = { version = "1.0.18", optional = true } +wat = { version = "1.0.23", optional = true } # Optional dependencies for the `wasi` feature wasi-common = { path = "../wasi-common", optional = true } diff --git a/crates/fuzzing/Cargo.toml b/crates/fuzzing/Cargo.toml index 64dbc78468..1f33041c19 100644 --- a/crates/fuzzing/Cargo.toml +++ b/crates/fuzzing/Cargo.toml @@ -19,4 +19,4 @@ wasmtime = { path = "../wasmtime" } wasmtime-wast = { path = "../wast" } [dev-dependencies] -wat = "1.0.18" +wat = "1.0.23" diff --git a/crates/lightbeam/Cargo.toml b/crates/lightbeam/Cargo.toml index 2ec0197f28..3800932f7f 100644 --- a/crates/lightbeam/Cargo.toml +++ b/crates/lightbeam/Cargo.toml @@ -28,7 +28,7 @@ wasmparser = "0.59.0" [dev-dependencies] lazy_static = "1.2" -wat = "1.0.18" +wat = "1.0.23" quickcheck = "0.9.0" anyhow = "1.0" diff --git a/crates/test-programs/Cargo.toml b/crates/test-programs/Cargo.toml index 59c0b3dc46..2a528246a8 100644 --- a/crates/test-programs/Cargo.toml +++ b/crates/test-programs/Cargo.toml @@ -18,7 +18,7 @@ pretty_env_logger = "0.4.0" tempfile = "3.1.0" os_pipe = "0.9" anyhow = "1.0.19" -wat = "1.0.18" +wat = "1.0.23" [features] test_programs = []