From 41ba851a95763035f0d60aff0a4604c589c8125b Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 5 Jul 2022 14:23:03 -0500
Subject: [PATCH] Bump versions of wasm-tools crates (#4380)

* Bump versions of wasm-tools crates

Note that this leaves new features in the component model, outer type
aliases for core wasm types, unimplemented for now.

* Move to crates.io-based versions of tools
---
 Cargo.lock                                    | 34 +++++++++----------
 Cargo.toml                                    |  4 +--
 cranelift/Cargo.toml                          |  2 +-
 cranelift/wasm/Cargo.toml                     |  4 +--
 crates/bench-api/Cargo.toml                   |  2 +-
 crates/c-api/Cargo.toml                       |  2 +-
 crates/cranelift/Cargo.toml                   |  2 +-
 crates/environ/Cargo.toml                     |  2 +-
 crates/environ/src/component/translate.rs     |  4 +++
 crates/environ/src/component/types.rs         |  4 +++
 crates/fuzzing/Cargo.toml                     | 12 +++----
 .../fuzzing/wasm-spec-interpreter/Cargo.toml  |  2 +-
 crates/test-programs/Cargo.toml               |  2 +-
 crates/types/Cargo.toml                       |  2 +-
 crates/wasmtime/Cargo.toml                    |  4 +--
 crates/wast/Cargo.toml                        |  2 +-
 16 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 57152c1f0e..9626e0d7b4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3219,18 +3219,18 @@ checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744"
 
 [[package]]
 name = "wasm-encoder"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f0c17267a5ffd6ae3d897589460e21db1673c84fb7016b909c9691369a75ea"
+checksum = "f76068e87fe9b837a6bc2ccded66784173eadb828c4168643e9fddf6f9ed2e61"
 dependencies = [
  "leb128",
 ]
 
 [[package]]
 name = "wasm-mutate"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "219c79f95ec42118a63e9df1f8b4858c2092875820d10b4d8e5b324759880212"
+checksum = "fde0df58bcb700325907d1b024b58de418bd9c48abf5de6f802ad63d28c7d08d"
 dependencies = [
  "egg",
  "log",
@@ -3242,9 +3242,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-smith"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c85cf25be85aac46356216b4662eb5768347046449a45c938ae1443b788665bb"
+checksum = "b73250e61e41d0e467b78559c7d761841005d724384bb0b78d52ff974acf5520"
 dependencies = [
  "arbitrary",
  "flagset",
@@ -3289,18 +3289,18 @@ dependencies = [
 
 [[package]]
 name = "wasmparser"
-version = "0.86.0"
+version = "0.87.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcbfe95447da2aa7ff171857fc8427513eb57c75a729bb190e974dc695e8f5c"
+checksum = "5c04e207cd2e8ecb6f9bd28a2cf3119b4c6bfeee6fe3a25cc1daf8041d00a875"
 dependencies = [
  "indexmap",
 ]
 
 [[package]]
 name = "wasmprinter"
-version = "0.2.36"
+version = "0.2.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa4cca415278da771add7c9ab7f3391f04b8d98719d2cf28a185d38d5206697e"
+checksum = "550bde1d5aec6aa1584c9f227ca2ab60621e002a4b15b8bee83f92c7c516db87"
 dependencies = [
  "anyhow",
  "wasmparser",
@@ -3439,7 +3439,7 @@ dependencies = [
  "wasmtime-wasi-crypto",
  "wasmtime-wasi-nn",
  "wasmtime-wast",
- "wast 42.0.0",
+ "wast 43.0.0",
  "wat",
  "windows-sys",
 ]
@@ -3663,7 +3663,7 @@ version = "0.40.0"
 dependencies = [
  "anyhow",
  "wasmtime",
- "wast 42.0.0",
+ "wast 43.0.0",
 ]
 
 [[package]]
@@ -3677,9 +3677,9 @@ dependencies = [
 
 [[package]]
 name = "wast"
-version = "42.0.0"
+version = "43.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "badcb03f976f983ff0daf294da9697be659442f61e6b0942bb37a2b6cbfe9dd4"
+checksum = "408feaebf6dbf9d154957873b14d00e8fba4cbc17a8cbb1bc9e4c1db425c50a8"
 dependencies = [
  "leb128",
  "memchr",
@@ -3689,11 +3689,11 @@ dependencies = [
 
 [[package]]
 name = "wat"
-version = "1.0.44"
+version = "1.0.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b92f20b742ac527066c8414bc0637352661b68cab07ef42586cefaba71c965cf"
+checksum = "2b70bfff0cfaf33dc9d641196dbcd0023a2da8b4b9030c59535cb44e2884983b"
 dependencies = [
- "wast 42.0.0",
+ "wast 43.0.0",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index c1fd9c4595..6b3e0a5c52 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -52,12 +52,12 @@ test-programs = { path = "crates/test-programs" }
 wasmtime-runtime = { path = "crates/runtime" }
 tokio = { version = "1.8.0", features = ["rt", "time", "macros", "rt-multi-thread"] }
 tracing-subscriber = "0.3.1"
-wast = "42.0.0"
+wast = "43.0.0"
 criterion = "0.3.4"
 num_cpus = "1.13.0"
 memchr = "2.4"
 async-trait = "0.1"
-wat = "1.0.43"
+wat = "1.0.45"
 once_cell = "1.9.0"
 rayon = "1.5.0"
 component-macro-test = { path = "crates/misc/component-macro-test" }
diff --git a/cranelift/Cargo.toml b/cranelift/Cargo.toml
index 318b4dad0d..9a99303a79 100644
--- a/cranelift/Cargo.toml
+++ b/cranelift/Cargo.toml
@@ -32,7 +32,7 @@ filecheck = "0.5.0"
 log = "0.4.8"
 termcolor = "1.1.2"
 capstone = { version = "0.9.0", optional = true }
-wat = { version = "1.0.36", optional = true }
+wat = { version = "1.0.45", optional = true }
 target-lexicon = { version = "0.12", features = ["std"] }
 pretty_env_logger = "0.4.0"
 rayon = { version = "1", optional = true }
diff --git a/cranelift/wasm/Cargo.toml b/cranelift/wasm/Cargo.toml
index 443de0a9a6..016005ccad 100644
--- a/cranelift/wasm/Cargo.toml
+++ b/cranelift/wasm/Cargo.toml
@@ -12,7 +12,7 @@ keywords = ["webassembly", "wasm"]
 edition = "2021"
 
 [dependencies]
-wasmparser = { version = "0.86.0", default-features = false }
+wasmparser = { version = "0.87.0", default-features = false }
 cranelift-codegen = { path = "../codegen", version = "0.87.0", default-features = false }
 cranelift-entity = { path = "../entity", version = "0.87.0" }
 cranelift-frontend = { path = "../frontend", version = "0.87.0", default-features = false }
@@ -24,7 +24,7 @@ serde = { version = "1.0.94", features = ["derive"], optional = true }
 smallvec = "1.6.1"
 
 [dev-dependencies]
-wat = "1.0.37"
+wat = "1.0.45"
 target-lexicon = "0.12"
 cranelift-codegen = { path = "../codegen", version = "0.87.0", default-features = false }
 
diff --git a/crates/bench-api/Cargo.toml b/crates/bench-api/Cargo.toml
index f90376dbc7..300c567768 100644
--- a/crates/bench-api/Cargo.toml
+++ b/crates/bench-api/Cargo.toml
@@ -27,7 +27,7 @@ wasi-cap-std-sync = { path = "../wasi-common/cap-std-sync" }
 cap-std = "0.25.0"
 
 [dev-dependencies]
-wat = "1.0"
+wat = "1.0.45"
 
 [features]
 default = ["shuffling-allocator"]
diff --git a/crates/c-api/Cargo.toml b/crates/c-api/Cargo.toml
index 0f23882021..67491e966c 100644
--- a/crates/c-api/Cargo.toml
+++ b/crates/c-api/Cargo.toml
@@ -24,7 +24,7 @@ wasmtime = { path = "../wasmtime", default-features = false, features = ['cranel
 wasmtime-c-api-macros = { path = "macros" }
 
 # Optional dependency for the `wat2wasm` API
-wat = { version = "1.0.42", optional = true }
+wat = { version = "1.0.45", optional = true }
 
 # Optional dependencies for the `wasi` feature
 wasi-cap-std-sync = { path = "../wasi-common/cap-std-sync", optional = true }
diff --git a/crates/cranelift/Cargo.toml b/crates/cranelift/Cargo.toml
index fe167d8a49..5c100f87ab 100644
--- a/crates/cranelift/Cargo.toml
+++ b/crates/cranelift/Cargo.toml
@@ -19,7 +19,7 @@ cranelift-codegen = { path = "../../cranelift/codegen", version = "0.87.0" }
 cranelift-frontend = { path = "../../cranelift/frontend", version = "0.87.0" }
 cranelift-entity = { path = "../../cranelift/entity", version = "0.87.0" }
 cranelift-native = { path = "../../cranelift/native", version = "0.87.0" }
-wasmparser = "0.86.0"
+wasmparser = "0.87.0"
 target-lexicon = "0.12"
 gimli = { version = "0.26.0", default-features = false, features = ['read', 'std'] }
 object = { version = "0.28.0", default-features = false, features = ['write'] }
diff --git a/crates/environ/Cargo.toml b/crates/environ/Cargo.toml
index 7572476a9d..d1b3d06780 100644
--- a/crates/environ/Cargo.toml
+++ b/crates/environ/Cargo.toml
@@ -14,7 +14,7 @@ edition = "2021"
 anyhow = "1.0"
 cranelift-entity = { path = "../../cranelift/entity", version = "0.87.0" }
 wasmtime-types = { path = "../types", version = "0.40.0" }
-wasmparser = "0.86.0"
+wasmparser = "0.87.0"
 indexmap = { version = "1.0.2", features = ["serde-1"] }
 thiserror = "1.0.4"
 serde = { version = "1.0.94", features = ["derive"] }
diff --git a/crates/environ/src/component/translate.rs b/crates/environ/src/component/translate.rs
index a9b42f0160..312eda2c60 100644
--- a/crates/environ/src/component/translate.rs
+++ b/crates/environ/src/component/translate.rs
@@ -583,6 +583,10 @@ impl<'a, 'data> Translator<'a, 'data> {
                             let instance = ModuleInstanceIndex::from_u32(instance_index);
                             self.alias_module_instance_export(kind, instance, name)
                         }
+                        wasmparser::Alias::Outer { kind, count, index } => {
+                            drop((kind, count, index));
+                            unimplemented!("outer core index");
+                        }
                     };
                     self.result.initializers.push(init);
                 }
diff --git a/crates/environ/src/component/types.rs b/crates/environ/src/component/types.rs
index 5882bfc1e7..f419375d2e 100644
--- a/crates/environ/src/component/types.rs
+++ b/crates/environ/src/component/types.rs
@@ -428,6 +428,10 @@ impl ComponentTypesBuilder {
                     );
                     assert!(prev.is_none());
                 }
+                wasmparser::ModuleTypeDeclaration::Alias(alias) => {
+                    drop(alias);
+                    unimplemented!("outer alias in module type");
+                }
             }
         }
 
diff --git a/crates/fuzzing/Cargo.toml b/crates/fuzzing/Cargo.toml
index 25032617db..e13b0f6b25 100644
--- a/crates/fuzzing/Cargo.toml
+++ b/crates/fuzzing/Cargo.toml
@@ -15,13 +15,13 @@ log = "0.4.8"
 rayon = "1.2.1"
 target-lexicon = "0.12.3"
 tempfile = "3.3.0"
-wasmparser = "0.86.0"
-wasmprinter = "0.2.36"
+wasmparser = "0.87.0"
+wasmprinter = "0.2.37"
 wasmtime = { path = "../wasmtime" }
 wasmtime-wast = { path = "../wast" }
-wasm-encoder = "0.13.0"
-wasm-smith = "0.11.1"
-wasm-mutate = "0.2.4"
+wasm-encoder = "0.14.0"
+wasm-smith = "0.11.2"
+wasm-mutate = "0.2.5"
 wasm-spec-interpreter = { path = "./wasm-spec-interpreter", optional = true }
 wasmi = "0.7.0"
 
@@ -33,7 +33,7 @@ wasmi = "0.7.0"
 v8 = "0.44.3"
 
 [dev-dependencies]
-wat = "1.0.37"
+wat = "1.0.45"
 rand = { version = "0.8.0", features = ["small_rng"] }
 
 # Only enable the `build-libinterpret` feature when fuzzing is enabled, enabling
diff --git a/crates/fuzzing/wasm-spec-interpreter/Cargo.toml b/crates/fuzzing/wasm-spec-interpreter/Cargo.toml
index ebd6ba3eaf..707451f16e 100644
--- a/crates/fuzzing/wasm-spec-interpreter/Cargo.toml
+++ b/crates/fuzzing/wasm-spec-interpreter/Cargo.toml
@@ -16,7 +16,7 @@ ocaml-interop = { version = "0.8", optional = true }
 once_cell = { version = "1.12.0", optional = true }
 
 [dev-dependencies]
-wat = "1.0"
+wat = "1.0.45"
 
 [features]
 build-libinterpret = ["ocaml-interop", "once_cell"]
diff --git a/crates/test-programs/Cargo.toml b/crates/test-programs/Cargo.toml
index a4781940c5..12b3119117 100644
--- a/crates/test-programs/Cargo.toml
+++ b/crates/test-programs/Cargo.toml
@@ -20,7 +20,7 @@ pretty_env_logger = "0.4.0"
 tempfile = "3.1.0"
 os_pipe = "0.9"
 anyhow = "1.0.19"
-wat = "1.0.42"
+wat = "1.0.45"
 cap-std = "0.25.0"
 tokio = { version = "1.8.0", features = ["rt-multi-thread"] }
 
diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
index bd63695203..a0f88e9ba2 100644
--- a/crates/types/Cargo.toml
+++ b/crates/types/Cargo.toml
@@ -12,4 +12,4 @@ edition = "2021"
 cranelift-entity = { path = "../../cranelift/entity", version = "0.87.0", features = ['enable-serde'] }
 serde = { version = "1.0.94", features = ["derive"] }
 thiserror = "1.0.4"
-wasmparser = { version = "0.86.0", default-features = false }
+wasmparser = { version = "0.87.0", default-features = false }
diff --git a/crates/wasmtime/Cargo.toml b/crates/wasmtime/Cargo.toml
index 1c50e309ac..e7c842ea0f 100644
--- a/crates/wasmtime/Cargo.toml
+++ b/crates/wasmtime/Cargo.toml
@@ -21,14 +21,14 @@ wasmtime-fiber = { path = "../fiber", version = "=0.40.0", optional = true }
 wasmtime-cranelift = { path = "../cranelift", version = "=0.40.0", optional = true }
 wasmtime-component-macro = { path = "../component-macro", version = "=0.40.0", optional = true }
 target-lexicon = { version = "0.12.0", default-features = false }
-wasmparser = "0.86.0"
+wasmparser = "0.87.0"
 anyhow = "1.0.19"
 region = "2.2.0"
 libc = "0.2"
 cfg-if = "1.0"
 backtrace = { version = "0.3.61" }
 log = "0.4.8"
-wat = { version = "1.0.43", optional = true }
+wat = { version = "1.0.45", optional = true }
 serde = { version = "1.0.94", features = ["derive"] }
 bincode = "1.2.1"
 indexmap = "1.6"
diff --git a/crates/wast/Cargo.toml b/crates/wast/Cargo.toml
index 24c4751424..81f6ac6928 100644
--- a/crates/wast/Cargo.toml
+++ b/crates/wast/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2021"
 [dependencies]
 anyhow = "1.0.19"
 wasmtime = { path = "../wasmtime", version = "0.40.0", default-features = false, features = ['cranelift'] }
-wast = "42.0.0"
+wast = "43.0.0"
 
 [badges]
 maintenance = { status = "actively-developed" }