diff --git a/Cargo.lock b/Cargo.lock index b1d1dc63299c..25457ee41d9c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1797,7 +1797,6 @@ checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg 1.1.0", "hashbrown 0.12.3", - "serde", ] [[package]] @@ -2541,17 +2540,6 @@ dependencies = [ "cc", ] -[[package]] -name = "pulldown-cmark" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8" -dependencies = [ - "bitflags 1.3.2", - "memchr", - "unicase", -] - [[package]] name = "pulldown-cmark" version = "0.9.3" @@ -3794,9 +3782,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-encoder" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881" +checksum = "b2f8e9778e04cbf44f58acc301372577375a666b966c50b03ef46144f80436a8" dependencies = [ "leb128", ] @@ -3812,15 +3800,17 @@ dependencies = [ [[package]] name = "wasm-metadata" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36e5156581ff4a302405c44ca7c85347563ca431d15f1a773f12c9c7b9a6cdc9" +checksum = "d51db59397fc650b5f2fc778e4a5c4456cd856bed7fc1ec15f8d3e28229dc463" dependencies = [ "anyhow", - "indexmap 1.9.1", + "indexmap 2.0.0", "serde", - "wasm-encoder 0.29.0", - "wasmparser 0.107.0", + "serde_json", + "spdx", + "wasm-encoder 0.30.0", + "wasmparser 0.108.0", ] [[package]] @@ -3915,11 +3905,11 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.107.0" +version = "0.108.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e3ac9b780c7dda0cac7a52a5d6d2d6707cc6e3451c9db209b6c758f40d7acb" +checksum = "76c956109dcb41436a39391139d9b6e2d0a5e0b158e1293ef352ec977e5e36c5" dependencies = [ - "indexmap 1.9.1", + "indexmap 2.0.0", "semver", ] @@ -4138,7 +4128,7 @@ dependencies = [ "wasmtime", "wasmtime-component-util", "wasmtime-wit-bindgen", - "wit-parser 0.9.2", + "wit-parser", ] [[package]] @@ -4502,7 +4492,7 @@ version = "12.0.0" dependencies = [ "anyhow", "heck", - "wit-parser 0.9.2", + "wit-parser", ] [[package]] @@ -4790,9 +4780,9 @@ dependencies = [ [[package]] name = "wit-bindgen" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a628591b3905328e886462f75de3b2af1e546b19af5f4c359086b26bec29c4bd" +checksum = "f5c3d15a04ce994fad2c5442a754b404ab1fee23c903a04a560f84f94fdf63c0" dependencies = [ "bitflags 2.3.3", "wit-bindgen-rust-macro", @@ -4800,33 +4790,33 @@ dependencies = [ [[package]] name = "wit-bindgen-core" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34a19aa69c4f33cb5ac10e55880a899f4d52ec85d4cde4d593b575e7a97e2b08" +checksum = "c9658ec54d4a3c9e2f079bc65a131093337595b595fbf82f805008469838cdea" dependencies = [ "anyhow", - "wit-component 0.11.0", - "wit-parser 0.8.0", + "wit-component 0.12.0", + "wit-parser", ] [[package]] name = "wit-bindgen-rust" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a50274c0cf2f8e33fc967825cef0114cdfe222d474c1d78aa77a6a801abaadf" +checksum = "21ae6a6198ba9765771b977e2af985a0d5ac71b59f999da5c4ee1c7bbd8ca8dc" dependencies = [ "heck", - "wasm-metadata 0.8.0", + "wasm-metadata 0.9.0", "wit-bindgen-core", "wit-bindgen-rust-lib", - "wit-component 0.11.0", + "wit-component 0.12.0", ] [[package]] name = "wit-bindgen-rust-lib" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d3d58b5ced269f1a1cdcecfe0317c059fe158da9b670fff9907903b244bb89a" +checksum = "5c31de8c6c77cac1fd4927c7584d1314cd5e838cfb40b53333d6dffc7a132dda" dependencies = [ "heck", "wit-bindgen-core", @@ -4834,32 +4824,33 @@ dependencies = [ [[package]] name = "wit-bindgen-rust-macro" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78cce32dd08007af45dbaa00e225eb73d05524096f93933d7ecba852d50d8af3" +checksum = "0a2abe5c7c4c08468d01590aa96c8a684dd94fb9241a248af88eef7edac61e43" dependencies = [ "anyhow", "proc-macro2", "syn 2.0.25", "wit-bindgen-core", "wit-bindgen-rust", - "wit-component 0.11.0", + "wit-bindgen-rust-lib", + "wit-component 0.12.0", ] [[package]] name = "wit-component" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cbd4c7f8f400327c482c88571f373844b7889e61460650d650fc5881bb3575c" +checksum = "253bd426c532f1cae8c633c517c63719920535f3a7fada3589de40c5b734e393" dependencies = [ "anyhow", "bitflags 1.3.2", - "indexmap 1.9.1", + "indexmap 2.0.0", "log", - "wasm-encoder 0.29.0", - "wasm-metadata 0.8.0", - "wasmparser 0.107.0", - "wit-parser 0.8.0", + "wasm-encoder 0.30.0", + "wasm-metadata 0.9.0", + "wasmparser 0.108.0", + "wit-parser", ] [[package]] @@ -4875,23 +4866,7 @@ dependencies = [ "wasm-encoder 0.31.1", "wasm-metadata 0.10.1", "wasmparser 0.110.0", - "wit-parser 0.9.2", -] - -[[package]] -name = "wit-parser" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6daec9f093dbaea0e94043eeb92ece327bbbe70c86b1f41aca9bbfefd7f050f0" -dependencies = [ - "anyhow", - "id-arena", - "indexmap 1.9.1", - "log", - "pulldown-cmark 0.8.0", - "semver", - "unicode-xid", - "url", + "wit-parser", ] [[package]] @@ -4904,7 +4879,7 @@ dependencies = [ "id-arena", "indexmap 2.0.0", "log", - "pulldown-cmark 0.9.3", + "pulldown-cmark", "semver", "unicode-xid", "url", diff --git a/Cargo.toml b/Cargo.toml index bd7c2ea569fc..c40532c4fe68 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -199,7 +199,7 @@ io-extras = "0.18.0" rustix = "0.38.4" # wit-bindgen: -wit-bindgen = { version = "0.7.0", default-features = false } +wit-bindgen = { version = "0.9.0", default-features = false } # wasm-tools family: wasmparser = "0.110.0" diff --git a/crates/test-programs/wasi-http-tests/src/bin/outbound_request.rs b/crates/test-programs/wasi-http-tests/src/bin/outbound_request.rs index 4062d370a122..7987c0dada23 100644 --- a/crates/test-programs/wasi-http-tests/src/bin/outbound_request.rs +++ b/crates/test-programs/wasi-http-tests/src/bin/outbound_request.rs @@ -37,8 +37,8 @@ fn request( body: &[u8], ) -> Result { let headers = wasi::http::types::new_fields(&[ - ("User-agent", "WASI-HTTP/0.0.1"), - ("Content-type", "application/json"), + ("User-agent".to_string(), "WASI-HTTP/0.0.1".to_string()), + ("Content-type".to_string(), "application/json".to_string()), ]); let request = wasi::http::types::new_outgoing_request( diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock index 0befa606d7c2..14f8c6d384d6 100644 --- a/supply-chain/imports.lock +++ b/supply-chain/imports.lock @@ -1663,6 +1663,13 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" +[[publisher.wit-bindgen]] +version = "0.9.0" +when = "2023-07-15" +user-id = 1 +user-login = "alexcrichton" +user-name = "Alex Crichton" + [[publisher.wit-bindgen-core]] version = "0.7.0" when = "2023-05-26" @@ -1670,6 +1677,13 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" +[[publisher.wit-bindgen-core]] +version = "0.9.0" +when = "2023-07-15" +user-id = 1 +user-login = "alexcrichton" +user-name = "Alex Crichton" + [[publisher.wit-bindgen-rust]] version = "0.7.0" when = "2023-05-26" @@ -1677,6 +1691,13 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" +[[publisher.wit-bindgen-rust]] +version = "0.9.0" +when = "2023-07-15" +user-id = 1 +user-login = "alexcrichton" +user-name = "Alex Crichton" + [[publisher.wit-bindgen-rust-lib]] version = "0.7.0" when = "2023-05-26" @@ -1684,6 +1705,13 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" +[[publisher.wit-bindgen-rust-lib]] +version = "0.9.0" +when = "2023-07-15" +user-id = 1 +user-login = "alexcrichton" +user-name = "Alex Crichton" + [[publisher.wit-bindgen-rust-macro]] version = "0.7.0" when = "2023-05-26" @@ -1691,6 +1719,13 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" +[[publisher.wit-bindgen-rust-macro]] +version = "0.9.0" +when = "2023-07-15" +user-id = 1 +user-login = "alexcrichton" +user-name = "Alex Crichton" + [[publisher.wit-component]] version = "0.11.0" when = "2023-05-26"