From 71d552f2e21b132a2f4eb4533715bb182532ef25 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 12 Aug 2024 15:33:08 -0500 Subject: [PATCH] Update wit-bindgen dependency to 0.30 (#9123) Looking to unblock #9098 --- Cargo.lock | 20 ++++++------- Cargo.toml | 4 +-- .../src/lib.rs | 3 ++ supply-chain/imports.lock | 30 +++++++++++++++++++ 4 files changed, 45 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 80b532a2ae..ec72915319 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4350,9 +4350,9 @@ dependencies = [ [[package]] name = "wit-bindgen" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6878f363ff82b1fce56d448380b56458a85d282aa08c2be80afe4f4cd9051070" +checksum = "7b4bac478334a647374ff24a74b66737a4cb586dc8288bc3080a93252cd1105c" dependencies = [ "wit-bindgen-rt", "wit-bindgen-rust-macro", @@ -4360,9 +4360,9 @@ dependencies = [ [[package]] name = "wit-bindgen-core" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66f98ab0edef3218244a87b125f4f7047f0af104f2e4718255226c0367688d1c" +checksum = "bb7e3df01cd43cfa1cb52602e4fc05cb2b62217655f6705639b6953eb0a3fed2" dependencies = [ "anyhow", "heck 0.5.0", @@ -4371,18 +4371,18 @@ dependencies = [ [[package]] name = "wit-bindgen-rt" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18e27825442721d23ed98591a80f55220cfe0bf883d92b1ead6c9be237bb34" +checksum = "b2de7a3b06b9725d129b5cbd1beca968feed919c433305a23da46843185ecdd6" dependencies = [ "bitflags 2.4.1", ] [[package]] name = "wit-bindgen-rust" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44f91ca4e1f0d6d2522a7cbbbea6410992d92eb48e686623eb94e2278839b95" +checksum = "61a767d1a8eb4e908bfc53febc48b87ada545703b16fe0148ee7736a29a01417" dependencies = [ "anyhow", "heck 0.5.0", @@ -4396,9 +4396,9 @@ dependencies = [ [[package]] name = "wit-bindgen-rust-macro" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826e65d7f2eb5e52795c125a2d40f1acdc3bee7a8cb15bfdc6d1078f02ac4f49" +checksum = "9b185c342d0d27bd83d4080f5a66cf3b4f247fa49d679bceb66e11cc7eb58b99" dependencies = [ "anyhow", "prettyplease", diff --git a/Cargo.toml b/Cargo.toml index a804dc431c..593805d15d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -260,8 +260,8 @@ io-lifetimes = { version = "2.0.3", default-features = false } io-extras = "0.18.1" rustix = "0.38.31" # wit-bindgen: -wit-bindgen = { version = "0.29.0", default-features = false } -wit-bindgen-rust-macro = { version = "0.29.0", default-features = false } +wit-bindgen = { version = "0.30.0", default-features = false } +wit-bindgen-rust-macro = { version = "0.30.0", default-features = false } # wasm-tools family: wasmparser = { version = "0.215.0", default-features = false } diff --git a/crates/wasi-preview1-component-adapter/src/lib.rs b/crates/wasi-preview1-component-adapter/src/lib.rs index 0cb4957f43..b7464ff1fc 100644 --- a/crates/wasi-preview1-component-adapter/src/lib.rs +++ b/crates/wasi-preview1-component-adapter/src/lib.rs @@ -63,6 +63,7 @@ pub mod bindings { // terms of raw pointers. skip: ["run", "get-environment", "poll"], generate_all, + disable_custom_section_link_helpers: true, }); #[cfg(feature = "reactor")] @@ -80,6 +81,7 @@ pub mod bindings { // terms of raw pointers. skip: ["get-environment", "poll"], generate_all, + disable_custom_section_link_helpers: true, }); #[cfg(feature = "proxy")] @@ -103,6 +105,7 @@ pub mod bindings { runtime_path: "crate::bindings::wit_bindgen_rt_shim", skip: ["poll"], generate_all, + disable_custom_section_link_helpers: true, }); pub mod wit_bindgen_rt_shim { diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock index e52bfb8bea..449085802e 100644 --- a/supply-chain/imports.lock +++ b/supply-chain/imports.lock @@ -1488,6 +1488,12 @@ when = "2024-08-02" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wit-bindgen]] +version = "0.30.0" +when = "2024-08-12" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wit-bindgen-core]] version = "0.28.0" when = "2024-07-16" @@ -1500,6 +1506,12 @@ when = "2024-08-02" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wit-bindgen-core]] +version = "0.30.0" +when = "2024-08-12" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wit-bindgen-rt]] version = "0.28.0" when = "2024-07-16" @@ -1512,6 +1524,12 @@ when = "2024-08-02" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wit-bindgen-rt]] +version = "0.30.0" +when = "2024-08-12" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wit-bindgen-rust]] version = "0.28.0" when = "2024-07-16" @@ -1524,6 +1542,12 @@ when = "2024-08-02" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wit-bindgen-rust]] +version = "0.30.0" +when = "2024-08-12" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wit-bindgen-rust-macro]] version = "0.28.0" when = "2024-07-16" @@ -1536,6 +1560,12 @@ when = "2024-08-02" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wit-bindgen-rust-macro]] +version = "0.30.0" +when = "2024-08-12" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wit-component]] version = "0.214.0" when = "2024-07-16"