Skip to content

Commit 46da8e1

Browse files
authored
Bump wasm-tools dependencies (#91)
* Bump wasm-tools * fmt * Bump rust version
1 parent ca3ec86 commit 46da8e1

File tree

4 files changed

+34
-29
lines changed

4 files changed

+34
-29
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
with:
101101
submodules: true
102102
- name: Install Rust (rustup)
103-
run: rustup update 1.81.0 --no-self-update && rustup default 1.81.0
103+
run: rustup update 1.82.0 --no-self-update && rustup default 1.82.0
104104
- run: cargo build
105105

106106
rustfmt:

Cargo.lock

Lines changed: 25 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ license = "Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT"
66
description = "Linker for `wasm32-wasip2`"
77
repository = "https://github.com/bytecodealliance/wasm-component-ld"
88
readme = "README.md"
9-
rust-version = "1.81.0"
9+
rust-version = "1.82.0"
1010

1111
[package.metadata.binstall]
1212
pkg-url = "{repo}/releases/download/v{version}/{name}-v{version}-{target-arch}-{target-family}{archive-suffix}"
@@ -29,10 +29,10 @@ clap = { version = "4.5.4", features = ['derive'] }
2929
clap_lex = "0.7.5"
3030
lexopt = "0.3.0"
3131
tempfile = "3.10.0"
32-
wasmparser = "0.244.0"
33-
wat = "1.244.0"
34-
wit-component = "0.244.0"
35-
wit-parser = "0.244.0"
32+
wasmparser = "0.245.1"
33+
wat = "1.245.1"
34+
wit-component = "0.245.1"
35+
wit-parser = "0.245.1"
3636
wasi-preview1-component-adapter-provider = "40.0.0"
3737

3838
[target.'cfg(unix)'.dependencies]

src/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,9 @@ impl App {
672672
let world = resolve.select_world(&[package], None)?;
673673

674674
if let Some((merged_resolve, merged_world)) = &mut merged {
675-
let world = merged_resolve.merge(resolve)?.map_world(world, None)?;
675+
let world = merged_resolve
676+
.merge(resolve)?
677+
.map_world(world, Default::default())?;
676678
merged_resolve.merge_worlds(world, *merged_world, &mut Default::default())?;
677679
} else {
678680
merged = Some((resolve, world));

0 commit comments

Comments
 (0)