From 252389d7b889e2f362f02e057920f948357f2a88 Mon Sep 17 00:00:00 2001 From: Zeeshan Lakhani Date: Thu, 22 Feb 2024 20:06:30 -0500 Subject: [PATCH] chore: wasmtime 17->18 --- Cargo.lock | 311 ++++++++++++---------------- homestar-wasm/Cargo.toml | 10 +- homestar-wasm/src/wasmtime/world.rs | 12 +- homestar-workspace-hack/Cargo.toml | 12 +- 4 files changed, 141 insertions(+), 204 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d620f090..359228d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1134,18 +1134,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.104.0" +version = "0.105.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d819feeda4c420a18f1e28236ca0ce1177b22bf7c8a44ddee92dfe40de15bcf0" +checksum = "29a6391a9172a93f413370fa561c6bca786e06c89cf85f23f02f6345b1c8ee34" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.104.0" +version = "0.105.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9b8d03d5bdbca7e5f72b0e0a0f69933ed1f09e24be6c075aa6fe3f802b0cc0c" +checksum = "409c6cbb326604a53ec47eb6341fc85128f24c81012a014b4c728ed24f6e9350" dependencies = [ "bumpalo", "cranelift-bforest", @@ -1164,33 +1164,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.104.0" +version = "0.105.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3fd3664e38e51649b17dc30cfdd561273fe2f590dcd013fb75d9eabc6272dfb" +checksum = "fff55e100130995b9ad9ac6b03a24ed5da3c1a1261dcdeb8a7a0292656994fb3" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.104.0" +version = "0.105.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b031ec5e605828975952622b5a77d49126f20ffe88d33719a0af66b23a0fc36" +checksum = "f1446e2eb395fc7b3019a36dccb7eccea923f6caf581b903c8e7e751b6d214a7" [[package]] name = "cranelift-control" -version = "0.104.0" +version = "0.105.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fada054d017cf2ed8f7ed2336e0517fc1b19e6825be1790de9eb00c94788362b" +checksum = "24076ecf69cbf8b9e1e532ae8e7ac01d850a1c2e127058a26eb3245f9d5b89d1" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.104.0" +version = "0.105.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177b6f94ae8de6348eb45bf977c79ab9e3c40fc3ac8cb7ed8109560ea39bee7d" +checksum = "7f40df95180ad317c60459bb90dd87803d35e538f4c54376d8b26c851f6f0a1b" dependencies = [ "serde", "serde_derive", @@ -1198,9 +1198,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.104.0" +version = "0.105.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebebd23a69a23e3ddea78e98ff3a2de222e88c8e045d81ef4a72f042e0d79dbd" +checksum = "1c3974cc665b699b626742775dae1c1cdea5170f5028ab1f3eb61a7a9a6e2979" dependencies = [ "cranelift-codegen", "log", @@ -1210,15 +1210,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.104.0" +version = "0.105.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1571bfc14df8966d12c6121b5325026591a4b4009e22fea0fe3765ab7cd33b96" +checksum = "99543f92b9c361f3c54a29e945adb5b9ef1318feaa5944453cabbfcb3c495919" [[package]] name = "cranelift-native" -version = "0.104.0" +version = "0.105.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35a69c37e0c10b46fe5527f2397ac821046efbf5f7ec112c8b84df25712f465b" +checksum = "1c0d84dc7d9b3f73ad565eacc4ab36525c407ef5150893b4b94d5f5f904eb48a" dependencies = [ "cranelift-codegen", "libc", @@ -1227,9 +1227,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.104.0" +version = "0.105.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b3fef8bbceb8cb56d3f1778b0418d75c5cf12ec571a35fc01eb41abb0227a25" +checksum = "53781039219944d59c6d3ec57e6cae31a1a33db71573a945d84ba6d875d0a743" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1237,7 +1237,7 @@ dependencies = [ "itertools 0.10.5", "log", "smallvec", - "wasmparser 0.118.1", + "wasmparser 0.121.0", "wasmtime-types", ] @@ -2680,7 +2680,7 @@ dependencies = [ "thiserror", "tokio", "tracing", - "wasmparser 0.118.1", + "wasmparser 0.200.0", "wasmtime", "wasmtime-component-util", "wasmtime-wasi", @@ -2788,7 +2788,7 @@ dependencies = [ "url", "uuid", "wasmtime", - "wasmtime-jit", + "wasmtime-environ", "wasmtime-runtime", "zeroize", ] @@ -7561,13 +7561,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasi-cap-std-sync" -version = "17.0.0" +name = "wasi-common" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db014d2ced91f17d1f1a8f2b76d6ea8d731bc1dbc8c2bbaec689d6a242568e5d" +checksum = "082a661fe31df4dbb34409f4835ad3d8ba65036bf74aaec9b21fde779978aba7" dependencies = [ "anyhow", - "async-trait", + "bitflags 2.4.2", "cap-fs-ext", "cap-rand", "cap-std", @@ -7575,51 +7575,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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449d17849e3c83a931374442fe2deee4d6bd1ebf469719ef44192e9e82e19c89" -dependencies = [ - "anyhow", - "bitflags 2.4.2", - "cap-rand", - "cap-std", - "io-extras", - "log", - "rustix", "thiserror", + "tokio", "tracing", "wasmtime", "wiggle", "windows-sys 0.52.0", ] -[[package]] -name = "wasi-tokio" -version = "17.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcb815cab6d4688a72de1c2fd4c4f32925b6f5200d268fedba6ce6958124b25" -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" @@ -7688,36 +7655,27 @@ checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "wasm-encoder" -version = "0.38.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad2b51884de9c7f4fe2fd1043fccb8dcad4b1e29558146ee57a144d15779f3f" -dependencies = [ - "leb128", -] - -[[package]] -name = "wasm-encoder" -version = "0.39.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111495d6204760238512f57a9af162f45086504da332af210f2f75dd80b34f1d" +checksum = "e09bca7d6388637d27fb5edbeab11f56bfabcef8743c55ae34370e1e5030a071" dependencies = [ "leb128", ] [[package]] name = "wasm-encoder" -version = "0.41.0" +version = "0.200.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e09bca7d6388637d27fb5edbeab11f56bfabcef8743c55ae34370e1e5030a071" +checksum = "b9e3fb0c8fbddd78aa6095b850dfeedbc7506cf5f81e633f69cf8f2333ab84b9" dependencies = [ "leb128", ] [[package]] name = "wasm-metadata" -version = "0.10.17" +version = "0.200.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c853d3809fc9fccf3bc0ad63f4f51d8eefad0bacf88f957aa991c1d9b88b016e" +checksum = "c31b8cc0c21f46d55b0aaa419cacce1eadcf28eaebd0e1488d6a6313ee71a586" dependencies = [ "anyhow", "indexmap 2.2.2", @@ -7725,25 +7683,15 @@ dependencies = [ "serde_derive", "serde_json", "spdx", - "wasm-encoder 0.41.0", - "wasmparser 0.121.0", + "wasm-encoder 0.200.0", + "wasmparser 0.200.0", ] [[package]] name = "wasmparser" -version = "0.118.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ee9723b928e735d53000dec9eae7b07a60e490c85ab54abb66659fc61bfcd9" -dependencies = [ - "indexmap 2.2.2", - "semver", -] - -[[package]] -name = "wasmparser" -version = "0.119.0" +version = "0.121.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c35daf77afb4f9b14016625144a391085ec2ca99ca9cc53ed291bb53ab5278d" +checksum = "953cf6a7606ab31382cb1caa5ae403e77ba70c7f8e12eeda167e7040d42bfda8" dependencies = [ "bitflags 2.4.2", "indexmap 2.2.2", @@ -7752,9 +7700,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.121.0" +version = "0.200.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953cf6a7606ab31382cb1caa5ae403e77ba70c7f8e12eeda167e7040d42bfda8" +checksum = "a03f65ac876612140c57ff6c3b8fe4990067cce97c2cfdb07368a3cc3354b062" dependencies = [ "bitflags 2.4.2", "indexmap 2.2.2", @@ -7773,10 +7721,11 @@ dependencies = [ [[package]] name = "wasmtime" -version = "17.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "910fabce77e660f0e0e41cfd5f69fc8bf020a025f059718846e918db7177f469" +checksum = "b06f80b13fdeba0ea5267813d0f06af822309f7125fc8db6094bcd485f0a4ae7" dependencies = [ + "addr2line", "anyhow", "async-trait", "bincode", @@ -7784,26 +7733,30 @@ dependencies = [ "cfg-if", "encoding_rs", "fxprof-processed-profile", + "gimli", "indexmap 2.2.2", + "ittapi", "libc", "log", "object", "once_cell", "paste", "rayon", + "rustix", "serde", "serde_derive", "serde_json", "target-lexicon", - "wasm-encoder 0.38.1", - "wasmparser 0.118.1", + "wasm-encoder 0.41.0", + "wasmparser 0.121.0", "wasmtime-cache", "wasmtime-component-macro", "wasmtime-component-util", "wasmtime-cranelift", "wasmtime-environ", "wasmtime-fiber", - "wasmtime-jit", + "wasmtime-jit-debug", + "wasmtime-jit-icache-coherence", "wasmtime-runtime", "wasmtime-winch", "wat", @@ -7812,18 +7765,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "17.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37288142e9b4a61655a3bcbdc7316c2e4bb9e776b10ce3dd758f8186b4469572" +checksum = "19d7395b475c6f858c7edfce375f00d8282a32fbf5d1ebc93eddfac5c2458a52" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "17.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45cbd74a636f09d2108f9405c79857f061e19323e4abeed22e837cfe7b08a22b" +checksum = "c0a78f86b27f099bea3aaa0894464e22e84a08cadf3d8cd353378d3d15385535" dependencies = [ "anyhow", "base64 0.21.7", @@ -7841,9 +7794,9 @@ dependencies = [ [[package]] name = "wasmtime-component-macro" -version = "17.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad63de18eb42e586386b6091f787c82707cbd5ac5e9343216dba1976190cd03a" +checksum = "93e54483c542e304e17fa73d3f9263bf071e21915c8f048c7d42916da5b4bfd6" dependencies = [ "anyhow", "proc-macro2", @@ -7851,20 +7804,20 @@ dependencies = [ "syn 2.0.48", "wasmtime-component-util", "wasmtime-wit-bindgen", - "wit-parser", + "wit-parser 0.13.1", ] [[package]] name = "wasmtime-component-util" -version = "17.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e0a160c0c44369aa4bee6d311a8e4366943bab1651040cc8b0fcec2c9eb8906" +checksum = "2c9f72619f484df95fc03162cdef9cb98778abc4103811849501bb34e79a3aac" [[package]] name = "wasmtime-cranelift" -version = "17.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3734cc01b7cd37bc62fdbcd9529ca9547440052d4b3886cfdec3b8081a5d3647" +checksum = "974d9455611e26c97d31705e19545de58fa8867416592bd93b7a54a7fc37cedb" dependencies = [ "anyhow", "cfg-if", @@ -7879,7 +7832,7 @@ dependencies = [ "object", "target-lexicon", "thiserror", - "wasmparser 0.118.1", + "wasmparser 0.121.0", "wasmtime-cranelift-shared", "wasmtime-environ", "wasmtime-versioned-export-macros", @@ -7887,9 +7840,9 @@ dependencies = [ [[package]] name = "wasmtime-cranelift-shared" -version = "17.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0eb33cd30c47844aa228d4d0030587e65c1108343f311fe9f7248b5bd9cb65c" +checksum = "40667ba458634db703aea3bd960e80bc9352c21d5e765b69f43e3b0c964eb611" dependencies = [ "anyhow", "cranelift-codegen", @@ -7903,22 +7856,25 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "17.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a056b041fdea604f0972e2fae97958e7748d629a55180228348baefdfc217" +checksum = "e8da991421528c2767053cb0cfa70b5d28279100dbcf70ed7f74b51abe1656ef" dependencies = [ "anyhow", + "bincode", + "cpp_demangle", "cranelift-entity", "gimli", "indexmap 2.2.2", "log", "object", + "rustc-demangle", "serde", "serde_derive", "target-lexicon", "thiserror", - "wasm-encoder 0.38.1", - "wasmparser 0.118.1", + "wasm-encoder 0.41.0", + "wasmparser 0.121.0", "wasmprinter", "wasmtime-component-util", "wasmtime-types", @@ -7926,9 +7882,9 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "17.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43987d0977c07f15c3608c2f255870c127ffd19e35eeedb1ac1dccedf9932a42" +checksum = "6fdd780272515bfcdf316e2efe20231719ec40223d67fcdd7d17068a16d39384" dependencies = [ "anyhow", "cc", @@ -7939,38 +7895,11 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "wasmtime-jit" -version = "17.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b3e48395ac672b386ed588d97a9612aa13a345008f26466f0dfb2a91628aa9f" -dependencies = [ - "addr2line", - "anyhow", - "bincode", - "cfg-if", - "cpp_demangle", - "gimli", - "ittapi", - "log", - "object", - "rustc-demangle", - "rustix", - "serde", - "serde_derive", - "target-lexicon", - "wasmtime-environ", - "wasmtime-jit-debug", - "wasmtime-jit-icache-coherence", - "wasmtime-runtime", - "windows-sys 0.52.0", -] - [[package]] name = "wasmtime-jit-debug" -version = "17.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd21fd0f5ca68681d3d5b636eea00f182d0f9d764144469e9257fd7e3f55ae0e" +checksum = "87be9ed561dbe2aca3bde30d442c292fda53748343d0220873d1df65270c8fcf" dependencies = [ "object", "once_cell", @@ -7980,9 +7909,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "17.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdc26415bb89e9ccd3bdc498fef63aabf665c4c0dd710c107691deb9694955da" +checksum = "3346431a41fbb0c5af0081c2322361b00289f2902e54ee7b115e9b2ad32b156b" dependencies = [ "cfg-if", "libc", @@ -7991,9 +7920,9 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "17.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0abddaf17912aabaf39be0802d5eba9a002e956e902d1ebd438a2fe1c88769a2" +checksum = "a489353aa297b46a66cde8da48cab8e1e967e7f4b0ae3d9889a0550bf274810b" dependencies = [ "anyhow", "cc", @@ -8009,7 +7938,7 @@ dependencies = [ "psm", "rustix", "sptr", - "wasm-encoder 0.38.1", + "wasm-encoder 0.41.0", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-fiber", @@ -8021,22 +7950,22 @@ dependencies = [ [[package]] name = "wasmtime-types" -version = "17.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b35a95cdc1433729085beab42c0a5c742b431f25b17c40d7718e46df63d5ffc7" +checksum = "12c56e31fd7fa707fbd7720b2b29ac42ccfb092fe9d85c98f1d3988f9a1d4558" dependencies = [ "cranelift-entity", "serde", "serde_derive", "thiserror", - "wasmparser 0.118.1", + "wasmparser 0.121.0", ] [[package]] name = "wasmtime-versioned-export-macros" -version = "17.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad322733fe67e45743784d8b1df452bcb54f581572a4f1a646a4332deecbcc2" +checksum = "6b0300976c36a9427d184e3ecf7c121c2cb3f030844faf9fcb767821e9d4c382" dependencies = [ "proc-macro2", "quote", @@ -8045,9 +7974,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi" -version = "17.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "902cc299b73655c36679b77efdfce4bb5971992f1a4a8a436dd3809a6848ff0e" +checksum = "8f7d9cfaf9f70e83a164f5d772e376fafa2d7b7b0ca2ef88f9bcaf8b2363a38b" dependencies = [ "anyhow", "async-trait", @@ -8062,7 +7991,6 @@ dependencies = [ "futures", "io-extras", "io-lifetimes", - "libc", "log", "once_cell", "rustix", @@ -8072,7 +8000,6 @@ dependencies = [ "tracing", "url", "wasi-common", - "wasi-tokio", "wasmtime", "wiggle", "windows-sys 0.52.0", @@ -8080,16 +8007,16 @@ dependencies = [ [[package]] name = "wasmtime-winch" -version = "17.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e63aeca929f84560eec52c5af43bf5d623b92683b0195d9fb06da8ed860e092" +checksum = "1f773a904d2bd5ecd8ad095f4c965ad56a836929d8c26368621f75328d500649" dependencies = [ "anyhow", "cranelift-codegen", "gimli", "object", "target-lexicon", - "wasmparser 0.118.1", + "wasmparser 0.121.0", "wasmtime-cranelift-shared", "wasmtime-environ", "winch-codegen", @@ -8097,21 +8024,21 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "17.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41e5675998fdc74495afdd90ad2bd221206a258075b23048af0535a969b07893" +checksum = "ff6e9754e0a526238ea66da9ba21965a54846a2b22d9de89a298fb8998389507" dependencies = [ "anyhow", "heck", "indexmap 2.2.2", - "wit-parser", + "wit-parser 0.13.1", ] [[package]] name = "wasmtime-wmemcheck" -version = "17.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b20a19e10d8cb50b45412fb21192982b7ce85c0122dc33bb71f1813e25dc6e52" +checksum = "acdf5b8da6ebf7549dad0cd32ca4a3a0461449ef4feec9d0d8450d8da9f51f9b" [[package]] name = "wast" @@ -8199,9 +8126,9 @@ checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" [[package]] name = "wiggle" -version = "17.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "737728db69a7657a5f6a7bac445c02d8564d603d62c46c95edf928554e67d072" +checksum = "454570f4fecadb881f0ba157e98b575a2850607a9eac79d8868f3ab70633f632" dependencies = [ "anyhow", "async-trait", @@ -8214,9 +8141,9 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "17.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2460c7163b79ffefd9a564eaeab0a5b0e84bb91afdfeeb84d36f304ddbe08982" +checksum = "443ac1ebb753ca22bca98d01742762de1243ff722839907c35ea683a8264c74e" dependencies = [ "anyhow", "heck", @@ -8229,9 +8156,9 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "17.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8d8412375ba8325d61fbae56dead51dabfaec85d620ce36427922fb9cece83" +checksum = "9e9e2f1f06ae07bac15273774782c04ab14e9adfbf414762fc84dbbfcf7fb1ac" dependencies = [ "proc-macro2", "quote", @@ -8272,9 +8199,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "0.15.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d2b346bad5397b219b4ff0a8fa7230936061ff07c61f05d589d8d81e06fb7b2" +checksum = "52f7eaac56988f986181099c15860946fea93ed826322a1f92c4ff04541b7744" dependencies = [ "anyhow", "cranelift-codegen", @@ -8282,7 +8209,7 @@ dependencies = [ "regalloc2", "smallvec", "target-lexicon", - "wasmparser 0.118.1", + "wasmparser 0.121.0", "wasmtime-environ", ] @@ -8495,9 +8422,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", @@ -8506,10 +8433,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]] @@ -8529,6 +8456,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.2", + "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 57586506..fd36b6f1 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.0" -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 } } diff --git a/homestar-workspace-hack/Cargo.toml b/homestar-workspace-hack/Cargo.toml index f70214f2..6bfaa8e1 100644 --- a/homestar-workspace-hack/Cargo.toml +++ b/homestar-workspace-hack/Cargo.toml @@ -81,9 +81,9 @@ typenum = { version = "1.17.0", default-features = false, features = ["const-gen unsigned-varint = { version = "0.7.2", default-features = false, features = ["asynchronous_codec"] } url = { version = "2.5.0", features = ["serde"] } uuid = { version = "1.7.0", features = ["fast-rng", "v4"] } -wasmtime = { version = "17.0.0", features = ["component-model"] } -wasmtime-jit = { version = "17.0.0", default-features = false, features = ["addr2line", "debug-builtins", "demangle", "profiling"] } -wasmtime-runtime = { version = "17.0.0", default-features = false, features = ["async", "component-model", "debug-builtins", "pooling-allocator"] } +wasmtime = { version = "18.0.1" } +wasmtime-environ = { version = "18.0.1", default-features = false, features = ["component-model", "demangle"] } +wasmtime-runtime = { version = "18.0.1", default-features = false, features = ["async", "component-model", "debug-builtins", "pooling-allocator"] } zeroize = { version = "1.7.0", features = ["zeroize_derive"] } [build-dependencies] @@ -156,9 +156,9 @@ typenum = { version = "1.17.0", default-features = false, features = ["const-gen unsigned-varint = { version = "0.7.2", default-features = false, features = ["asynchronous_codec"] } url = { version = "2.5.0", features = ["serde"] } uuid = { version = "1.7.0", features = ["fast-rng", "v4"] } -wasmtime = { version = "17.0.0", features = ["component-model"] } -wasmtime-jit = { version = "17.0.0", default-features = false, features = ["addr2line", "debug-builtins", "demangle", "profiling"] } -wasmtime-runtime = { version = "17.0.0", default-features = false, features = ["async", "component-model", "debug-builtins", "pooling-allocator"] } +wasmtime = { version = "18.0.1" } +wasmtime-environ = { version = "18.0.1", default-features = false, features = ["component-model", "demangle"] } +wasmtime-runtime = { version = "18.0.1", default-features = false, features = ["async", "component-model", "debug-builtins", "pooling-allocator"] } zeroize = { version = "1.7.0", features = ["zeroize_derive"] } [target.x86_64-apple-darwin.dependencies]