From dcf5867f1e93ffcafb781d6b73fb974f851ad968 Mon Sep 17 00:00:00 2001 From: Sy Brand Date: Fri, 20 Feb 2026 22:23:07 +0000 Subject: [PATCH 1/3] Bump wasm-tools --- Cargo.lock | 47 +++++++++++++++++++++++++---------------------- Cargo.toml | 8 ++++---- src/lib.rs | 2 +- 3 files changed, 30 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3f4c9fc..db7000d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -146,9 +146,9 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "foldhash" -version = "0.1.5" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" [[package]] name = "getrandom" @@ -164,12 +164,13 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.5" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ "foldhash", "serde", + "serde_core", ] [[package]] @@ -180,19 +181,20 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "id-arena" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" +checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" [[package]] name = "indexmap" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9" +checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" dependencies = [ "equivalent", "hashbrown", "serde", + "serde_core", ] [[package]] @@ -430,9 +432,9 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.244.0" +version = "0.245.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" +checksum = "3f9dca005e69bf015e45577e415b9af8c67e8ee3c0e38b5b0add5aa92581ed5c" dependencies = [ "leb128fmt", "wasmparser", @@ -440,9 +442,9 @@ dependencies = [ [[package]] name = "wasm-metadata" -version = "0.244.0" +version = "0.245.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" +checksum = "da55e60097e8b37b475a0fa35c3420dd71d9eb7bd66109978ab55faf56a57efb" dependencies = [ "anyhow", "indexmap", @@ -452,9 +454,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.244.0" +version = "0.245.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" +checksum = "4f08c9adee0428b7bddf3890fc27e015ac4b761cc608c822667102b8bfd6995e" dependencies = [ "bitflags", "hashbrown", @@ -465,9 +467,9 @@ dependencies = [ [[package]] name = "wast" -version = "244.0.0" +version = "245.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e7b9f9e23311275920e3d6b56d64137c160cf8af4f84a7283b36cfecbf4acb" +checksum = "28cf1149285569120b8ce39db8b465e8a2b55c34cbb586bd977e43e2bc7300bf" dependencies = [ "bumpalo", "leb128fmt", @@ -478,9 +480,9 @@ dependencies = [ [[package]] name = "wat" -version = "1.244.0" +version = "1.245.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf35b87ed352f9ab6cd0732abde5a67dd6153dfd02c493e61459218b19456fa" +checksum = "cd48d1679b6858988cb96b154dda0ec5bbb09275b71db46057be37332d5477be" dependencies = [ "wast", ] @@ -514,9 +516,9 @@ checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "wit-component" -version = "0.244.0" +version = "0.245.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" +checksum = "4894f10d2d5cbc17c77e91f86a1e48e191a788da4425293b55c98b44ba3fcac9" dependencies = [ "anyhow", "bitflags", @@ -533,11 +535,12 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.244.0" +version = "0.245.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" +checksum = "330698718e82983499419494dd1e3d7811a457a9bf9f69734e8c5f07a2547929" dependencies = [ "anyhow", + "hashbrown", "id-arena", "indexmap", "log", diff --git a/Cargo.toml b/Cargo.toml index 2b9675d..92dcb67 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,10 +29,10 @@ clap = { version = "4.5.4", features = ['derive'] } clap_lex = "0.7.5" lexopt = "0.3.0" tempfile = "3.10.0" -wasmparser = "0.244.0" -wat = "1.244.0" -wit-component = "0.244.0" -wit-parser = "0.244.0" +wasmparser = "0.245.1" +wat = "1.245.1" +wit-component = "0.245.1" +wit-parser = "0.245.1" wasi-preview1-component-adapter-provider = "40.0.0" [target.'cfg(unix)'.dependencies] diff --git a/src/lib.rs b/src/lib.rs index 65abd72..bca81eb 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -672,7 +672,7 @@ impl App { let world = resolve.select_world(&[package], None)?; if let Some((merged_resolve, merged_world)) = &mut merged { - let world = merged_resolve.merge(resolve)?.map_world(world, None)?; + let world = merged_resolve.merge(resolve)?.map_world(world, Default::default())?; merged_resolve.merge_worlds(world, *merged_world, &mut Default::default())?; } else { merged = Some((resolve, world)); From 11c9240e8d1ff3d90bb219b2a36e419d014abd3d Mon Sep 17 00:00:00 2001 From: Sy Brand Date: Fri, 20 Feb 2026 22:24:56 +0000 Subject: [PATCH 2/3] fmt --- src/lib.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index bca81eb..abf8752 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -672,7 +672,9 @@ impl App { let world = resolve.select_world(&[package], None)?; if let Some((merged_resolve, merged_world)) = &mut merged { - let world = merged_resolve.merge(resolve)?.map_world(world, Default::default())?; + let world = merged_resolve + .merge(resolve)? + .map_world(world, Default::default())?; merged_resolve.merge_worlds(world, *merged_world, &mut Default::default())?; } else { merged = Some((resolve, world)); From f59d6f7a7539d58a389e964c8d760c7103a7c2a3 Mon Sep 17 00:00:00 2001 From: Sy Brand Date: Fri, 20 Feb 2026 22:26:11 +0000 Subject: [PATCH 3/3] Bump rust version --- .github/workflows/main.yml | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9343c5c..00b9adb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -100,7 +100,7 @@ jobs: with: submodules: true - name: Install Rust (rustup) - run: rustup update 1.81.0 --no-self-update && rustup default 1.81.0 + run: rustup update 1.82.0 --no-self-update && rustup default 1.82.0 - run: cargo build rustfmt: diff --git a/Cargo.toml b/Cargo.toml index 92dcb67..4ed63e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ license = "Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT" description = "Linker for `wasm32-wasip2`" repository = "https://github.com/bytecodealliance/wasm-component-ld" readme = "README.md" -rust-version = "1.81.0" +rust-version = "1.82.0" [package.metadata.binstall] pkg-url = "{repo}/releases/download/v{version}/{name}-v{version}-{target-arch}-{target-family}{archive-suffix}"