diff --git a/Cargo.lock b/Cargo.lock index a9ec44a6d..3165318fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,22 +2,13 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli 0.28.1", -] - [[package]] name = "addr2line" version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ - "gimli 0.29.0", + "gimli", ] [[package]] @@ -125,19 +116,13 @@ dependencies = [ "syn", ] -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - [[package]] name = "backtrace" version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ - "addr2line 0.22.0", + "addr2line", "cc", "cfg-if", "libc", @@ -364,27 +349,38 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.109.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6b33d7e757a887989eb18b35712b2a67d96171ec3149d1bfb657b29b7b367c" +checksum = "b80c3a50b9c4c7e5b5f73c0ed746687774fc9e36ef652b110da8daebf0c6e0e6" dependencies = [ "cranelift-entity", ] +[[package]] +name = "cranelift-bitset" +version = "0.111.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38778758c2ca918b05acb2199134e0c561fb577c50574259b26190b6c2d95ded" +dependencies = [ + "serde", + "serde_derive", +] + [[package]] name = "cranelift-codegen" -version = "0.109.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9acf15cb22be42d07c3b57d7856329cb228b7315d385346149df2566ad5e4aa" +checksum = "58258667ad10e468bfc13a8d620f50dfcd4bb35d668123e97defa2549b9ad397" dependencies = [ "bumpalo", "cranelift-bforest", + "cranelift-bitset", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-control", "cranelift-entity", "cranelift-isle", - "gimli 0.28.1", + "gimli", "hashbrown 0.14.5", "log", "regalloc2", @@ -395,43 +391,44 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.109.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e934d301392b73b3f8b0540391fb82465a0f179a3cee7c726482ac4727efcc97" +checksum = "043f0b702e529dcb07ff92bd7d40e7d5317b5493595172c5eb0983343751ee06" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.109.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb2a2566b3d54b854dfb288b3b187f6d3d17d6f762c92898207eba302931da" +checksum = "7763578888ab53eca5ce7da141953f828e82c2bfadcffc106d10d1866094ffbb" [[package]] name = "cranelift-control" -version = "0.109.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0100f33b704cdacd01ad66ff41f8c5030d57cbff078e2a4e49ab1822591299fa" +checksum = "32db15f08c05df570f11e8ab33cb1ec449a64b37c8a3498377b77650bef33d8b" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.109.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8cfdc315e5d18997093e040a8d234bea1ac1e118a716d3e30f40d449e78207b" +checksum = "5289cdb399381a27e7bbfa1b42185916007c3d49aeef70b1d01cb4caa8010130" dependencies = [ + "cranelift-bitset", "serde", "serde_derive", ] [[package]] name = "cranelift-frontend" -version = "0.109.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f74b84f16af2e982b0c0c72233503d9d55cbfe3865dbe807ca28dc6642a28b5" +checksum = "31ba8ab24eb9470477e98ddfa3c799a649ac5a0d9a2042868c4c952133c234e8" dependencies = [ "cranelift-codegen", "log", @@ -441,15 +438,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.109.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adf306d3dde705fb94bd48082f01d38c4ededc74293a4c007805f610bf08bc6e" +checksum = "2b72a3c5c166a70426dcb209bdd0bb71a787c1ea76023dc0974fbabca770e8f9" [[package]] name = "cranelift-native" -version = "0.109.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ea0ebdef7aff4a79bcbc8b6495f31315f16b3bf311152f472eaa8d679352581" +checksum = "46a42424c956bbc31fc5c2706073df896156c5420ae8fa2a5d48dbc7b295d71b" dependencies = [ "cranelift-codegen", "libc", @@ -458,9 +455,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.109.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d549108a1942065cdbac3bb96c2952afa0e1b9a3beff4b08c4308ac72257576d" +checksum = "49778df4289933d735b93c30a345513e030cf83101de0036e19b760f8aa09f68" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -468,7 +465,7 @@ dependencies = [ "itertools", "log", "smallvec", - "wasmparser 0.209.1", + "wasmparser", "wasmtime-types", ] @@ -756,21 +753,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" dependencies = [ "fallible-iterator", "indexmap", "stable_deref_trait", ] -[[package]] -name = "gimli" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" - [[package]] name = "hashbrown" version = "0.13.2" @@ -1009,15 +1000,6 @@ dependencies = [ "rustix", ] -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - [[package]] name = "miniz_oxide" version = "0.7.4" @@ -1274,6 +1256,9 @@ name = "semver" version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +dependencies = [ + "serde", +] [[package]] name = "serde" @@ -1421,6 +1406,15 @@ version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + [[package]] name = "test-artifacts" version = "0.0.0" @@ -1430,10 +1424,10 @@ name = "test-helpers" version = "0.0.0" dependencies = [ "codegen-macro", - "wasm-encoder 0.215.0", + "wasm-encoder", "wit-bindgen-core", "wit-component", - "wit-parser 0.215.0", + "wit-parser", ] [[package]] @@ -1696,15 +1690,6 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" -[[package]] -name = "wasm-encoder" -version = "0.209.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4a05336882dae732ce6bd48b7e11fe597293cb72c13da4f35d7d5f8d53b2a7" -dependencies = [ - "leb128", -] - [[package]] name = "wasm-encoder" version = "0.215.0" @@ -1712,7 +1697,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb56df3e06b8e6b77e37d2969a50ba51281029a9aeb3855e76b7f49b6418847" dependencies = [ "leb128", - "wasmparser 0.215.0", + "wasmparser", ] [[package]] @@ -1727,22 +1712,8 @@ dependencies = [ "serde_derive", "serde_json", "spdx", - "wasm-encoder 0.215.0", - "wasmparser 0.215.0", -] - -[[package]] -name = "wasmparser" -version = "0.209.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07035cc9a9b41e62d3bb3a3815a66ab87c993c06fe1cf6b2a3f2a18499d937db" -dependencies = [ - "ahash", - "bitflags", - "hashbrown 0.14.5", - "indexmap", - "semver", - "serde", + "wasm-encoder", + "wasmparser", ] [[package]] @@ -1761,29 +1732,31 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.209.1" +version = "0.215.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceca8ae6eaa8c7c87b33c25c53bdf299f8c2a764aee1179402ff7652ef3a6859" +checksum = "d8e9a325d85053408209b3d2ce5eaddd0dd6864d1cff7a007147ba073157defc" dependencies = [ "anyhow", - "wasmparser 0.209.1", + "termcolor", + "wasmparser", ] [[package]] name = "wasmtime" -version = "22.0.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "786d8b5e7a4d54917c5ebe555b9667337e5f93383f49bddaaeec2eba68093b45" +checksum = "9a5883d64dfc8423c56e3d8df27cffc44db25336aa468e8e0724fddf30a333d7" dependencies = [ - "addr2line 0.21.0", + "addr2line", "anyhow", "async-trait", + "bitflags", "bumpalo", "cc", "cfg-if", "encoding_rs", "fxprof-processed-profile", - "gimli 0.28.1", + "gimli", "hashbrown 0.14.5", "indexmap", "ittapi", @@ -1792,7 +1765,6 @@ dependencies = [ "log", "mach2", "memfd", - "memoffset", "object", "once_cell", "paste", @@ -1807,8 +1779,8 @@ dependencies = [ "smallvec", "sptr", "target-lexicon", - "wasm-encoder 0.209.1", - "wasmparser 0.209.1", + "wasm-encoder", + "wasmparser", "wasmtime-asm-macros", "wasmtime-cache", "wasmtime-component-macro", @@ -1827,18 +1799,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "22.0.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d697d99c341d4a9ffb72f3af7a02124d233eeb59aee010f36d88e97cca553d5e" +checksum = "1c4dc7e2a379c0dd6be5b55857d14c4b277f43a9c429a9e14403eb61776ae3be" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "22.0.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "916610f9ae9a6c22deb25bba2e6247ba9f00b093d30620875203b91328a1adfa" +checksum = "6a5b179f263a318e08c93281ea77cbb95e2a0c8c11e99a6188b53ead77233722" dependencies = [ "anyhow", "base64", @@ -1856,9 +1828,9 @@ dependencies = [ [[package]] name = "wasmtime-component-macro" -version = "22.0.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b29b462b068e73b5b27fae092a27f47e5937cabf6b26be2779c978698a52feca" +checksum = "4b07773d1c3dab5f014ec61316ee317aa424033e17e70a63abdf7c3a47e58fcf" dependencies = [ "anyhow", "proc-macro2", @@ -1866,20 +1838,20 @@ dependencies = [ "syn", "wasmtime-component-util", "wasmtime-wit-bindgen", - "wit-parser 0.209.1", + "wit-parser", ] [[package]] name = "wasmtime-component-util" -version = "22.0.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d2912c53d9054984b380dfbd7579f9c3681b2a73b903a56bd71a1c4f175f1e" +checksum = "e38d735320f4e83478369ce649ad8fe87c6b893220902e798547a225fc0c5874" [[package]] name = "wasmtime-cranelift" -version = "22.0.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3975deafea000457ba84355c7c0fce0372937204f77026510b7b454f28a3a65" +checksum = "e570d831d0785d93d7d8c722b1eb9a34e0d0c1534317666f65892818358a2da9" dependencies = [ "anyhow", "cfg-if", @@ -1889,36 +1861,38 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.28.1", + "gimli", "log", "object", "target-lexicon", "thiserror", - "wasmparser 0.209.1", + "wasmparser", "wasmtime-environ", "wasmtime-versioned-export-macros", ] [[package]] name = "wasmtime-environ" -version = "22.0.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f444e900e848b884d8a8a2949b6f5b92af642a3e663ff8fbe78731143a55be61" +checksum = "c5fe80dfbd81687431a7d4f25929fae1ae96894786d5c96b14ae41164ee97377" dependencies = [ "anyhow", "cpp_demangle", + "cranelift-bitset", "cranelift-entity", - "gimli 0.28.1", + "gimli", "indexmap", "log", "object", "postcard", "rustc-demangle", + "semver", "serde", "serde_derive", "target-lexicon", - "wasm-encoder 0.209.1", - "wasmparser 0.209.1", + "wasm-encoder", + "wasmparser", "wasmprinter", "wasmtime-component-util", "wasmtime-types", @@ -1926,9 +1900,9 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "22.0.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ded58eb2d1bf0dcd2182d0ccd7055c4b10b50d711514f1d73f61515d0fa829d" +checksum = "0f39043d13c7b58db69dc9a0feb191a961e75a9ec2402aebf42de183c022bb8a" dependencies = [ "anyhow", "cc", @@ -1941,9 +1915,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "22.0.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bc54198c6720f098210a85efb3ba8c078d1de4d373cdb6778850a66ae088d11" +checksum = "aec346412363eb26067cb6473281a45bd273cbbcafa3dc862793c946eff6ba7f" dependencies = [ "object", "once_cell", @@ -1953,9 +1927,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "22.0.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5afe2f0499542f9a4bcfa1b55bfdda803b6ade4e7c93c6b99e0f39dba44b0a91" +checksum = "d15de8429db996f0d17a4163a35eccc3f874cbfb50f29c379951ea1bbb39452e" dependencies = [ "anyhow", "cfg-if", @@ -1965,28 +1939,29 @@ dependencies = [ [[package]] name = "wasmtime-slab" -version = "22.0.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a7de1f2bec5bbb35d532e61c85c049dc84ae671df60492f90b954ecf21169e7" +checksum = "1f68d38fa6b30c5e1fc7d608263062997306f79e577ebd197ddcd6b0f55d87d1" [[package]] name = "wasmtime-types" -version = "22.0.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "412463e9000e14cf6856be48628d2213c20c153e29ffc22b036980c892ea6964" +checksum = "6634e7079d9c5cfc81af8610ed59b488cc5b7f9777a2f4c1667a2565c2e45249" dependencies = [ + "anyhow", "cranelift-entity", "serde", "serde_derive", "smallvec", - "wasmparser 0.209.1", + "wasmparser", ] [[package]] name = "wasmtime-versioned-export-macros" -version = "22.0.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5a9bc4f44ceeb168e9e8e3be4e0b4beb9095b468479663a9e24c667e36826f" +checksum = "3850e3511d6c7f11a72d571890b0ed5f6204681f7f050b9de2690e7f13123fed" dependencies = [ "proc-macro2", "quote", @@ -1995,9 +1970,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi" -version = "22.0.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8abb1301089ed8e0b4840f539cba316a73ac382090f1b25d22d8c8eed8df49c7" +checksum = "545ae8298ffce025604f7480f9c7d6948c985bef7ce9aee249ef79307813e83c" dependencies = [ "anyhow", "async-trait", @@ -2026,16 +2001,16 @@ dependencies = [ [[package]] name = "wasmtime-winch" -version = "22.0.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed4db238a0241df2d15f79ad17b3a37a27f2ea6cb885894d81b42ae107544466" +checksum = "2a25199625effa4c13dd790d64bd56884b014c69829431bfe43991c740bd5bc1" dependencies = [ "anyhow", "cranelift-codegen", - "gimli 0.28.1", + "gimli", "object", "target-lexicon", - "wasmparser 0.209.1", + "wasmparser", "wasmtime-cranelift", "wasmtime-environ", "winch-codegen", @@ -2043,14 +2018,14 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "22.0.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc077306b38288262e5ba01d4b21532a6987416cdc0aedf04bb06c22a68fdc" +checksum = "3cb331ac7ed1d5ba49cddcdb6b11973752a857148858bb308777d2fc5584121f" dependencies = [ "anyhow", "heck 0.4.1", "indexmap", - "wit-parser 0.209.1", + "wit-parser", ] [[package]] @@ -2072,7 +2047,7 @@ dependencies = [ "leb128", "memchr", "unicode-width", - "wasm-encoder 0.215.0", + "wasm-encoder", ] [[package]] @@ -2086,9 +2061,9 @@ dependencies = [ [[package]] name = "wiggle" -version = "22.0.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29830e5d01c182d24b94092c697aa7ab0ee97d22e78a2bf40ca91eae6ebca5c2" +checksum = "cc850ca3c02c5835934d23f28cec4c5a3fb66fe0b4ecd968bbb35609dda5ddc0" dependencies = [ "anyhow", "async-trait", @@ -2101,9 +2076,9 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "22.0.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "557567f2793508760cd855f7659b7a0b9dc4dbc451f53f1415d6943a15311ade" +checksum = "634b8804a67200bcb43ea8af5f7c53e862439a086b68b16fd333454bc74d5aab" dependencies = [ "anyhow", "heck 0.4.1", @@ -2116,9 +2091,9 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "22.0.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc26129a8aea20b62c961d1b9ab4a3c3b56b10042ed85d004f8678af0f21ba6e" +checksum = "474b7cbdb942c74031e619d66c600bba7f73867c5800fc2c2306cf307649be2f" dependencies = [ "proc-macro2", "quote", @@ -2142,6 +2117,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -2150,17 +2134,17 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c6915884e731b2db0d8cf08cb64474cb69221a161675fd3c135f91febc3daa" +checksum = "073efe897d9ead7fc609874f94580afc831114af5149b6a90ee0a3a39b497fe0" dependencies = [ "anyhow", "cranelift-codegen", - "gimli 0.28.1", + "gimli", "regalloc2", "smallvec", "target-lexicon", - "wasmparser 0.209.1", + "wasmparser", "wasmtime-cranelift", "wasmtime-environ", ] @@ -2282,11 +2266,11 @@ dependencies = [ "clap", "heck 0.5.0", "test-helpers", - "wasm-encoder 0.215.0", + "wasm-encoder", "wasm-metadata", "wit-bindgen-core", "wit-component", - "wit-parser 0.215.0", + "wit-parser", ] [[package]] @@ -2297,8 +2281,8 @@ dependencies = [ "clap", "heck 0.5.0", "test-artifacts", - "wasm-encoder 0.215.0", - "wasmparser 0.215.0", + "wasm-encoder", + "wasmparser", "wasmtime", "wasmtime-wasi", "wit-bindgen-c", @@ -2310,7 +2294,7 @@ dependencies = [ "wit-bindgen-rust", "wit-bindgen-teavm-java", "wit-component", - "wit-parser 0.215.0", + "wit-parser", ] [[package]] @@ -2319,7 +2303,7 @@ version = "0.30.0" dependencies = [ "anyhow", "heck 0.5.0", - "wit-parser 0.215.0", + "wit-parser", ] [[package]] @@ -2331,12 +2315,12 @@ dependencies = [ "heck 0.5.0", "indexmap", "test-helpers", - "wasm-encoder 0.215.0", + "wasm-encoder", "wasm-metadata", - "wasmparser 0.215.0", + "wasmparser", "wit-bindgen-core", "wit-component", - "wit-parser 0.215.0", + "wit-parser", ] [[package]] @@ -2441,29 +2425,11 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "wasm-encoder 0.215.0", + "wasm-encoder", "wasm-metadata", - "wasmparser 0.215.0", + "wasmparser", "wat", - "wit-parser 0.215.0", -] - -[[package]] -name = "wit-parser" -version = "0.209.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e79b9e3c0b6bb589dec46317e645851e0db2734c44e2be5e251b03ff4a51269" -dependencies = [ - "anyhow", - "id-arena", - "indexmap", - "log", - "semver", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser 0.209.1", + "wit-parser", ] [[package]] @@ -2481,7 +2447,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.215.0", + "wasmparser", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 638f627a3..618abcbf3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -86,8 +86,8 @@ moonbit = ['dep:wit-bindgen-moonbit'] [dev-dependencies] heck = { workspace = true } -wasmtime = { version = "22.0.0", features = ['component-model'] } -wasmtime-wasi = { version = "22.0.0" } +wasmtime = { version = "24.0.0", features = ['component-model'] } +wasmtime-wasi = { version = "24.0.0" } test-artifacts = { path = 'crates/test-rust-wasm/artifacts' } wit-parser = { workspace = true } wasmparser = { workspace = true } diff --git a/tests/runtime/main.rs b/tests/runtime/main.rs index 238dc22e1..0b3ae64f3 100644 --- a/tests/runtime/main.rs +++ b/tests/runtime/main.rs @@ -58,7 +58,7 @@ impl WasiView for Wasi { fn run_test( name: &str, add_to_linker: fn(&mut Linker>) -> Result<()>, - instantiate: fn(&mut Store>, &Component, &Linker>) -> Result<(U, Instance)>, + instantiate: fn(&mut Store>, &Component, &Linker>) -> Result, test: fn(U, &mut Store>) -> Result<()>, ) -> Result<()> where @@ -72,7 +72,7 @@ fn run_test_from_dir( dir_name: &str, name: &str, add_to_linker: fn(&mut Linker>) -> Result<()>, - instantiate: fn(&mut Store>, &Component, &Linker>) -> Result<(U, Instance)>, + instantiate: fn(&mut Store>, &Component, &Linker>) -> Result, test: fn(U, &mut Store>) -> Result<()>, ) -> Result<()> where @@ -103,7 +103,7 @@ where wasmtime_wasi::add_to_linker_sync(&mut linker)?; - let (exports, _) = instantiate(&mut store, &component, &linker)?; + let exports = instantiate(&mut store, &component, &linker)?; println!("testing {wasm:?}"); test(exports, &mut store)?; diff --git a/tests/runtime/resource_aggregates.rs b/tests/runtime/resource_aggregates.rs index 3fb3b79e9..41bf32fb1 100644 --- a/tests/runtime/resource_aggregates.rs +++ b/tests/runtime/resource_aggregates.rs @@ -84,10 +84,7 @@ fn run() -> Result<()> { crate::run_test( "resource_aggregates", |linker| ResourceAggregates::add_to_linker(linker, |x| &mut x.0), - |store, component, linker| { - let (u, e) = ResourceAggregates::instantiate(store, component, linker)?; - Ok((u, e)) - }, + |store, component, linker| ResourceAggregates::instantiate(store, component, linker), run_test, ) } diff --git a/tests/runtime/resource_alias.rs b/tests/runtime/resource_alias.rs index 5cb2d3093..1b9300496 100644 --- a/tests/runtime/resource_alias.rs +++ b/tests/runtime/resource_alias.rs @@ -10,10 +10,7 @@ fn run() -> anyhow::Result<()> { crate::run_test( "resource_alias", |_| Ok(()), - |store, component, linker| { - let (u, e) = ResourceAlias::instantiate(store, component, linker)?; - Ok((u, e)) - }, + |store, component, linker| ResourceAlias::instantiate(store, component, linker), run_test, ) } diff --git a/tests/runtime/resource_alias_redux.rs b/tests/runtime/resource_alias_redux.rs index 64e965d77..bd9b5e44c 100644 --- a/tests/runtime/resource_alias_redux.rs +++ b/tests/runtime/resource_alias_redux.rs @@ -59,10 +59,7 @@ fn run() -> anyhow::Result<()> { crate::run_test( "resource_alias_redux", |linker| ResourceAliasRedux::add_to_linker(linker, |x| &mut x.0), - |store, component, linker| { - let (u, e) = ResourceAliasRedux::instantiate(store, component, linker)?; - Ok((u, e)) - }, + |store, component, linker| ResourceAliasRedux::instantiate(store, component, linker), run_test, ) } diff --git a/tests/runtime/resource_borrow_export.rs b/tests/runtime/resource_borrow_export.rs index 7b871bfec..4689e8f84 100644 --- a/tests/runtime/resource_borrow_export.rs +++ b/tests/runtime/resource_borrow_export.rs @@ -10,8 +10,7 @@ fn run() -> anyhow::Result<()> { "resource_borrow_export", |_| Ok(()), |store, component, linker| { - let (u, e) = ResourceBorrowExport::instantiate(store, component, linker)?; - Ok((u.interface0, e)) + Ok(ResourceBorrowExport::instantiate(store, component, linker)?.interface0) }, run_test, ) diff --git a/tests/runtime/resource_borrow_import.rs b/tests/runtime/resource_borrow_import.rs index 6290e3be5..eb9054783 100644 --- a/tests/runtime/resource_borrow_import.rs +++ b/tests/runtime/resource_borrow_import.rs @@ -39,10 +39,7 @@ fn run() -> anyhow::Result<()> { crate::run_test( "resource_borrow_import", |linker| ResourceBorrowImport::add_to_linker(linker, |x| &mut x.0), - |store, component, linker| { - let (u, e) = ResourceBorrowImport::instantiate(store, component, linker)?; - Ok((u, e)) - }, + |store, component, linker| ResourceBorrowImport::instantiate(store, component, linker), run_test, ) } diff --git a/tests/runtime/resource_borrow_in_record.rs b/tests/runtime/resource_borrow_in_record.rs index 5b3ef3170..26c830f27 100644 --- a/tests/runtime/resource_borrow_in_record.rs +++ b/tests/runtime/resource_borrow_in_record.rs @@ -59,8 +59,7 @@ fn run() -> anyhow::Result<()> { "resource_borrow_in_record", |linker| ResourceBorrowInRecord::add_to_linker(linker, |x| &mut x.0), |store, component, linker| { - let (u, e) = ResourceBorrowInRecord::instantiate(store, component, linker)?; - Ok((u.interface0, e)) + Ok(ResourceBorrowInRecord::instantiate(store, component, linker)?.interface0) }, run_test, ) diff --git a/tests/runtime/resource_borrow_simple.rs b/tests/runtime/resource_borrow_simple.rs index 3285bcf49..facc7eb8b 100644 --- a/tests/runtime/resource_borrow_simple.rs +++ b/tests/runtime/resource_borrow_simple.rs @@ -29,8 +29,7 @@ fn run() -> anyhow::Result<()> { "resource_borrow_simple", |linker| ResourceBorrowSimple::add_to_linker(linker, |x| &mut x.0), |store, component: &wasmtime::component::Component, linker| { - let (u, e) = ResourceBorrowSimple::instantiate(store, component, linker)?; - Ok((u, e)) + ResourceBorrowSimple::instantiate(store, component, linker) }, run_test, ) diff --git a/tests/runtime/resource_floats.rs b/tests/runtime/resource_floats.rs index 68b46d746..d8708d78c 100644 --- a/tests/runtime/resource_floats.rs +++ b/tests/runtime/resource_floats.rs @@ -71,10 +71,7 @@ fn run() -> anyhow::Result<()> { crate::run_test( "resource_floats", |linker| ResourceFloats::add_to_linker(linker, |x| &mut x.0), - |store, component, linker| { - let (u, e) = ResourceFloats::instantiate(store, component, linker)?; - Ok((u, e)) - }, + |store, component, linker| ResourceFloats::instantiate(store, component, linker), run_test, ) } diff --git a/tests/runtime/resource_import_and_export.rs b/tests/runtime/resource_import_and_export.rs index 40732bfbc..362d1438a 100644 --- a/tests/runtime/resource_import_and_export.rs +++ b/tests/runtime/resource_import_and_export.rs @@ -57,8 +57,7 @@ fn run() -> anyhow::Result<()> { "resource_import_and_export", |linker| ResourceImportAndExport::add_to_linker(linker, |x| &mut x.0), |store, component, linker| { - let (u, e) = ResourceImportAndExport::instantiate(store, component, linker)?; - Ok((u.interface1, e)) + Ok(ResourceImportAndExport::instantiate(store, component, linker)?.interface1) }, run_test, ) diff --git a/tests/runtime/resource_into_inner.rs b/tests/runtime/resource_into_inner.rs index b9e2cade8..65ba02b64 100644 --- a/tests/runtime/resource_into_inner.rs +++ b/tests/runtime/resource_into_inner.rs @@ -10,8 +10,7 @@ fn run() -> anyhow::Result<()> { "resource_into_inner", |_| Ok(()), |store, component, linker| { - let (u, e) = ResourceIntoInner::instantiate(store, component, linker)?; - Ok((u.interface0, e)) + Ok(ResourceIntoInner::instantiate(store, component, linker)?.interface0) }, run_test, ) diff --git a/tests/runtime/resource_with_lists.rs b/tests/runtime/resource_with_lists.rs index fb81b8b23..ca8af2b51 100644 --- a/tests/runtime/resource_with_lists.rs +++ b/tests/runtime/resource_with_lists.rs @@ -57,8 +57,7 @@ fn run() -> anyhow::Result<()> { "resource_with_lists", |linker| ResourceWithLists::add_to_linker(linker, |x| &mut x.0), |store, component, linker| { - let (u, e) = ResourceWithLists::instantiate(store, component, linker)?; - Ok((u.interface0, e)) + Ok(ResourceWithLists::instantiate(store, component, linker)?.interface0) }, run_test, ) diff --git a/tests/runtime/resources.rs b/tests/runtime/resources.rs index 1491e58a6..358a3de57 100644 --- a/tests/runtime/resources.rs +++ b/tests/runtime/resources.rs @@ -62,10 +62,7 @@ fn run() -> Result<()> { crate::run_test( "resources", |linker| Resources::add_to_linker(linker, |x| &mut x.0), - |store, component, linker| { - let (u, e) = Resources::instantiate(store, component, linker)?; - Ok((u.interface0, e)) - }, + |store, component, linker| Ok(Resources::instantiate(store, component, linker)?.interface0), run_test, ) }