Skip to content

Commit

Permalink
Update wasm-tools to 215
Browse files Browse the repository at this point in the history
Pulling in some changes notably to multi-package `*.wit` files.

prtest:full
  • Loading branch information
alexcrichton committed Aug 2, 2024
1 parent ba864e9 commit 15a11ff
Show file tree
Hide file tree
Showing 4 changed files with 125 additions and 47 deletions.
66 changes: 33 additions & 33 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -259,19 +259,19 @@ io-lifetimes = { version = "2.0.3", default-features = false }
io-extras = "0.18.1"
rustix = "0.38.31"
# wit-bindgen:
wit-bindgen = { version = "0.28.0", default-features = false }
wit-bindgen-rust-macro = { version = "0.28.0", default-features = false }
wit-bindgen = { version = "0.29.0", default-features = false }
wit-bindgen-rust-macro = { version = "0.29.0", default-features = false }

# wasm-tools family:
wasmparser = { version = "0.214.0", default-features = false }
wat = "1.214.0"
wast = "214.0.0"
wasmprinter = "0.214.0"
wasm-encoder = "0.214.0"
wasm-smith = "0.214.0"
wasm-mutate = "0.214.0"
wit-parser = "0.214.0"
wit-component = "0.214.0"
wasmparser = { version = "0.215.0", default-features = false }
wat = "1.215.0"
wast = "215.0.0"
wasmprinter = "0.215.0"
wasm-encoder = "0.215.0"
wasm-smith = "0.215.0"
wasm-mutate = "0.215.0"
wit-parser = "0.215.0"
wit-component = "0.215.0"

# Non-Bytecode Alliance maintained dependencies:
# --------------------------
Expand Down
6 changes: 3 additions & 3 deletions crates/component-macro/src/bindgen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,11 @@ impl Parse for Config {
path = Some(input.parse::<syn::LitStr>()?.value());
}
}
let (resolve, pkgs, files) = parse_source(&path, &inline, &features)
let (resolve, pkg, files) = parse_source(&path, &inline, &features)
.map_err(|err| Error::new(call_site, format!("{err:?}")))?;

let world = resolve
.select_world(&pkgs, world.as_deref())
.select_world(pkg, world.as_deref())
.map_err(|e| Error::new(call_site, format!("{e:?}")))?;
Ok(Config {
opts,
Expand All @@ -190,7 +190,7 @@ fn parse_source(
path: &Option<String>,
inline: &Option<String>,
features: &[String],
) -> anyhow::Result<(Resolve, Vec<PackageId>, Vec<PathBuf>)> {
) -> anyhow::Result<(Resolve, PackageId, Vec<PathBuf>)> {
let mut resolve = Resolve::default();
resolve.features.extend(features.iter().cloned());
let mut files = Vec::new();
Expand Down
Loading

0 comments on commit 15a11ff

Please sign in to comment.