From a72f0858d1ce02a27b82a7f695233f6fa101335a Mon Sep 17 00:00:00 2001
From: Jeffrey Charles <jeff.charles@shopify.com>
Date: Mon, 3 Jun 2024 11:44:48 -0400
Subject: [PATCH] Update wit-parser (#657)

---
 Cargo.lock                | 21 +++++++++++++++++----
 crates/cli/Cargo.toml     |  8 ++++++--
 crates/cli/src/wit.rs     |  4 +++-
 supply-chain/imports.lock | 36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7ddbd1dc..12cc4de5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1552,7 +1552,7 @@ dependencies = [
  "wasmprinter 0.206.0",
  "wasmtime",
  "wasmtime-wasi",
- "wit-parser 0.206.0",
+ "wit-parser 0.209.1",
  "wizer",
 ]
 
@@ -3602,6 +3602,19 @@ dependencies = [
  "semver 1.0.22",
 ]
 
+[[package]]
+name = "wasmparser"
+version = "0.209.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07035cc9a9b41e62d3bb3a3815a66ab87c993c06fe1cf6b2a3f2a18499d937db"
+dependencies = [
+ "ahash",
+ "bitflags 2.5.0",
+ "hashbrown 0.14.3",
+ "indexmap 2.2.6",
+ "semver 1.0.22",
+]
+
 [[package]]
 name = "wasmprinter"
 version = "0.201.0"
@@ -4280,9 +4293,9 @@ dependencies = [
 
 [[package]]
 name = "wit-parser"
-version = "0.206.0"
+version = "0.209.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d226de4e95e052cb664d2bdad2f31d9cad5117038a3439568f078d1afd8842fe"
+checksum = "3e79b9e3c0b6bb589dec46317e645851e0db2734c44e2be5e251b03ff4a51269"
 dependencies = [
  "anyhow",
  "id-arena",
@@ -4293,7 +4306,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "unicode-xid",
- "wasmparser 0.206.0",
+ "wasmparser 0.209.1",
 ]
 
 [[package]]
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index d015faa5..52492919 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -24,8 +24,12 @@ wasmtime = { workspace = true }
 wasmtime-wasi = { workspace = true }
 wasi-common = { workspace = true }
 walrus = "0.20.3"
-swc_core = { version = "0.91.3", features = ["common_sourcemap", "ecma_ast", "ecma_parser"] }
-wit-parser = "0.206.0"
+swc_core = { version = "0.91.3", features = [
+    "common_sourcemap",
+    "ecma_ast",
+    "ecma_parser",
+] }
+wit-parser = "0.209.1"
 convert_case = "0.6.0"
 wasm-opt = "0.116.1"
 tempfile = "3.10.1"
diff --git a/crates/cli/src/wit.rs b/crates/cli/src/wit.rs
index 027dc22d..30c666ec 100644
--- a/crates/cli/src/wit.rs
+++ b/crates/cli/src/wit.rs
@@ -18,7 +18,9 @@ pub fn parse_exports(wit: impl AsRef<Path>, world: &str) -> Result<Vec<String>>
     let mut exported_functions = vec![];
     for (_, export) in &world.exports {
         match export {
-            WorldItem::Interface(_) => bail!("Exported interfaces are not supported"),
+            WorldItem::Interface { .. } => {
+                bail!("Exported interfaces are not supported")
+            }
             WorldItem::Function(f) => {
                 if !f.params.is_empty() {
                     bail!("Exported functions with parameters are not supported")
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index 95ea4c45..bb48d32c 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -720,6 +720,12 @@ when = "2024-04-25"
 user-id = 73222
 user-login = "wasmtime-publish"
 
+[[publisher.wasmparser]]
+version = "0.209.1"
+when = "2024-05-29"
+user-id = 73222
+user-login = "wasmtime-publish"
+
 [[publisher.wasmprinter]]
 version = "0.201.0"
 when = "2024-02-27"
@@ -1062,6 +1068,12 @@ when = "2024-04-25"
 user-id = 73222
 user-login = "wasmtime-publish"
 
+[[publisher.wit-parser]]
+version = "0.209.1"
+when = "2024-05-29"
+user-id = 73222
+user-login = "wasmtime-publish"
+
 [[publisher.wizer]]
 version = "6.0.0"
 when = "2024-04-15"
@@ -1199,6 +1211,18 @@ I am employed by a member of the Bytecode Alliance and plan to continue doing
 so and will actively maintain this crate over time.
 """
 
+[[audits.bytecode-alliance.wildcard-audits.wasmparser]]
+who = "Alex Crichton <alex@alexcrichton.com>"
+criteria = "safe-to-deploy"
+user-id = 73222 # wasmtime-publish
+start = "2023-01-01"
+end = "2025-05-08"
+notes = """
+The Bytecode Alliance uses the `wasmtime-publish` crates.io account to automate
+publication of this crate from CI. This repository requires all PRs are reviewed
+by a Bytecode Alliance maintainer and it owned by the Bytecode Alliance itself.
+"""
+
 [[audits.bytecode-alliance.wildcard-audits.wasmtime]]
 who = "Bobby Holley <bobbyholley@gmail.com>"
 criteria = "safe-to-deploy"
@@ -1391,6 +1415,18 @@ start = "2022-11-21"
 end = "2024-06-26"
 notes = "The Bytecode Alliance is the author of this crate."
 
+[[audits.bytecode-alliance.wildcard-audits.wit-parser]]
+who = "Alex Crichton <alex@alexcrichton.com>"
+criteria = "safe-to-deploy"
+user-id = 73222 # wasmtime-publish
+start = "2023-01-01"
+end = "2025-05-08"
+notes = """
+The Bytecode Alliance uses the `wasmtime-publish` crates.io account to automate
+publication of this crate from CI. This repository requires all PRs are reviewed
+by a Bytecode Alliance maintainer and it owned by the Bytecode Alliance itself.
+"""
+
 [[audits.bytecode-alliance.audits.addr2line]]
 who = "Alex Crichton <alex@alexcrichton.com>"
 criteria = "safe-to-deploy"