From ef4f07dda0108d5b2211d4a51a407ec21670d5db Mon Sep 17 00:00:00 2001 From: Yan Chen Date: Wed, 26 Aug 2026 20:03:03 -0700 Subject: [PATCH] bump wasm-tools to 0.258.0 --- Cargo.lock | 68 +++++++++++++++--------------- Cargo.toml | 14 +++--- crates/wac-graph/src/encoding.rs | 4 ++ crates/wac-graph/src/graph.rs | 2 + crates/wac-graph/tests/encoding.rs | 3 +- crates/wac-types/src/package.rs | 22 +++++----- 6 files changed, 61 insertions(+), 52 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 075b9a7..84e03de 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4063,7 +4063,7 @@ dependencies = [ "wac-types", "warg-client", "warg-protocol", - "wasmprinter 0.252.0", + "wasmprinter 0.258.0", "wat", "wit-component", "wit-parser", @@ -4084,10 +4084,10 @@ dependencies = [ "serde_json", "thiserror", "wac-types", - "wasm-encoder 0.252.0", + "wasm-encoder 0.258.0", "wasm-metadata", - "wasmparser 0.252.0", - "wasmprinter 0.252.0", + "wasmparser 0.258.0", + "wasmprinter 0.258.0", "wat", "wit-component", "wit-parser", @@ -4114,10 +4114,10 @@ dependencies = [ "tokio", "wac-graph", "wac-resolver", - "wasm-encoder 0.252.0", + "wasm-encoder 0.258.0", "wasm-metadata", - "wasmparser 0.252.0", - "wasmprinter 0.252.0", + "wasmparser 0.258.0", + "wasmprinter 0.258.0", ] [[package]] @@ -4143,7 +4143,7 @@ dependencies = [ "warg-crypto", "warg-protocol", "warg-server", - "wasmprinter 0.252.0", + "wasmprinter 0.258.0", "wat", "wit-component", "wit-parser", @@ -4158,8 +4158,8 @@ dependencies = [ "indexmap 2.14.0", "semver", "serde 1.0.228", - "wasm-encoder 0.252.0", - "wasmparser 0.252.0", + "wasm-encoder 0.258.0", + "wasmparser 0.258.0", "wat", ] @@ -4462,19 +4462,19 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.252.0" +version = "0.258.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8185ae345fa5687c054626ff9a50e7089797a343d9904d1dc9820eb4c4d3196f" +checksum = "e974fe6821a8cf64575d51ea2194e2c8f77e7b66e9afe7419ce8a97f9ee0d251" dependencies = [ "leb128fmt", - "wasmparser 0.252.0", + "wasmparser 0.258.0", ] [[package]] name = "wasm-metadata" -version = "0.252.0" +version = "0.258.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b7e08e02a3cd55bf778009d4cd6faae50da011f293644daf78a531a32d6d142" +checksum = "18a11585adb92fe9b55ad1d760e8d8fb5d87e0d2e303cb8eed57f078d54293a2" dependencies = [ "anyhow", "auditable-serde", @@ -4485,8 +4485,8 @@ dependencies = [ "serde_json", "spdx", "url", - "wasm-encoder 0.252.0", - "wasmparser 0.252.0", + "wasm-encoder 0.258.0", + "wasmparser 0.258.0", ] [[package]] @@ -4515,9 +4515,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.252.0" +version = "0.258.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3eb099dcadcde5be9eef55e3a337128efd4e44b4c93122487e4d2e4e1c6627c" +checksum = "d9a61719f93a87b16d325921e251800c4833f8fab50fa21c7de73aed50086313" dependencies = [ "bitflags 2.5.0", "hashbrown 0.17.0", @@ -4538,33 +4538,33 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.252.0" +version = "0.258.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7142797de29b35ab8dbf15c00f55fda75d409da4c423a8ab8bd6b667a785824b" +checksum = "3a65e30fb2cd3cc5cb7761a6064787b2abf017e6566d8d0dedf2bb7f55ad5383" dependencies = [ "anyhow", "termcolor", - "wasmparser 0.252.0", + "wasmparser 0.258.0", ] [[package]] name = "wast" -version = "252.0.0" +version = "258.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942a3449d6a593fccc111a6241c8df52bda168af30e40bf9580d4394d7374c65" +checksum = "97f7defc7ecca8b19ac7f824598eadd0c53985ee00c74060d65051e9da5b58a1" dependencies = [ "bumpalo", "leb128fmt", "memchr", "unicode-width 0.2.0", - "wasm-encoder 0.252.0", + "wasm-encoder 0.258.0", ] [[package]] name = "wat" -version = "1.252.0" +version = "1.258.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c72a4ba7088f7bac94cf516e49882bdf97068904a563768cf249efc839ec42cb" +checksum = "7555c008cca87f2ac58d9f83ccda7e7b44611093ce28eb28f052e7c78024b9bf" dependencies = [ "wast", ] @@ -4838,9 +4838,9 @@ dependencies = [ [[package]] name = "wit-component" -version = "0.252.0" +version = "0.258.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76db0662b590f45d33d0e363fa13539a5a1eecd35d5a12fe208c335461c1053d" +checksum = "481b5c47b2ecce0389b5e08a05557d6a190c9cd761773b8880a8017ee04dc7ef" dependencies = [ "anyhow", "bitflags 2.5.0", @@ -4849,18 +4849,18 @@ dependencies = [ "serde 1.0.228", "serde_derive", "serde_json", - "wasm-encoder 0.252.0", + "wasm-encoder 0.258.0", "wasm-metadata", - "wasmparser 0.252.0", + "wasmparser 0.258.0", "wat", "wit-parser", ] [[package]] name = "wit-parser" -version = "0.252.0" +version = "0.258.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4266bea110371c620ccf3201c5023676046bc4556e5c7cfb5d500bda5ebc162d" +checksum = "ff4daaa3cd97ae49ecd0a99dc009d453f93e0f083dd3be38c0f24a83a93e37ac" dependencies = [ "anyhow", "hashbrown 0.17.0", @@ -4872,7 +4872,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-ident", - "wasmparser 0.252.0", + "wasmparser 0.258.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 11aab63..2963d90 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,13 +63,13 @@ wac-parser = { path = "crates/wac-parser", version = "0.10.1", default-features wac-resolver = { path = "crates/wac-resolver", version = "0.10.1", default-features = false } wac-graph = { path = "crates/wac-graph", version = "0.10.1" } wac-types = { path = "crates/wac-types", version = "0.10.1" } -wit-parser = "0.252.0" -wasmparser = "0.252.0" -wit-component = "0.252.0" -wasm-encoder = "0.252.0" -wasmprinter = "0.252.0" -wasm-metadata = "0.252.0" -wat = "1.252.0" +wit-parser = "0.258.0" +wasmparser = "0.258.0" +wit-component = "0.258.0" +wasm-encoder = "0.258.0" +wasmprinter = "0.258.0" +wasm-metadata = "0.258.0" +wat = "1.258.0" anyhow = "1.0.81" clap = { version = "4.5.4", features = ["derive"] } semver = { version = "1.0.22", features = ["serde"] } diff --git a/crates/wac-graph/src/encoding.rs b/crates/wac-graph/src/encoding.rs index 7d138ee..4a1c172 100644 --- a/crates/wac-graph/src/encoding.rs +++ b/crates/wac-graph/src/encoding.rs @@ -774,6 +774,8 @@ impl<'a> TypeEncoder<'a> { let extern_name = ComponentExternName { name: Cow::Borrowed(name), implements: implements.map(Cow::Borrowed), + external_id: None, + version_suffix: None, }; state .current @@ -885,6 +887,8 @@ impl<'a> TypeEncoder<'a> { let extern_name = ComponentExternName { name: Cow::Borrowed(name), implements: implements.map(Cow::Borrowed), + external_id: None, + version_suffix: None, }; let index = Self::export_type( state, diff --git a/crates/wac-graph/src/graph.rs b/crates/wac-graph/src/graph.rs index ab20c34..2b6d56d 100644 --- a/crates/wac-graph/src/graph.rs +++ b/crates/wac-graph/src/graph.rs @@ -1742,6 +1742,8 @@ impl<'a> CompositionGraphEncoder<'a> { let extern_name = ComponentExternName { name: Cow::Borrowed(name), implements: implements.map(Cow::Borrowed), + external_id: None, + version_suffix: None, }; let index = state.builder().import( extern_name, diff --git a/crates/wac-graph/tests/encoding.rs b/crates/wac-graph/tests/encoding.rs index a4d5820..0510291 100644 --- a/crates/wac-graph/tests/encoding.rs +++ b/crates/wac-graph/tests/encoding.rs @@ -151,7 +151,8 @@ impl GraphFile { ) })?; - let mut encoder = ComponentEncoder::default().validate(true).module(&module)?; + let mut encoder = ComponentEncoder::default(); + encoder.validate(true).module(&module)?; encoder .encode() .with_context(|| format!("failed to encode a component from module derived from package `{path}` for test case `{test_case}`", path = path.display())) diff --git a/crates/wac-types/src/package.rs b/crates/wac-types/src/package.rs index dadb025..f5590ea 100644 --- a/crates/wac-types/src/package.rs +++ b/crates/wac-types/src/package.rs @@ -708,8 +708,8 @@ impl<'a> TypeConverter<'a> { .add_defined_type(DefinedType::Variant(Variant { cases })), ) } - wasm::ComponentDefinedType::List(ty) => { - let ty = self.component_val_type(*ty)?; + wasm::ComponentDefinedType::List { element, .. } => { + let ty = self.component_val_type(*element)?; ValueType::Defined(self.types.add_defined_type(DefinedType::List(ty))) } wasm::ComponentDefinedType::Tuple(ty) => { @@ -731,11 +731,11 @@ impl<'a> TypeConverter<'a> { let cases = cases.iter().map(|case| case.as_str().to_owned()).collect(); ValueType::Defined(self.types.add_defined_type(DefinedType::Enum(Enum(cases)))) } - wasm::ComponentDefinedType::Option(ty) => { + wasm::ComponentDefinedType::Option { ty, .. } => { let ty = self.component_val_type(*ty)?; ValueType::Defined(self.types.add_defined_type(DefinedType::Option(ty))) } - wasm::ComponentDefinedType::Result { ok, err } => { + wasm::ComponentDefinedType::Result { ok, err, .. } => { let ok = ok.map(|ty| self.component_val_type(ty)).transpose()?; let err = err.map(|ty| self.component_val_type(ty)).transpose()?; ValueType::Defined(self.types.add_defined_type(DefinedType::Result { ok, err })) @@ -756,22 +756,24 @@ impl<'a> TypeConverter<'a> { _ => panic!("expected a resource"), }, ), - wasm::ComponentDefinedType::Stream(ty) => { + wasm::ComponentDefinedType::Stream { ty, .. } => { let stream = ty.map(|ty| self.component_val_type(ty)).transpose()?; ValueType::Defined(self.types.add_defined_type(DefinedType::Stream(stream))) } - wasm::ComponentDefinedType::Future(ty) => { + wasm::ComponentDefinedType::Future { ty, .. } => { let option = ty.map(|ty| self.component_val_type(ty)).transpose()?; ValueType::Defined(self.types.add_defined_type(DefinedType::Future(option))) } - wasm::ComponentDefinedType::FixedLengthList(ty, size) => { - let ty = self.component_val_type(*ty)?; + wasm::ComponentDefinedType::FixedLengthList { + element, length, .. + } => { + let ty = self.component_val_type(*element)?; ValueType::Defined( self.types - .add_defined_type(DefinedType::FixedSizeList(ty, *size)), + .add_defined_type(DefinedType::FixedSizeList(ty, *length)), ) } - wasmparser::component_types::ComponentDefinedType::Map(_, _) => { + wasm::ComponentDefinedType::Map { .. } => { bail!("ComponentDefinedType::Map is not yet supported"); } };