diff --git a/Cargo.lock b/Cargo.lock index 77bb402f27..9d23f7c158 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -853,7 +853,7 @@ dependencies = [ "serde_derive", "smallvec", "target-lexicon", - "wasmparser", + "wasmparser 0.209.1", "wasmtime-types", "wat", ] @@ -2763,7 +2763,7 @@ dependencies = [ "cargo_metadata", "heck 0.4.0", "wasmtime", - "wit-component", + "wit-component 0.209.1", ] [[package]] @@ -3093,7 +3093,7 @@ name = "verify-component-adapter" version = "22.0.0" dependencies = [ "anyhow", - "wasmparser", + "wasmparser 0.209.1", "wat", ] @@ -3186,7 +3186,7 @@ dependencies = [ "byte-array-literals", "object 0.33.0", "wasi", - "wasm-encoder", + "wasm-encoder 0.209.1", "wit-bindgen-rust-macro", ] @@ -3253,6 +3253,15 @@ dependencies = [ "leb128", ] +[[package]] +name = "wasm-encoder" +version = "0.209.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4a05336882dae732ce6bd48b7e11fe597293cb72c13da4f35d7d5f8d53b2a7" +dependencies = [ + "leb128", +] + [[package]] name = "wasm-metadata" version = "0.208.1" @@ -3265,36 +3274,52 @@ dependencies = [ "serde_derive", "serde_json", "spdx", - "wasm-encoder", - "wasmparser", + "wasm-encoder 0.208.1", + "wasmparser 0.208.1", +] + +[[package]] +name = "wasm-metadata" +version = "0.209.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d32029ce424f6d3c2b39b4419fb45a0e2d84fb0751e0c0a32b7ce8bd5d97f46" +dependencies = [ + "anyhow", + "indexmap 2.2.6", + "serde", + "serde_derive", + "serde_json", + "spdx", + "wasm-encoder 0.209.1", + "wasmparser 0.209.1", ] [[package]] name = "wasm-mutate" -version = "0.208.1" +version = "0.209.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d279475f0f5e68af5ad6eebf0377f777cadcd0c15208f64121522e44dbe45ec9" +checksum = "f58dddabebff47e1a4f22fbe7fbb769ab699cd9efe7552f50ce5d0881f006884" dependencies = [ "egg", "log", "rand", "thiserror", - "wasm-encoder", - "wasmparser", + "wasm-encoder 0.209.1", + "wasmparser 0.209.1", ] [[package]] name = "wasm-smith" -version = "0.208.1" +version = "0.209.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c94a8e7d3a1c3b34ad60d41421c857105aac67e00ae9854247a4a668694f6e9" +checksum = "38482bb6ce309f7b5b8a168209d0e5c1df8643f1026fc21aaa196058f16d42e8" dependencies = [ "anyhow", "arbitrary", "flagset", "indexmap 2.2.6", "leb128", - "wasm-encoder", + "wasm-encoder 0.209.1", ] [[package]] @@ -3342,6 +3367,19 @@ name = "wasmparser" version = "0.208.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd921789c9dcc495f589cb37d200155dee65b4a4beeb853323b5e24e0a5f9c58" +dependencies = [ + "ahash", + "bitflags 2.4.1", + "hashbrown 0.14.3", + "indexmap 2.2.6", + "semver", +] + +[[package]] +name = "wasmparser" +version = "0.209.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07035cc9a9b41e62d3bb3a3815a66ab87c993c06fe1cf6b2a3f2a18499d937db" dependencies = [ "ahash", "bitflags 2.4.1", @@ -3362,12 +3400,12 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.208.1" +version = "0.209.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700bdace4821e6c694617938500ae9999946df464bb13219c16570f8b6f202f" +checksum = "ceca8ae6eaa8c7c87b33c25c53bdf299f8c2a764aee1179402ff7652ef3a6859" dependencies = [ "anyhow", - "wasmparser", + "wasmparser 0.209.1", ] [[package]] @@ -3410,8 +3448,8 @@ dependencies = [ "target-lexicon", "tempfile", "wasi-common", - "wasm-encoder", - "wasmparser", + "wasm-encoder 0.209.1", + "wasmparser 0.209.1", "wasmtime-asm-macros", "wasmtime-cache", "wasmtime-component-macro", @@ -3553,7 +3591,7 @@ dependencies = [ "tracing", "walkdir", "wasi-common", - "wasmparser", + "wasmparser 0.209.1", "wasmtime", "wasmtime-cache", "wasmtime-cli-flags", @@ -3567,10 +3605,10 @@ dependencies = [ "wasmtime-wasi-nn", "wasmtime-wasi-threads", "wasmtime-wast", - "wast 208.0.1", + "wast 209.0.1", "wat", "windows-sys 0.52.0", - "wit-component", + "wit-component 0.209.1", ] [[package]] @@ -3603,7 +3641,7 @@ dependencies = [ "wasmtime", "wasmtime-component-util", "wasmtime-wit-bindgen", - "wit-parser", + "wit-parser 0.209.1", ] [[package]] @@ -3627,7 +3665,7 @@ dependencies = [ "object 0.33.0", "target-lexicon", "thiserror", - "wasmparser", + "wasmparser 0.209.1", "wasmtime-environ", "wasmtime-versioned-export-macros", ] @@ -3650,8 +3688,8 @@ dependencies = [ "serde", "serde_derive", "target-lexicon", - "wasm-encoder", - "wasmparser", + "wasm-encoder 0.209.1", + "wasmparser 0.209.1", "wasmprinter", "wasmtime-component-util", "wasmtime-types", @@ -3666,7 +3704,7 @@ dependencies = [ "component-fuzz-util", "env_logger", "libfuzzer-sys", - "wasmparser", + "wasmparser 0.209.1", "wasmprinter", "wasmtime-environ", "wat", @@ -3724,7 +3762,7 @@ dependencies = [ "rand", "smallvec", "target-lexicon", - "wasmparser", + "wasmparser 0.209.1", "wasmtime", "wasmtime-fuzzing", ] @@ -3745,12 +3783,12 @@ dependencies = [ "target-lexicon", "tempfile", "v8", - "wasm-encoder", + "wasm-encoder 0.209.1", "wasm-mutate", "wasm-smith", "wasm-spec-interpreter", "wasmi", - "wasmparser", + "wasmparser 0.209.1", "wasmprinter", "wasmtime", "wasmtime-wast", @@ -3799,7 +3837,7 @@ dependencies = [ "serde", "serde_derive", "smallvec", - "wasmparser", + "wasmparser 0.209.1", ] [[package]] @@ -3906,7 +3944,7 @@ dependencies = [ "anyhow", "log", "wasmtime", - "wast 208.0.1", + "wast 209.0.1", ] [[package]] @@ -3918,7 +3956,7 @@ dependencies = [ "gimli", "object 0.33.0", "target-lexicon", - "wasmparser", + "wasmparser 0.209.1", "wasmtime-cranelift", "wasmtime-environ", "winch-codegen", @@ -3931,7 +3969,7 @@ dependencies = [ "anyhow", "heck 0.4.0", "indexmap 2.2.6", - "wit-parser", + "wit-parser 0.209.1", ] [[package]] @@ -3949,24 +3987,24 @@ dependencies = [ [[package]] name = "wast" -version = "208.0.1" +version = "209.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00b3f023b4e2ccd2e054e240294263db52ae962892e6523e550783c83a67f1" +checksum = "8fffef2ff6147e4d12e972765fd75332c6a11c722571d4ab7a780d81ffc8f0a4" dependencies = [ "bumpalo", "leb128", "memchr", "unicode-width", - "wasm-encoder", + "wasm-encoder 0.209.1", ] [[package]] name = "wat" -version = "1.208.1" +version = "1.209.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ed38e59176550214c025ea2bd0eeefd8e86b92d0af6698d5ba95020ec2e07b" +checksum = "42203ec0271d113f8eb1f77ebc624886530cecb35915a7f63a497131f16e4d24" dependencies = [ - "wast 208.0.1", + "wast 209.0.1", ] [[package]] @@ -4086,7 +4124,7 @@ dependencies = [ "regalloc2", "smallvec", "target-lexicon", - "wasmparser", + "wasmparser 0.209.1", "wasmtime-cranelift", "wasmtime-environ", ] @@ -4279,7 +4317,7 @@ checksum = "7076a12e69af6e1f6093bd16657d7ae61c30cfd3c5f62321046eb863b17ab1e2" dependencies = [ "anyhow", "heck 0.5.0", - "wit-parser", + "wit-parser 0.208.1", ] [[package]] @@ -4300,9 +4338,9 @@ dependencies = [ "anyhow", "heck 0.5.0", "indexmap 2.2.6", - "wasm-metadata", + "wasm-metadata 0.208.1", "wit-bindgen-core", - "wit-component", + "wit-component 0.208.1", ] [[package]] @@ -4332,10 +4370,29 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "wasm-encoder", - "wasm-metadata", - "wasmparser", - "wit-parser", + "wasm-encoder 0.208.1", + "wasm-metadata 0.208.1", + "wasmparser 0.208.1", + "wit-parser 0.208.1", +] + +[[package]] +name = "wit-component" +version = "0.209.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a2bb5b039f9cb03425e1d5a6e54b441ca4ca1b1d4fa6a0924db67a55168f99" +dependencies = [ + "anyhow", + "bitflags 2.4.1", + "indexmap 2.2.6", + "log", + "serde", + "serde_derive", + "serde_json", + "wasm-encoder 0.209.1", + "wasm-metadata 0.209.1", + "wasmparser 0.209.1", + "wit-parser 0.209.1", ] [[package]] @@ -4353,7 +4410,25 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser", + "wasmparser 0.208.1", +] + +[[package]] +name = "wit-parser" +version = "0.209.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e79b9e3c0b6bb589dec46317e645851e0db2734c44e2be5e251b03ff4a51269" +dependencies = [ + "anyhow", + "id-arena", + "indexmap 2.2.6", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser 0.209.1", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 4457503d81..c189b40a41 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -251,15 +251,15 @@ wit-bindgen = { version = "0.25.0", default-features = false } wit-bindgen-rust-macro = { version = "0.25.0", default-features = false } # wasm-tools family: -wasmparser = { version = "0.208.1", default-features = false } -wat = "1.208.1" -wast = "208.0.1" -wasmprinter = "0.208.1" -wasm-encoder = "0.208.1" -wasm-smith = "0.208.1" -wasm-mutate = "0.208.1" -wit-parser = "0.208.1" -wit-component = "0.208.1" +wasmparser = { version = "0.209.1", default-features = false } +wat = "1.209.1" +wast = "209.0.1" +wasmprinter = "0.209.1" +wasm-encoder = "0.209.1" +wasm-smith = "0.209.1" +wasm-mutate = "0.209.1" +wit-parser = "0.209.1" +wit-component = "0.209.1" # Non-Bytecode Alliance maintained dependencies: # -------------------------- diff --git a/crates/wit-bindgen/src/lib.rs b/crates/wit-bindgen/src/lib.rs index 1a570e1079..23b9e8c4b2 100644 --- a/crates/wit-bindgen/src/lib.rs +++ b/crates/wit-bindgen/src/lib.rs @@ -315,13 +315,13 @@ impl Wasmtime { let world = &resolve.worlds[id]; for (name, import) in world.imports.iter() { - if !self.opts.only_interfaces || matches!(import, WorldItem::Interface(_)) { + if !self.opts.only_interfaces || matches!(import, WorldItem::Interface { .. }) { self.import(resolve, id, name, import); } } for (name, export) in world.exports.iter() { - if !self.opts.only_interfaces || matches!(export, WorldItem::Interface(_)) { + if !self.opts.only_interfaces || matches!(export, WorldItem::Interface { .. }) { self.export(resolve, name, export); } } @@ -349,7 +349,7 @@ impl Wasmtime { add_to_linker, }); } - WorldItem::Interface(id) => { + WorldItem::Interface { id, .. } => { gen.gen.interface_last_seen_as_import.insert(*id, true); if gen.gen.name_interface(resolve, *id, name, false) { return; @@ -412,7 +412,7 @@ impl Wasmtime { ) } WorldItem::Type(_) => unreachable!(), - WorldItem::Interface(id) => { + WorldItem::Interface { id, .. } => { gen.gen.interface_last_seen_as_import.insert(*id, false); gen.gen.name_interface(resolve, *id, name, true); gen.current_interface = Some((*id, name, true)); diff --git a/crates/wit-bindgen/src/types.rs b/crates/wit-bindgen/src/types.rs index b413604959..c45d3d80f1 100644 --- a/crates/wit-bindgen/src/types.rs +++ b/crates/wit-bindgen/src/types.rs @@ -57,7 +57,7 @@ impl Types { { match item { WorldItem::Function(f) => self.type_info_func(resolve, f, import), - WorldItem::Interface(id) => { + WorldItem::Interface { id, .. } => { let iface = &resolve.interfaces[*id]; for (_, t) in iface.types.iter() { diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock index 736a1f7d74..15c1483f48 100644 --- a/supply-chain/imports.lock +++ b/supply-chain/imports.lock @@ -1537,6 +1537,12 @@ when = "2024-05-20" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wasm-encoder]] +version = "0.209.1" +when = "2024-05-29" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wasm-metadata]] version = "0.201.0" when = "2024-02-27" @@ -1585,6 +1591,12 @@ when = "2024-05-20" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wasm-metadata]] +version = "0.209.1" +when = "2024-05-29" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wasm-mutate]] version = "0.201.0" when = "2024-02-27" @@ -1705,6 +1717,12 @@ when = "2024-05-20" 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" @@ -1753,6 +1771,12 @@ when = "2024-05-20" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wasmprinter]] +version = "0.209.1" +when = "2024-05-29" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wasmtime]] version = "18.0.2" when = "2024-02-28" @@ -2215,6 +2239,12 @@ when = "2024-05-20" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wast]] +version = "209.0.1" +when = "2024-05-29" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wat]] version = "1.201.0" when = "2024-02-27" @@ -2263,6 +2293,12 @@ when = "2024-05-20" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wat]] +version = "1.209.1" +when = "2024-05-29" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wiggle]] version = "18.0.2" when = "2024-02-28" @@ -2635,6 +2671,12 @@ when = "2024-05-20" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wit-component]] +version = "0.209.1" +when = "2024-05-29" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wit-parser]] version = "0.201.0" when = "2024-02-27" @@ -2683,6 +2725,12 @@ when = "2024-05-20" 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.witx]] version = "0.9.1" when = "2021-06-22"