diff --git a/Cargo.lock b/Cargo.lock index 8f29b51e..5f7018be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -638,9 +638,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.0" +version = "3.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32a994c2b3ca201d9b263612a374263f05e7adde37c4707f693dcd375076d1f" +checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" [[package]] name = "byte-unit" @@ -826,11 +826,10 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "7f9fa1897e4325be0d68d48df6aa1a71ac2ed4d27723887e7754192705350730" dependencies = [ - "jobserver", "libc", ] @@ -874,7 +873,7 @@ dependencies = [ "iana-time-zone", "num-traits", "serde", - "windows-targets 0.52.0", + "windows-targets 0.52.3", ] [[package]] @@ -1138,7 +1137,16 @@ version = "0.104.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e7c0d51205b863591dd1e7aaa0fb69c2ea7bed48ffa63d6c4a848b07a35a732" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.104.1", +] + +[[package]] +name = "cranelift-bforest" +version = "0.105.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29a6391a9172a93f413370fa561c6bca786e06c89cf85f23f02f6345b1c8ee34" +dependencies = [ + "cranelift-entity 0.105.1", ] [[package]] @@ -1148,12 +1156,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ffb467cbc25543e4c20d2ad669bf8275598047b03c89652ad5fe2a0f47fc0e1" dependencies = [ "bumpalo", - "cranelift-bforest", - "cranelift-codegen-meta", - "cranelift-codegen-shared", - "cranelift-control", - "cranelift-entity", - "cranelift-isle", + "cranelift-bforest 0.104.1", + "cranelift-codegen-meta 0.104.1", + "cranelift-codegen-shared 0.104.1", + "cranelift-control 0.104.1", + "cranelift-entity 0.104.1", + "cranelift-isle 0.104.1", + "gimli", + "hashbrown 0.14.3", + "log", + "regalloc2", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-codegen" +version = "0.105.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "409c6cbb326604a53ec47eb6341fc85128f24c81012a014b4c728ed24f6e9350" +dependencies = [ + "bumpalo", + "cranelift-bforest 0.105.1", + "cranelift-codegen-meta 0.105.1", + "cranelift-codegen-shared 0.105.1", + "cranelift-control 0.105.1", + "cranelift-entity 0.105.1", + "cranelift-isle 0.105.1", "gimli", "hashbrown 0.14.3", "log", @@ -1168,7 +1197,16 @@ version = "0.104.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc7e74aed5c2b91e38d090653506afbd2cd3be1ff70593e2aa6bb82b3c6b77ff" dependencies = [ - "cranelift-codegen-shared", + "cranelift-codegen-shared 0.104.1", +] + +[[package]] +name = "cranelift-codegen-meta" +version = "0.105.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fff55e100130995b9ad9ac6b03a24ed5da3c1a1261dcdeb8a7a0292656994fb3" +dependencies = [ + "cranelift-codegen-shared 0.105.1", ] [[package]] @@ -1177,6 +1215,12 @@ version = "0.104.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ff2dd24cce0775566da85770cb48aa58fef901cf2bff30275b42e7dbe62cbd5" +[[package]] +name = "cranelift-codegen-shared" +version = "0.105.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1446e2eb395fc7b3019a36dccb7eccea923f6caf581b903c8e7e751b6d214a7" + [[package]] name = "cranelift-control" version = "0.104.1" @@ -1186,6 +1230,15 @@ dependencies = [ "arbitrary", ] +[[package]] +name = "cranelift-control" +version = "0.105.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24076ecf69cbf8b9e1e532ae8e7ac01d850a1c2e127058a26eb3245f9d5b89d1" +dependencies = [ + "arbitrary", +] + [[package]] name = "cranelift-entity" version = "0.104.1" @@ -1196,13 +1249,35 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "cranelift-entity" +version = "0.105.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f40df95180ad317c60459bb90dd87803d35e538f4c54376d8b26c851f6f0a1b" +dependencies = [ + "serde", + "serde_derive", +] + [[package]] name = "cranelift-frontend" version = "0.104.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67150a1fef9857caba710f8c0c8223d640f02c0e5d1ebbfc75ed62912599cb6b" dependencies = [ - "cranelift-codegen", + "cranelift-codegen 0.104.1", + "log", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-frontend" +version = "0.105.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c3974cc665b699b626742775dae1c1cdea5170f5028ab1f3eb61a7a9a6e2979" +dependencies = [ + "cranelift-codegen 0.105.1", "log", "smallvec", "target-lexicon", @@ -1214,13 +1289,30 @@ version = "0.104.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb7ceea70d3e0d7f69df7657f99de902e32016731c5a8d2788c1df0215f00952" +[[package]] +name = "cranelift-isle" +version = "0.105.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99543f92b9c361f3c54a29e945adb5b9ef1318feaa5944453cabbfcb3c495919" + [[package]] name = "cranelift-native" version = "0.104.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "707e5d9384ce4fa3c40af1abf4c3ec49857745cced5187593385f4a2c0b95445" dependencies = [ - "cranelift-codegen", + "cranelift-codegen 0.104.1", + "libc", + "target-lexicon", +] + +[[package]] +name = "cranelift-native" +version = "0.105.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c0d84dc7d9b3f73ad565eacc4ab36525c407ef5150893b4b94d5f5f904eb48a" +dependencies = [ + "cranelift-codegen 0.105.1", "libc", "target-lexicon", ] @@ -1231,14 +1323,30 @@ version = "0.104.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4d957e3ff2a14c2f974a66c22bfcedcd2bd0272af8dce4236869c3942f5a471" dependencies = [ - "cranelift-codegen", - "cranelift-entity", - "cranelift-frontend", + "cranelift-codegen 0.104.1", + "cranelift-entity 0.104.1", + "cranelift-frontend 0.104.1", "itertools 0.10.5", "log", "smallvec", "wasmparser 0.118.2", - "wasmtime-types", + "wasmtime-types 17.0.1", +] + +[[package]] +name = "cranelift-wasm" +version = "0.105.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53781039219944d59c6d3ec57e6cae31a1a33db71573a945d84ba6d875d0a743" +dependencies = [ + "cranelift-codegen 0.105.1", + "cranelift-entity 0.105.1", + "cranelift-frontend 0.105.1", + "itertools 0.10.5", + "log", + "smallvec", + "wasmparser 0.121.2", + "wasmtime-types 18.0.1", ] [[package]] @@ -1429,9 +1537,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.6" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c376d08ea6aa96aafe61237c7200d1241cb177b7d3a542d791f2d118e9cbb955" +checksum = "3a5d17510e4a1a87f323de70b7b1eaac1ee0e37866c6720b2d279452d0edf389" dependencies = [ "darling_core", "darling_macro", @@ -1439,9 +1547,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.6" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33043dcd19068b8192064c704b3f83eb464f91f1ff527b44a4e2b08d9cdb8855" +checksum = "a98eea36a7ff910fa751413d0895551143a8ea41d695d9798ec7d665df7f7f5e" dependencies = [ "fnv", "ident_case", @@ -1453,9 +1561,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.6" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5a91391accf613803c2a9bf9abccdbaa07c54b4244a5b64883f9c3c137c86be" +checksum = "d6a366a3f90c5d59a4b91169775f88e52e8f71a0e7804cc98a8db2932cf4ed57" dependencies = [ "darling_core", "quote", @@ -2159,9 +2267,9 @@ dependencies = [ [[package]] name = "futures-timer" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" dependencies = [ "gloo-timers", "send_wrapper", @@ -2680,9 +2788,9 @@ dependencies = [ "thiserror", "tokio", "tracing", - "wasmparser 0.118.2", - "wasmtime", - "wasmtime-component-util", + "wasmparser 0.200.0", + "wasmtime 18.0.1", + "wasmtime-component-util 18.0.1", "wasmtime-wasi", "wat", "wit-component", @@ -2787,9 +2895,9 @@ dependencies = [ "unsigned-varint 0.7.2", "url", "uuid", - "wasmtime", + "wasmtime 17.0.1", "wasmtime-jit", - "wasmtime-runtime", + "wasmtime-runtime 17.0.1", "zeroize", ] @@ -3259,15 +3367,6 @@ dependencies = [ "cc", ] -[[package]] -name = "jobserver" -version = "0.1.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" -dependencies = [ - "libc", -] - [[package]] name = "jpeg-decoder" version = "0.3.1" @@ -6674,9 +6773,9 @@ checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" [[package]] name = "target-lexicon" -version = "0.12.13" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tarpc" @@ -6774,9 +6873,9 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -7562,13 +7661,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasi-cap-std-sync" -version = "17.0.1" +name = "wasi-common" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "025e842ba390587e523785ff58bd54fbbf1781b8d3072bc9aba4dc0b809f69da" +checksum = "082a661fe31df4dbb34409f4835ad3d8ba65036bf74aaec9b21fde779978aba7" dependencies = [ "anyhow", - "async-trait", + "bitflags 2.4.2", "cap-fs-ext", "cap-rand", "cap-std", @@ -7576,51 +7675,18 @@ dependencies = [ "fs-set-times", "io-extras", "io-lifetimes", + "log", "once_cell", "rustix", "system-interface", - "tracing", - "wasi-common", - "windows-sys 0.52.0", -] - -[[package]] -name = "wasi-common" -version = "17.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da4d4023cc65b3615590d38db0afb79234de09b3bb89cb0d8f83bdee9f5c28a8" -dependencies = [ - "anyhow", - "bitflags 2.4.2", - "cap-rand", - "cap-std", - "io-extras", - "log", - "rustix", "thiserror", + "tokio", "tracing", - "wasmtime", + "wasmtime 18.0.1", "wiggle", "windows-sys 0.52.0", ] -[[package]] -name = "wasi-tokio" -version = "17.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c97de58a5b89e9ab479a2f9e17e9eb41d0e0156e3c979b2e7f00e9499d2e97b7" -dependencies = [ - "anyhow", - "cap-std", - "io-extras", - "io-lifetimes", - "rustix", - "tokio", - "wasi-cap-std-sync", - "wasi-common", - "wiggle", -] - [[package]] name = "wasm-bindgen" version = "0.2.91" @@ -7696,15 +7762,6 @@ dependencies = [ "leb128", ] -[[package]] -name = "wasm-encoder" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111495d6204760238512f57a9af162f45086504da332af210f2f75dd80b34f1d" -dependencies = [ - "leb128", -] - [[package]] name = "wasm-encoder" version = "0.41.2" @@ -7725,9 +7782,9 @@ dependencies = [ [[package]] name = "wasm-metadata" -version = "0.10.20" +version = "0.200.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18ebaa7bd0f9e7a5e5dd29b9a998acf21c4abed74265524dd7e85934597bfb10" +checksum = "c31b8cc0c21f46d55b0aaa419cacce1eadcf28eaebd0e1488d6a6313ee71a586" dependencies = [ "anyhow", "indexmap 2.2.3", @@ -7735,8 +7792,8 @@ dependencies = [ "serde_derive", "serde_json", "spdx", - "wasm-encoder 0.41.2", - "wasmparser 0.121.2", + "wasm-encoder 0.200.0", + "wasmparser 0.200.0", ] [[package]] @@ -7751,9 +7808,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.119.0" +version = "0.121.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c35daf77afb4f9b14016625144a391085ec2ca99ca9cc53ed291bb53ab5278d" +checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ "bitflags 2.4.2", "indexmap 2.2.3", @@ -7762,9 +7819,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.121.2" +version = "0.200.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" +checksum = "a03f65ac876612140c57ff6c3b8fe4990067cce97c2cfdb07368a3cc3354b062" dependencies = [ "bitflags 2.4.2", "indexmap 2.2.3", @@ -7807,15 +7864,59 @@ dependencies = [ "target-lexicon", "wasm-encoder 0.38.1", "wasmparser 0.118.2", - "wasmtime-cache", - "wasmtime-component-macro", - "wasmtime-component-util", - "wasmtime-cranelift", - "wasmtime-environ", - "wasmtime-fiber", + "wasmtime-cache 17.0.1", + "wasmtime-component-macro 17.0.1", + "wasmtime-component-util 17.0.1", + "wasmtime-cranelift 17.0.1", + "wasmtime-environ 17.0.1", + "wasmtime-fiber 17.0.1", "wasmtime-jit", - "wasmtime-runtime", - "wasmtime-winch", + "wasmtime-runtime 17.0.1", + "wasmtime-winch 17.0.1", + "wat", + "windows-sys 0.52.0", +] + +[[package]] +name = "wasmtime" +version = "18.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b06f80b13fdeba0ea5267813d0f06af822309f7125fc8db6094bcd485f0a4ae7" +dependencies = [ + "addr2line", + "anyhow", + "async-trait", + "bincode", + "bumpalo", + "cfg-if", + "encoding_rs", + "fxprof-processed-profile", + "gimli", + "indexmap 2.2.3", + "ittapi", + "libc", + "log", + "object", + "once_cell", + "paste", + "rayon", + "rustix", + "serde", + "serde_derive", + "serde_json", + "target-lexicon", + "wasm-encoder 0.41.2", + "wasmparser 0.121.2", + "wasmtime-cache 18.0.1", + "wasmtime-component-macro 18.0.1", + "wasmtime-component-util 18.0.1", + "wasmtime-cranelift 18.0.1", + "wasmtime-environ 18.0.1", + "wasmtime-fiber 18.0.1", + "wasmtime-jit-debug 18.0.1", + "wasmtime-jit-icache-coherence 18.0.1", + "wasmtime-runtime 18.0.1", + "wasmtime-winch 18.0.1", "wat", "windows-sys 0.52.0", ] @@ -7829,6 +7930,15 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "wasmtime-asm-macros" +version = "18.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d7395b475c6f858c7edfce375f00d8282a32fbf5d1ebc93eddfac5c2458a52" +dependencies = [ + "cfg-if", +] + [[package]] name = "wasmtime-cache" version = "17.0.1" @@ -7849,6 +7959,26 @@ dependencies = [ "zstd", ] +[[package]] +name = "wasmtime-cache" +version = "18.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0a78f86b27f099bea3aaa0894464e22e84a08cadf3d8cd353378d3d15385535" +dependencies = [ + "anyhow", + "base64 0.21.7", + "bincode", + "directories-next", + "log", + "rustix", + "serde", + "serde_derive", + "sha2 0.10.8", + "toml 0.5.11", + "windows-sys 0.52.0", + "zstd", +] + [[package]] name = "wasmtime-component-macro" version = "17.0.1" @@ -7859,9 +7989,24 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.50", - "wasmtime-component-util", - "wasmtime-wit-bindgen", - "wit-parser", + "wasmtime-component-util 17.0.1", + "wasmtime-wit-bindgen 17.0.1", + "wit-parser 0.13.2", +] + +[[package]] +name = "wasmtime-component-macro" +version = "18.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93e54483c542e304e17fa73d3f9263bf071e21915c8f048c7d42916da5b4bfd6" +dependencies = [ + "anyhow", + "proc-macro2", + "quote", + "syn 2.0.50", + "wasmtime-component-util 18.0.1", + "wasmtime-wit-bindgen 18.0.1", + "wit-parser 0.13.2", ] [[package]] @@ -7870,6 +8015,12 @@ version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8af072b7ad5ac5583e1f9e4737ebf88923de564fb5d4ace0ca9b4b720bdf95a1" +[[package]] +name = "wasmtime-component-util" +version = "18.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9f72619f484df95fc03162cdef9cb98778abc4103811849501bb34e79a3aac" + [[package]] name = "wasmtime-cranelift" version = "17.0.1" @@ -7878,21 +8029,46 @@ checksum = "df08a8bd9a68732577bee05ac685e4c247238b5e79ad9c062e2dfb4d04dca132" dependencies = [ "anyhow", "cfg-if", - "cranelift-codegen", - "cranelift-control", - "cranelift-entity", - "cranelift-frontend", - "cranelift-native", - "cranelift-wasm", + "cranelift-codegen 0.104.1", + "cranelift-control 0.104.1", + "cranelift-entity 0.104.1", + "cranelift-frontend 0.104.1", + "cranelift-native 0.104.1", + "cranelift-wasm 0.104.1", "gimli", "log", "object", "target-lexicon", "thiserror", "wasmparser 0.118.2", - "wasmtime-cranelift-shared", - "wasmtime-environ", - "wasmtime-versioned-export-macros", + "wasmtime-cranelift-shared 17.0.1", + "wasmtime-environ 17.0.1", + "wasmtime-versioned-export-macros 17.0.1", +] + +[[package]] +name = "wasmtime-cranelift" +version = "18.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "974d9455611e26c97d31705e19545de58fa8867416592bd93b7a54a7fc37cedb" +dependencies = [ + "anyhow", + "cfg-if", + "cranelift-codegen 0.105.1", + "cranelift-control 0.105.1", + "cranelift-entity 0.105.1", + "cranelift-frontend 0.105.1", + "cranelift-native 0.105.1", + "cranelift-wasm 0.105.1", + "gimli", + "log", + "object", + "target-lexicon", + "thiserror", + "wasmparser 0.121.2", + "wasmtime-cranelift-shared 18.0.1", + "wasmtime-environ 18.0.1", + "wasmtime-versioned-export-macros 18.0.1", ] [[package]] @@ -7902,13 +8078,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "404201c9e669083f189f01337b3ed0aa0eb081157fb4e170bbfe193df9497771" dependencies = [ "anyhow", - "cranelift-codegen", - "cranelift-control", - "cranelift-native", + "cranelift-codegen 0.104.1", + "cranelift-control 0.104.1", + "cranelift-native 0.104.1", + "gimli", + "object", + "target-lexicon", + "wasmtime-environ 17.0.1", +] + +[[package]] +name = "wasmtime-cranelift-shared" +version = "18.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40667ba458634db703aea3bd960e80bc9352c21d5e765b69f43e3b0c964eb611" +dependencies = [ + "anyhow", + "cranelift-codegen 0.105.1", + "cranelift-control 0.105.1", + "cranelift-native 0.105.1", "gimli", "object", "target-lexicon", - "wasmtime-environ", + "wasmtime-environ 18.0.1", ] [[package]] @@ -7918,7 +8110,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e696b4911c9a69c3c2892ec05eb41bb15436d1a46d8830a755c40f5df47546a" dependencies = [ "anyhow", - "cranelift-entity", + "cranelift-entity 0.104.1", "gimli", "indexmap 2.2.3", "log", @@ -7930,8 +8122,34 @@ dependencies = [ "wasm-encoder 0.38.1", "wasmparser 0.118.2", "wasmprinter", - "wasmtime-component-util", - "wasmtime-types", + "wasmtime-component-util 17.0.1", + "wasmtime-types 17.0.1", +] + +[[package]] +name = "wasmtime-environ" +version = "18.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8da991421528c2767053cb0cfa70b5d28279100dbcf70ed7f74b51abe1656ef" +dependencies = [ + "anyhow", + "bincode", + "cpp_demangle", + "cranelift-entity 0.105.1", + "gimli", + "indexmap 2.2.3", + "log", + "object", + "rustc-demangle", + "serde", + "serde_derive", + "target-lexicon", + "thiserror", + "wasm-encoder 0.41.2", + "wasmparser 0.121.2", + "wasmprinter", + "wasmtime-component-util 18.0.1", + "wasmtime-types 18.0.1", ] [[package]] @@ -7944,8 +8162,23 @@ dependencies = [ "cc", "cfg-if", "rustix", - "wasmtime-asm-macros", - "wasmtime-versioned-export-macros", + "wasmtime-asm-macros 17.0.1", + "wasmtime-versioned-export-macros 17.0.1", + "windows-sys 0.52.0", +] + +[[package]] +name = "wasmtime-fiber" +version = "18.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fdd780272515bfcdf316e2efe20231719ec40223d67fcdd7d17068a16d39384" +dependencies = [ + "anyhow", + "cc", + "cfg-if", + "rustix", + "wasmtime-asm-macros 18.0.1", + "wasmtime-versioned-export-macros 18.0.1", "windows-sys 0.52.0", ] @@ -7969,10 +8202,10 @@ dependencies = [ "serde", "serde_derive", "target-lexicon", - "wasmtime-environ", - "wasmtime-jit-debug", - "wasmtime-jit-icache-coherence", - "wasmtime-runtime", + "wasmtime-environ 17.0.1", + "wasmtime-jit-debug 17.0.1", + "wasmtime-jit-icache-coherence 17.0.1", + "wasmtime-runtime 17.0.1", "windows-sys 0.52.0", ] @@ -7985,7 +8218,19 @@ dependencies = [ "object", "once_cell", "rustix", - "wasmtime-versioned-export-macros", + "wasmtime-versioned-export-macros 17.0.1", +] + +[[package]] +name = "wasmtime-jit-debug" +version = "18.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87be9ed561dbe2aca3bde30d442c292fda53748343d0220873d1df65270c8fcf" +dependencies = [ + "object", + "once_cell", + "rustix", + "wasmtime-versioned-export-macros 18.0.1", ] [[package]] @@ -7999,6 +8244,17 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "18.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3346431a41fbb0c5af0081c2322361b00289f2902e54ee7b115e9b2ad32b156b" +dependencies = [ + "cfg-if", + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "wasmtime-runtime" version = "17.0.1" @@ -8020,12 +8276,42 @@ dependencies = [ "rustix", "sptr", "wasm-encoder 0.38.1", - "wasmtime-asm-macros", - "wasmtime-environ", - "wasmtime-fiber", - "wasmtime-jit-debug", - "wasmtime-versioned-export-macros", - "wasmtime-wmemcheck", + "wasmtime-asm-macros 17.0.1", + "wasmtime-environ 17.0.1", + "wasmtime-fiber 17.0.1", + "wasmtime-jit-debug 17.0.1", + "wasmtime-versioned-export-macros 17.0.1", + "wasmtime-wmemcheck 17.0.1", + "windows-sys 0.52.0", +] + +[[package]] +name = "wasmtime-runtime" +version = "18.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a489353aa297b46a66cde8da48cab8e1e967e7f4b0ae3d9889a0550bf274810b" +dependencies = [ + "anyhow", + "cc", + "cfg-if", + "encoding_rs", + "indexmap 2.2.3", + "libc", + "log", + "mach", + "memfd", + "memoffset", + "paste", + "psm", + "rustix", + "sptr", + "wasm-encoder 0.41.2", + "wasmtime-asm-macros 18.0.1", + "wasmtime-environ 18.0.1", + "wasmtime-fiber 18.0.1", + "wasmtime-jit-debug 18.0.1", + "wasmtime-versioned-export-macros 18.0.1", + "wasmtime-wmemcheck 18.0.1", "windows-sys 0.52.0", ] @@ -8035,13 +8321,26 @@ version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52e799cff634d30fd042db96b417d515e54f903b95f8c1e0ec60e8f604479485" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.104.1", "serde", "serde_derive", "thiserror", "wasmparser 0.118.2", ] +[[package]] +name = "wasmtime-types" +version = "18.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12c56e31fd7fa707fbd7720b2b29ac42ccfb092fe9d85c98f1d3988f9a1d4558" +dependencies = [ + "cranelift-entity 0.105.1", + "serde", + "serde_derive", + "thiserror", + "wasmparser 0.121.2", +] + [[package]] name = "wasmtime-versioned-export-macros" version = "17.0.1" @@ -8053,11 +8352,22 @@ dependencies = [ "syn 2.0.50", ] +[[package]] +name = "wasmtime-versioned-export-macros" +version = "18.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b0300976c36a9427d184e3ecf7c121c2cb3f030844faf9fcb767821e9d4c382" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.50", +] + [[package]] name = "wasmtime-wasi" -version = "17.0.1" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494f99111a165dcddc69aaa5fa23604f49dcfab479a869edd84581abd6ac569b" +checksum = "8f7d9cfaf9f70e83a164f5d772e376fafa2d7b7b0ca2ef88f9bcaf8b2363a38b" dependencies = [ "anyhow", "async-trait", @@ -8072,7 +8382,6 @@ dependencies = [ "futures", "io-extras", "io-lifetimes", - "libc", "log", "once_cell", "rustix", @@ -8082,8 +8391,7 @@ dependencies = [ "tracing", "url", "wasi-common", - "wasi-tokio", - "wasmtime", + "wasmtime 18.0.1", "wiggle", "windows-sys 0.52.0", ] @@ -8095,14 +8403,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3f5d76d399cb4423e6f178bc154a0e1c314711e28dabaa6e757e56628a083ec" dependencies = [ "anyhow", - "cranelift-codegen", + "cranelift-codegen 0.104.1", "gimli", "object", "target-lexicon", "wasmparser 0.118.2", - "wasmtime-cranelift-shared", - "wasmtime-environ", - "winch-codegen", + "wasmtime-cranelift-shared 17.0.1", + "wasmtime-environ 17.0.1", + "winch-codegen 0.15.1", +] + +[[package]] +name = "wasmtime-winch" +version = "18.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f773a904d2bd5ecd8ad095f4c965ad56a836929d8c26368621f75328d500649" +dependencies = [ + "anyhow", + "cranelift-codegen 0.105.1", + "gimli", + "object", + "target-lexicon", + "wasmparser 0.121.2", + "wasmtime-cranelift-shared 18.0.1", + "wasmtime-environ 18.0.1", + "winch-codegen 0.16.1", ] [[package]] @@ -8114,7 +8439,19 @@ dependencies = [ "anyhow", "heck", "indexmap 2.2.3", - "wit-parser", + "wit-parser 0.13.2", +] + +[[package]] +name = "wasmtime-wit-bindgen" +version = "18.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e9754e0a526238ea66da9ba21965a54846a2b22d9de89a298fb8998389507" +dependencies = [ + "anyhow", + "heck", + "indexmap 2.2.3", + "wit-parser 0.13.2", ] [[package]] @@ -8123,6 +8460,12 @@ version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5da08ab734954e16f57be38423b90c25a0b13420e51cbd0a2e37b86a468a988c" +[[package]] +name = "wasmtime-wmemcheck" +version = "18.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdf5b8da6ebf7549dad0cd32ca4a3a0461449ef4feec9d0d8450d8da9f51f9b" + [[package]] name = "wast" version = "35.0.2" @@ -8209,24 +8552,24 @@ checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" [[package]] name = "wiggle" -version = "17.0.1" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd5b200b5dd3d5d7cc4093166f4f916d2d2839296cf1b1757b9726635f6425c3" +checksum = "454570f4fecadb881f0ba157e98b575a2850607a9eac79d8868f3ab70633f632" dependencies = [ "anyhow", "async-trait", "bitflags 2.4.2", "thiserror", "tracing", - "wasmtime", + "wasmtime 18.0.1", "wiggle-macro", ] [[package]] name = "wiggle-generate" -version = "17.0.1" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4dc34a2bc1091599de005e9b854cd1a9ea35b16ca51cac2797274c1a2666e06" +checksum = "443ac1ebb753ca22bca98d01742762de1243ff722839907c35ea683a8264c74e" dependencies = [ "anyhow", "heck", @@ -8239,9 +8582,9 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "17.0.1" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ba3b37f402a7513b9ed7973a6e907074987b3afdcede98d3d79939b3e76f1b" +checksum = "9e9e2f1f06ae07bac15273774782c04ab14e9adfbf414762fc84dbbfcf7fb1ac" dependencies = [ "proc-macro2", "quote", @@ -8287,13 +8630,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d921185084e134e897e0e202e129a422306d0f1391954ecf4928d36defa897d" dependencies = [ "anyhow", - "cranelift-codegen", + "cranelift-codegen 0.104.1", "gimli", "regalloc2", "smallvec", "target-lexicon", "wasmparser 0.118.2", - "wasmtime-environ", + "wasmtime-environ 17.0.1", +] + +[[package]] +name = "winch-codegen" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52f7eaac56988f986181099c15860946fea93ed826322a1f92c4ff04541b7744" +dependencies = [ + "anyhow", + "cranelift-codegen 0.105.1", + "gimli", + "regalloc2", + "smallvec", + "target-lexicon", + "wasmparser 0.121.2", + "wasmtime-environ 18.0.1", ] [[package]] @@ -8321,7 +8680,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.3", ] [[package]] @@ -8339,7 +8698,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.3", ] [[package]] @@ -8359,17 +8718,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "d380ba1dc7187569a8a9e91ed34b8ccfc33123bbacb8c0aed2d1ad7f3ef2dc5f" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.3", + "windows_aarch64_msvc 0.52.3", + "windows_i686_gnu 0.52.3", + "windows_i686_msvc 0.52.3", + "windows_x86_64_gnu 0.52.3", + "windows_x86_64_gnullvm 0.52.3", + "windows_x86_64_msvc 0.52.3", ] [[package]] @@ -8380,9 +8739,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "68e5dcfb9413f53afd9c8f86e56a7b4d86d9a2fa26090ea2dc9e40fba56c6ec6" [[package]] name = "windows_aarch64_msvc" @@ -8392,9 +8751,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "8dab469ebbc45798319e69eebf92308e541ce46760b49b18c6b3fe5e8965b30f" [[package]] name = "windows_i686_gnu" @@ -8404,9 +8763,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "2a4e9b6a7cac734a8b4138a4e1044eac3404d8326b6c0f939276560687a033fb" [[package]] name = "windows_i686_msvc" @@ -8416,9 +8775,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "28b0ec9c422ca95ff34a78755cfa6ad4a51371da2a5ace67500cf7ca5f232c58" [[package]] name = "windows_x86_64_gnu" @@ -8428,9 +8787,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "704131571ba93e89d7cd43482277d6632589b18ecf4468f591fbae0a8b101614" [[package]] name = "windows_x86_64_gnullvm" @@ -8440,9 +8799,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "42079295511643151e98d61c38c0acc444e52dd42ab456f7ccfd5152e8ecf21c" [[package]] name = "windows_x86_64_msvc" @@ -8452,9 +8811,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "0770833d60a970638e989b3fa9fd2bb1aaadcf88963d1659fd7d9990196ed2d6" [[package]] name = "winnow" @@ -8514,9 +8873,9 @@ dependencies = [ [[package]] name = "wit-component" -version = "0.19.1" +version = "0.200.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "429e3c06fba3a7566aab724ae3ffff3152ede5399d44789e7dd11f5421292859" +checksum = "39979723340baea490b87b11b2abae05f149d86f2b55c18d41d78a2a2b284c16" dependencies = [ "anyhow", "bitflags 2.4.2", @@ -8525,10 +8884,10 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "wasm-encoder 0.39.0", + "wasm-encoder 0.200.0", "wasm-metadata", - "wasmparser 0.119.0", - "wit-parser", + "wasmparser 0.200.0", + "wit-parser 0.200.0", ] [[package]] @@ -8548,6 +8907,24 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "wit-parser" +version = "0.200.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f717576b37f01c15696bda7f6f13868367b9c5913485f9f0ec8e59fd28c8e13" +dependencies = [ + "anyhow", + "id-arena", + "indexmap 2.2.3", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser 0.200.0", +] + [[package]] name = "witx" version = "0.9.1" diff --git a/homestar-wasm/Cargo.toml b/homestar-wasm/Cargo.toml index 2fefd665..fc5c582b 100644 --- a/homestar-wasm/Cargo.toml +++ b/homestar-wasm/Cargo.toml @@ -34,8 +34,8 @@ serde = { workspace = true } stacker = "0.1" thiserror = { workspace = true } tracing = { workspace = true } -wasmparser = "0.118" -wasmtime = { version = "17.0", default-features = false, features = [ +wasmparser = "0.200" +wasmtime = { version = "18.0", default-features = false, features = [ "async", "component-model", "cranelift", @@ -43,13 +43,13 @@ wasmtime = { version = "17.0", default-features = false, features = [ "pooling-allocator", "wat", ] } -wasmtime-component-util = "17.0" -wasmtime-wasi = { version = "17.0", default-features = false, features = [ +wasmtime-component-util = "18.0" +wasmtime-wasi = { version = "18.0", default-features = false, features = [ "tokio", "preview1-on-preview2", ] } wat = "1.200" -wit-component = "0.19" +wit-component = "0.200" [dev-dependencies] criterion = "0.5" diff --git a/homestar-wasm/src/wasmtime/world.rs b/homestar-wasm/src/wasmtime/world.rs index ce21cbe1..c30c43a2 100644 --- a/homestar-wasm/src/wasmtime/world.rs +++ b/homestar-wasm/src/wasmtime/world.rs @@ -74,19 +74,11 @@ impl Default for State { /// /// [WasiView]: wasmtime_wasi::preview2::WasiView impl wasmtime_wasi::preview2::WasiView for State { - fn table(&self) -> &wasmtime::component::ResourceTable { - &self.table - } - - fn table_mut(&mut self) -> &mut wasmtime::component::ResourceTable { + fn table(&mut self) -> &mut wasmtime::component::ResourceTable { &mut self.table } - fn ctx(&self) -> &wasmtime_wasi::preview2::WasiCtx { - &self.wasi_ctx - } - - fn ctx_mut(&mut self) -> &mut wasmtime_wasi::preview2::WasiCtx { + fn ctx(&mut self) -> &mut wasmtime_wasi::preview2::WasiCtx { &mut self.wasi_ctx } }