From 42aed65a3c62e720a43ee57c0c70e22002052636 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 12 Feb 2026 14:22:43 -0800 Subject: [PATCH] Update wasm-tools dependencies Closes #1540 --- Cargo.lock | 76 +++++++++---------- Cargo.toml | 14 ++-- .../runtime/rust/two-wit-packages/compose.wac | 7 ++ .../rust/two-wit-packages/intermediate.rs | 16 ++++ tests/runtime/rust/two-wit-packages/runner.rs | 11 +++ tests/runtime/rust/two-wit-packages/test.rs | 12 +++ tests/runtime/rust/two-wit-packages/test.wit | 33 ++++++++ 7 files changed, 124 insertions(+), 45 deletions(-) create mode 100644 tests/runtime/rust/two-wit-packages/compose.wac create mode 100644 tests/runtime/rust/two-wit-packages/intermediate.rs create mode 100644 tests/runtime/rust/two-wit-packages/runner.rs create mode 100644 tests/runtime/rust/two-wit-packages/test.rs create mode 100644 tests/runtime/rust/two-wit-packages/test.wit diff --git a/Cargo.lock b/Cargo.lock index 6ec91bbb3..d7d17cf27 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1026,7 +1026,7 @@ name = "test-helpers" version = "0.0.0" dependencies = [ "codegen-macro", - "wasm-encoder 0.245.0", + "wasm-encoder 0.245.1", "wit-bindgen-core", "wit-component", "wit-parser", @@ -1243,9 +1243,9 @@ checksum = "6545ca20bba2f220430c4a97f6b60c48ef14eaa432b04e6b31be547037b4c9ab" [[package]] name = "wasm-compose" -version = "0.245.0" +version = "0.245.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e87956946cd902ed92479d41ea3210538cb77d8bd104f0cd05b80627fcb3c6" +checksum = "5fd23d12cc95c451c1306db5bc63075fbebb612bb70c53b4237b1ce5bc178343" dependencies = [ "anyhow", "heck", @@ -1257,8 +1257,8 @@ dependencies = [ "serde_derive", "serde_yaml", "smallvec", - "wasm-encoder 0.245.0", - "wasmparser 0.245.0", + "wasm-encoder 0.245.1", + "wasmparser 0.245.1", "wat", ] @@ -1274,12 +1274,12 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.245.0" +version = "0.245.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95d568e113f706ee7a7df9b33547bb80721f55abffc79b3dc4d09c368690e662" +checksum = "3f9dca005e69bf015e45577e415b9af8c67e8ee3c0e38b5b0add5aa92581ed5c" dependencies = [ "leb128fmt", - "wasmparser 0.245.0", + "wasmparser 0.245.1", ] [[package]] @@ -1303,14 +1303,14 @@ dependencies = [ [[package]] name = "wasm-metadata" -version = "0.245.0" +version = "0.245.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce52b194ec202d029751081d735c1ae49c1bacbdc2634c821a86211e3751300c" +checksum = "da55e60097e8b37b475a0fa35c3420dd71d9eb7bd66109978ab55faf56a57efb" dependencies = [ "anyhow", "indexmap", - "wasm-encoder 0.245.0", - "wasmparser 0.245.0", + "wasm-encoder 0.245.1", + "wasmparser 0.245.1", ] [[package]] @@ -1328,9 +1328,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.245.0" +version = "0.245.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48a767a48974f0c8b66f211b96e01aa77feed58b8ccce4e7f0cff0ae55b174d4" +checksum = "4f08c9adee0428b7bddf3890fc27e015ac4b761cc608c822667102b8bfd6995e" dependencies = [ "bitflags", "hashbrown 0.16.1", @@ -1341,22 +1341,22 @@ dependencies = [ [[package]] name = "wast" -version = "245.0.0" +version = "245.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75ffc7471e16a6f3c7a3c3a230314915b5dcd158e5ef13ccda2f43358a9df00c" +checksum = "28cf1149285569120b8ce39db8b465e8a2b55c34cbb586bd977e43e2bc7300bf" dependencies = [ "bumpalo", "leb128fmt", "memchr", "unicode-width 0.2.2", - "wasm-encoder 0.245.0", + "wasm-encoder 0.245.1", ] [[package]] name = "wat" -version = "1.245.0" +version = "1.245.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6bcac6f915e2a84a4c0d9df9d41ad7518d99cda13f3bb83e3b8c22bf8726ab6" +checksum = "cd48d1679b6858988cb96b154dda0ec5bbb09275b71db46057be37332d5477be" dependencies = [ "wast", ] @@ -1478,8 +1478,8 @@ dependencies = [ "clap", "heck", "indexmap", - "wasm-encoder 0.245.0", - "wasm-metadata 0.245.0", + "wasm-encoder 0.245.1", + "wasm-metadata 0.245.1", "wit-bindgen-core", "wit-component", ] @@ -1491,7 +1491,7 @@ dependencies = [ "anyhow", "clap", "env_logger", - "wasm-encoder 0.245.0", + "wasm-encoder 0.245.1", "wit-bindgen-c", "wit-bindgen-core", "wit-bindgen-cpp", @@ -1523,8 +1523,8 @@ dependencies = [ "clap", "heck", "test-helpers", - "wasm-encoder 0.245.0", - "wasm-metadata 0.245.0", + "wasm-encoder 0.245.1", + "wasm-metadata 0.245.1", "wit-bindgen-c", "wit-bindgen-core", "wit-component", @@ -1538,7 +1538,7 @@ dependencies = [ "clap", "heck", "indexmap", - "wasm-metadata 0.245.0", + "wasm-metadata 0.245.1", "wit-bindgen-core", "wit-component", "wit-parser", @@ -1551,8 +1551,8 @@ dependencies = [ "anyhow", "clap", "heck", - "wasm-encoder 0.245.0", - "wasm-metadata 0.245.0", + "wasm-encoder 0.245.1", + "wasm-metadata 0.245.1", "wit-bindgen-core", "wit-component", ] @@ -1593,7 +1593,7 @@ dependencies = [ "serde_json", "syn", "test-helpers", - "wasm-metadata 0.245.0", + "wasm-metadata 0.245.1", "wit-bindgen", "wit-bindgen-core", "wit-component", @@ -1630,8 +1630,8 @@ dependencies = [ "wac-types", "wasi-preview1-component-adapter-provider", "wasm-compose", - "wasm-encoder 0.245.0", - "wasmparser 0.245.0", + "wasm-encoder 0.245.1", + "wasmparser 0.245.1", "wat", "wit-bindgen-csharp", "wit-component", @@ -1640,9 +1640,9 @@ dependencies = [ [[package]] name = "wit-component" -version = "0.245.0" +version = "0.245.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "896efcb3d68ea1cb555d2d1df185b4071b39d91cf850456809bb0c90a0e4e66e" +checksum = "4894f10d2d5cbc17c77e91f86a1e48e191a788da4425293b55c98b44ba3fcac9" dependencies = [ "anyhow", "bitflags", @@ -1651,18 +1651,18 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "wasm-encoder 0.245.0", - "wasm-metadata 0.245.0", - "wasmparser 0.245.0", + "wasm-encoder 0.245.1", + "wasm-metadata 0.245.1", + "wasmparser 0.245.1", "wat", "wit-parser", ] [[package]] name = "wit-parser" -version = "0.245.0" +version = "0.245.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5cda4f69fdc5a8d54f7032262217dd89410a933e3f86fdad854f5833caf3ccb" +checksum = "330698718e82983499419494dd1e3d7811a457a9bf9f69734e8c5f07a2547929" dependencies = [ "anyhow", "hashbrown 0.16.1", @@ -1674,7 +1674,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.245.0", + "wasmparser 0.245.1", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 3eada73a2..368c1a331 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,13 +46,13 @@ prettyplease = "0.2.20" syn = { version = "2.0.89", features = ["printing"] } futures = "0.3.31" -wat = "1.245.0" -wasmparser = "0.245.0" -wasm-encoder = "0.245.0" -wasm-metadata = { version = "0.245.0", default-features = false } -wit-parser = "0.245.0" -wit-component = "0.245.0" -wasm-compose = "0.245.0" +wat = "1.245.1" +wasmparser = "0.245.1" +wasm-encoder = "0.245.1" +wasm-metadata = { version = "0.245.1", default-features = false } +wit-parser = "0.245.1" +wit-component = "0.245.1" +wasm-compose = "0.245.1" wit-bindgen-core = { path = 'crates/core', version = '0.53.0' } wit-bindgen-c = { path = 'crates/c', version = '0.53.0' } diff --git a/tests/runtime/rust/two-wit-packages/compose.wac b/tests/runtime/rust/two-wit-packages/compose.wac new file mode 100644 index 000000000..8cb4d9a96 --- /dev/null +++ b/tests/runtime/rust/two-wit-packages/compose.wac @@ -0,0 +1,7 @@ +package example:composition; + +let a = new test:test { ... }; +let b = new test:intermediate { ...a, ... }; +let c = new test:runner { ...b, ... }; + +export c...; diff --git a/tests/runtime/rust/two-wit-packages/intermediate.rs b/tests/runtime/rust/two-wit-packages/intermediate.rs new file mode 100644 index 000000000..a3c06e379 --- /dev/null +++ b/tests/runtime/rust/two-wit-packages/intermediate.rs @@ -0,0 +1,16 @@ +include!(env!("BINDINGS")); + +struct Component; +export!(Component); + +impl exports::a::b::x::Guest for Component { + fn f1() { + a::b::x::f1() + } +} + +impl exports::other::c::x::Guest for Component { + fn f2() { + other::c::x::f2() + } +} diff --git a/tests/runtime/rust/two-wit-packages/runner.rs b/tests/runtime/rust/two-wit-packages/runner.rs new file mode 100644 index 000000000..b2eae991f --- /dev/null +++ b/tests/runtime/rust/two-wit-packages/runner.rs @@ -0,0 +1,11 @@ +include!(env!("BINDINGS")); + +struct Component; +export!(Component); + +impl Guest for Component { + fn run() { + a::b::x::f1(); + other::c::x::f2(); + } +} diff --git a/tests/runtime/rust/two-wit-packages/test.rs b/tests/runtime/rust/two-wit-packages/test.rs new file mode 100644 index 000000000..43126297d --- /dev/null +++ b/tests/runtime/rust/two-wit-packages/test.rs @@ -0,0 +1,12 @@ +include!(env!("BINDINGS")); + +struct Component; +export!(Component); + +impl exports::a::b::x::Guest for Component { + fn f1() {} +} + +impl exports::other::c::x::Guest for Component { + fn f2() {} +} diff --git a/tests/runtime/rust/two-wit-packages/test.wit b/tests/runtime/rust/two-wit-packages/test.wit new file mode 100644 index 000000000..c8b740923 --- /dev/null +++ b/tests/runtime/rust/two-wit-packages/test.wit @@ -0,0 +1,33 @@ +//@ wac = 'compose.wac' +//@ dependencies = ['intermediate', 'test'] + +package a:b; + +world runner { + import x; + import other:c/x; + + export run: func(); +} + +world intermediate { + import x; + import other:c/x; + export x; + export other:c/x; +} + +world test { + export x; + export other:c/x; +} + +interface x { + f1: func(); +} + +package other:c { + interface x { + f2: func(); + } +}