diff --git a/Cargo.lock b/Cargo.lock index 4bd51df868de..ff405a4faeef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3286,9 +3286,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-encoder" -version = "0.214.0" +version = "0.215.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff694f02a8d7a50b6922b197ae03883fbf18cdb2ae9fbee7b6148456f5f44041" +checksum = "4fb56df3e06b8e6b77e37d2969a50ba51281029a9aeb3855e76b7f49b6418847" dependencies = [ "leb128", "wasmparser", @@ -3296,9 +3296,9 @@ dependencies = [ [[package]] name = "wasm-metadata" -version = "0.214.0" +version = "0.215.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865c5bff5f7a3781b5f92ea4cfa99bb38267da097441cdb09080de1568ef3075" +checksum = "0c6bb07c5576b608f7a2a9baa2294c1a3584a249965d695a9814a496cb6d232f" dependencies = [ "anyhow", "indexmap 2.2.6", @@ -3312,9 +3312,9 @@ dependencies = [ [[package]] name = "wasm-mutate" -version = "0.214.0" +version = "0.215.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf9fb8fb035aaada5f46c4eac0fb93a493143708815f28a0a008e3c92074f270" +checksum = "923d8899223f9e1365f851a960f864f4f2c9b631dbf8dceb86174e36295415d4" dependencies = [ "egg", "log", @@ -3326,9 +3326,9 @@ dependencies = [ [[package]] name = "wasm-smith" -version = "0.214.0" +version = "0.215.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5856b6e06e8d37dad11167111e49339a5b017ab1399f7cb708fcb4c4550d0" +checksum = "6fa72e06e213eca343cd3ce71eb78edd6fde947a22fc2288249ff64ef8197988" dependencies = [ "anyhow", "arbitrary", @@ -3380,9 +3380,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.214.0" +version = "0.215.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5309c1090e3e84dad0d382f42064e9933fdaedb87e468cc239f0eabea73ddcb6" +checksum = "53fbde0881f24199b81cf49b6ff8f9c145ac8eb1b7fc439adb5c099734f7d90e" dependencies = [ "ahash", "bitflags 2.4.1", @@ -3403,9 +3403,9 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.214.0" +version = "0.215.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58d4f2b3f7bd2ba10f99e03f885ff90d5db3455e163bccecebbbf60406bd8980" +checksum = "d8e9a325d85053408209b3d2ce5eaddd0dd6864d1cff7a007147ba073157defc" dependencies = [ "anyhow", "termcolor", @@ -3612,7 +3612,7 @@ dependencies = [ "wasmtime-wasi-runtime-config", "wasmtime-wasi-threads", "wasmtime-wast", - "wast 214.0.0", + "wast 215.0.0", "wat", "windows-sys 0.52.0", "wit-component", @@ -3983,7 +3983,7 @@ dependencies = [ "anyhow", "log", "wasmtime", - "wast 214.0.0", + "wast 215.0.0", ] [[package]] @@ -4026,9 +4026,9 @@ dependencies = [ [[package]] name = "wast" -version = "214.0.0" +version = "215.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "694bcdb24c49c8709bd8713768b71301a11e823923eee355d530f1d8d0a7f8e9" +checksum = "1ff1d00d893593249e60720be04a7c1f42f1c4dc3806a2869f4e66ab61eb54cb" dependencies = [ "bumpalo", "leb128", @@ -4039,11 +4039,11 @@ dependencies = [ [[package]] name = "wat" -version = "1.214.0" +version = "1.215.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "347249eb56773fa728df2656cfe3a8c19437ded61a922a0b5e0839d9790e278e" +checksum = "670bf4d9c8cf76ae242d70ded47c546525b6dafaa6871f9bcb065344bf2b4e3d" dependencies = [ - "wast 214.0.0", + "wast 215.0.0", ] [[package]] @@ -4350,9 +4350,9 @@ dependencies = [ [[package]] name = "wit-bindgen" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89178260ed223de8a5a81f9cff961481dfbbd55b25c17e4dd0b4c8e4b8ae646d" +checksum = "6878f363ff82b1fce56d448380b56458a85d282aa08c2be80afe4f4cd9051070" dependencies = [ "wit-bindgen-rt", "wit-bindgen-rust-macro", @@ -4360,9 +4360,9 @@ dependencies = [ [[package]] name = "wit-bindgen-core" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e3fd9b11c16b9888c1bd159130b1b3487da913c45dbd34d408bfdf81f8a865a" +checksum = "66f98ab0edef3218244a87b125f4f7047f0af104f2e4718255226c0367688d1c" dependencies = [ "anyhow", "heck 0.5.0", @@ -4371,18 +4371,18 @@ dependencies = [ [[package]] name = "wit-bindgen-rt" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a37bd9274cb2d4754b915d624447ec0dce9105d174361841c0826efc79ceb9" +checksum = "4b18e27825442721d23ed98591a80f55220cfe0bf883d92b1ead6c9be237bb34" dependencies = [ "bitflags 2.4.1", ] [[package]] name = "wit-bindgen-rust" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f195cd3774ff22f9bbd582a4ab97667c0a47d36ed8ed0c9ed357afe811b564b" +checksum = "a44f91ca4e1f0d6d2522a7cbbbea6410992d92eb48e686623eb94e2278839b95" dependencies = [ "anyhow", "heck 0.5.0", @@ -4396,9 +4396,9 @@ dependencies = [ [[package]] name = "wit-bindgen-rust-macro" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683e47441b5d0a82fc4304619dcc0672bc84ef47de2c85cd493c37cb29de062f" +checksum = "826e65d7f2eb5e52795c125a2d40f1acdc3bee7a8cb15bfdc6d1078f02ac4f49" dependencies = [ "anyhow", "prettyplease", @@ -4411,9 +4411,9 @@ dependencies = [ [[package]] name = "wit-component" -version = "0.214.0" +version = "0.215.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd9fd46f0e783bf80f1ab7291f9d442fa5553ff0e96cdb71964bd8859b734b55" +checksum = "f725e3885fc5890648be5c5cbc1353b755dc932aa5f1aa7de968b912a3280743" dependencies = [ "anyhow", "bitflags 2.4.1", @@ -4430,9 +4430,9 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.214.0" +version = "0.215.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681d526d6ea42e28f9afe9eae2b50e0b0a627aef8822c75eb04078db84d03e57" +checksum = "935a97eaffd57c3b413aa510f8f0b550a4a9fe7d59e79cd8b89a83dcb860321f" dependencies = [ "anyhow", "id-arena", diff --git a/Cargo.toml b/Cargo.toml index c43bf4961f0d..8a511b20efc1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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: # -------------------------- diff --git a/crates/component-macro/src/bindgen.rs b/crates/component-macro/src/bindgen.rs index 0be41be6f53a..9b0a6a1d90ad 100644 --- a/crates/component-macro/src/bindgen.rs +++ b/crates/component-macro/src/bindgen.rs @@ -170,11 +170,11 @@ impl Parse for Config { path = Some(input.parse::()?.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, @@ -190,7 +190,7 @@ fn parse_source( path: &Option, inline: &Option, features: &[String], -) -> anyhow::Result<(Resolve, Vec, Vec)> { +) -> anyhow::Result<(Resolve, PackageId, Vec)> { let mut resolve = Resolve::default(); resolve.features.extend(features.iter().cloned()); let mut files = Vec::new(); diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock index ea19d3558d76..9c11da795330 100644 --- a/supply-chain/imports.lock +++ b/supply-chain/imports.lock @@ -882,24 +882,48 @@ when = "2024-07-16" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wasm-encoder]] +version = "0.215.0" +when = "2024-07-31" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wasm-metadata]] version = "0.214.0" when = "2024-07-16" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wasm-metadata]] +version = "0.215.0" +when = "2024-07-31" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wasmparser]] version = "0.214.0" when = "2024-07-16" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wasmparser]] +version = "0.215.0" +when = "2024-07-31" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wasmprinter]] version = "0.214.0" when = "2024-07-16" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wasmprinter]] +version = "0.215.0" +when = "2024-07-31" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wasmtime]] version = "23.0.1" when = "2024-07-22" @@ -1044,12 +1068,24 @@ when = "2024-07-16" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wast]] +version = "215.0.0" +when = "2024-07-31" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wat]] version = "1.214.0" when = "2024-07-16" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wat]] +version = "1.215.0" +when = "2024-07-31" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wiggle]] version = "23.0.1" when = "2024-07-22" @@ -1248,42 +1284,84 @@ when = "2024-07-16" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wit-bindgen]] +version = "0.29.0" +when = "2024-08-02" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wit-bindgen-core]] version = "0.28.0" when = "2024-07-16" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wit-bindgen-core]] +version = "0.29.0" +when = "2024-08-02" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wit-bindgen-rt]] version = "0.28.0" when = "2024-07-16" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wit-bindgen-rt]] +version = "0.29.0" +when = "2024-08-02" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wit-bindgen-rust]] version = "0.28.0" when = "2024-07-16" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wit-bindgen-rust]] +version = "0.29.0" +when = "2024-08-02" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wit-bindgen-rust-macro]] version = "0.28.0" when = "2024-07-16" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wit-bindgen-rust-macro]] +version = "0.29.0" +when = "2024-08-02" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wit-component]] version = "0.214.0" when = "2024-07-16" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wit-component]] +version = "0.215.0" +when = "2024-07-31" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wit-parser]] version = "0.214.0" when = "2024-07-16" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wit-parser]] +version = "0.215.0" +when = "2024-07-31" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.witx]] version = "0.9.1" when = "2021-06-22"