diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4673605..f28cb39 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -28,7 +28,7 @@ jobs: uses: actions-rs/cargo@v1 with: command: clippy - args: --workspace + args: --workspace --all-targets check_fmt_and_docs: name: Checking Format and Docs runs-on: ubuntu-latest diff --git a/Cargo.lock b/Cargo.lock index fd09463..7f3c1f1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,7 +8,16 @@ version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ - "gimli", + "gimli 0.31.1", +] + +[[package]] +name = "addr2line" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9acbfca36652500c911ddb767ed433e3ed99b032b5d935be73c6923662db1d43" +dependencies = [ + "gimli 0.32.2", ] [[package]] @@ -135,11 +144,11 @@ version = "0.3.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" dependencies = [ - "addr2line", + "addr2line 0.24.2", "cfg-if", "libc", "miniz_oxide", - "object", + "object 0.36.7", "rustc-demangle", "windows-targets 0.52.6", ] @@ -367,7 +376,7 @@ checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" [[package]] name = "component-init" -version = "0.1.0" +version = "0.2.0" dependencies = [ "component-init-macro", "wit-bindgen", @@ -375,7 +384,7 @@ dependencies = [ [[package]] name = "component-init-cli" -version = "0.1.0" +version = "0.2.0" dependencies = [ "anyhow", "clap", @@ -385,7 +394,7 @@ dependencies = [ [[package]] name = "component-init-macro" -version = "0.1.0" +version = "0.2.0" dependencies = [ "quote", "syn", @@ -393,19 +402,19 @@ dependencies = [ [[package]] name = "component-init-transform" -version = "0.1.0" +version = "0.2.0" dependencies = [ "anyhow", "async-trait", "futures", - "wasm-encoder 0.235.0", + "wasm-encoder 0.238.1", "wasm-metadata", - "wasmparser 0.235.0", + "wasmparser 0.238.1", ] [[package]] name = "component-init-wasmtime" -version = "0.1.0" +version = "0.2.0" dependencies = [ "anyhow", "async-trait", @@ -443,36 +452,36 @@ dependencies = [ [[package]] name = "cranelift-assembler-x64" -version = "0.121.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b7077389885873ffad5d778e8512742580a6e11b0f723072f41f305d3652f" +checksum = "0920ef6863433fa28ece7e53925be4cd39a913adba2dc3738f4edd182f76d168" dependencies = [ "cranelift-assembler-x64-meta", ] [[package]] name = "cranelift-assembler-x64-meta" -version = "0.121.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9cfeae5a23c8cf9c43381f49211f3ce6dc1da1d46f1c5d06966e6258cc483fa" +checksum = "8990a217e2529a378af1daf4f8afa889f928f07ebbde6ae2f058ae60e40e2c20" dependencies = [ "cranelift-srcgen", ] [[package]] name = "cranelift-bforest" -version = "0.121.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c88c577c6af92b550cb83455c331cf8e1bc89fe0ccc3e7eb0fa617ed1d63056" +checksum = "62225596b687f69a42c038485a28369badc186cb7c74bd9436eeec9f539011b1" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-bitset" -version = "0.121.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "370f0aa7f1816bf0f838048d69b72d6cf12ef2fc3b37f6997fe494ffb9feb3ad" +checksum = "c23914fc4062558650a6f0d8c1846c97b541215a291fdeabc85f68bdc9bbcca3" dependencies = [ "serde", "serde_derive", @@ -480,9 +489,9 @@ dependencies = [ [[package]] name = "cranelift-codegen" -version = "0.121.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d1a10a8a2958b68ecd261e565eef285249e242a8447ac959978319eabbb4a55" +checksum = "41a238b2f7e7ec077eb170145fa15fd8b3d0f36cc83d8e354e29ca550f339ca7" dependencies = [ "bumpalo", "cranelift-assembler-x64", @@ -493,7 +502,7 @@ dependencies = [ "cranelift-control", "cranelift-entity", "cranelift-isle", - "gimli", + "gimli 0.32.2", "hashbrown", "log", "pulley-interpreter", @@ -502,41 +511,42 @@ dependencies = [ "serde", "smallvec", "target-lexicon", - "wasmtime-math", + "wasmtime-internal-math", ] [[package]] name = "cranelift-codegen-meta" -version = "0.121.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f319986d5ae1386cfec625c70f8c01e52dc1f910aa6aaee7740bf8842d4e19c7" +checksum = "9315ddcc2512513a9d66455ec89bb70ae5498cb472f5ed990230536f4cd5c011" dependencies = [ "cranelift-assembler-x64-meta", "cranelift-codegen-shared", "cranelift-srcgen", + "heck", "pulley-interpreter", ] [[package]] name = "cranelift-codegen-shared" -version = "0.121.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed52f5660397039c3c741c3acf18746445f4e20629b7280d9f2ccfe57e2b1efd" +checksum = "dc6acea40ef860f28cb36eaad479e26556c1e538b0a66fc44598cf1b1689393d" [[package]] name = "cranelift-control" -version = "0.121.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79bde8d48e1840702574e28c5d7d4499441435af71e6c47450881f84ce2b60a5" +checksum = "6b2af895da90761cfda4a4445960554fcec971e637882eda5a87337d993fe1b9" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.121.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0335ac187211ac94c254826b6e78d23b8654ae09ebf0830506a827a2647162f" +checksum = "6e8c542c856feb50d504e4fc0526b3db3a514f882a9f68f956164531517828ab" dependencies = [ "cranelift-bitset", "serde", @@ -545,9 +555,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.121.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fce5fcf93c1fece95d0175b15fbaf0808b187430bc06c8ecde80db0ed58c5e" +checksum = "9996dd9c20929c03360fe0c4edf3594c0cbb94525bdbfa04b6bb639ec14573c7" dependencies = [ "cranelift-codegen", "log", @@ -557,15 +567,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.121.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13fc8d838a2bf28438dbaf6ccdbc34531b6a972054f43fd23be7f124121ce6e0" +checksum = "928b8dccad51b9e0ffe54accbd617da900239439b13d48f0f122ab61105ca6ad" [[package]] name = "cranelift-native" -version = "0.121.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0975ce66adcf2e0729d06b1d3efea0398d793d1f39c2e0a6f52a347537836693" +checksum = "7f75ef0a6a2efed3a2a14812318e28dc82c214eab5399c13d70878e2f88947b5" dependencies = [ "cranelift-codegen", "libc", @@ -574,9 +584,9 @@ dependencies = [ [[package]] name = "cranelift-srcgen" -version = "0.121.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4493a9b500bb02837ea2fb7d4b58c1c21c37a470ae33c92659f4e637aad14c9" +checksum = "673bd6d1c83cb41d60afb140a1474ef6caf1a3e02f3820fc522aefbc93ac67d6" [[package]] name = "crc32fast" @@ -918,6 +928,12 @@ name = "gimli" version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" + +[[package]] +name = "gimli" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc6298e594375a7fead9efd5568f0a46e6a154fb6a9bdcbe3c06946ffd81a5f6" dependencies = [ "fallible-iterator", "indexmap", @@ -1294,6 +1310,15 @@ name = "object" version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" +dependencies = [ + "memchr", +] + +[[package]] +name = "object" +version = "0.37.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" dependencies = [ "crc32fast", "hashbrown", @@ -1409,32 +1434,23 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "psm" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e944464ec8536cd1beb0bbfd96987eb5e3b72f2ecdafdc5c769a37f1fa2ae1f" -dependencies = [ - "cc", -] - [[package]] name = "pulley-interpreter" -version = "34.0.1" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0e8f39bc99694ce6fc8df7df7ed258d38d255a9268e2ff964f67f4a6588cdb" +checksum = "e4e2d31146038fd9e62bfa331db057aca325d5ca10451a9fe341356cead7da53" dependencies = [ "cranelift-bitset", "log", "pulley-macros", - "wasmtime-math", + "wasmtime-internal-math", ] [[package]] name = "pulley-macros" -version = "34.0.1" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9276d404009cc49f3b8befeb8ffc1d868c5ea732bd9d72ab3e64231187f908c5" +checksum = "efb9fdafaca625f9ea8cfa793364ea1bdd32d306cff18f166b00ddaa61ecbb27" dependencies = [ "proc-macro2", "quote", @@ -1786,7 +1802,7 @@ dependencies = [ [[package]] name = "test-programs" -version = "0.1.0" +version = "0.2.0" dependencies = [ "component-init", "wit-bindgen", @@ -1957,17 +1973,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "trait-variant" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70977707304198400eb4835a78f6a9f928bf41bba420deb8fdb175cd965d77a7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "typenum" version = "1.18.0" @@ -2043,7 +2048,7 @@ version = "0.14.2+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" dependencies = [ - "wit-bindgen-rt 0.39.0", + "wit-bindgen-rt", ] [[package]] @@ -2106,29 +2111,29 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.233.0" +version = "0.236.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9679ae3cf7cfa2ca3a327f7fab97f27f3294d402fd1a76ca8ab514e17973e4d3" +checksum = "724fccfd4f3c24b7e589d333fc0429c68042897a7e8a5f8694f31792471841e7" dependencies = [ "leb128fmt", - "wasmparser 0.233.0", + "wasmparser 0.236.1", ] [[package]] name = "wasm-encoder" -version = "0.235.0" +version = "0.238.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3bc393c395cb621367ff02d854179882b9a351b4e0c93d1397e6090b53a5c2a" +checksum = "d50d48c31c615f77679b61c607b8151378a5d03159616bf3d17e8e2005afdaf5" dependencies = [ "leb128fmt", - "wasmparser 0.235.0", + "wasmparser 0.238.1", ] [[package]] name = "wasm-metadata" -version = "0.235.0" +version = "0.238.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b055604ba04189d54b8c0ab2c2fc98848f208e103882d5c0b984f045d5ea4d20" +checksum = "00094573b000c92134f2ef0f8afa4f6f892de37e78442988c946243a8c44364e" dependencies = [ "anyhow", "auditable-serde", @@ -2139,15 +2144,15 @@ dependencies = [ "serde_json", "spdx", "url", - "wasm-encoder 0.235.0", - "wasmparser 0.235.0", + "wasm-encoder 0.238.1", + "wasmparser 0.238.1", ] [[package]] name = "wasmparser" -version = "0.233.0" +version = "0.236.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b51cb03afce7964bbfce46602d6cb358726f36430b6ba084ac6020d8ce5bc102" +checksum = "a9b1e81f3eb254cf7404a82cee6926a4a3ccc5aad80cc3d43608a070c67aa1d7" dependencies = [ "bitflags", "hashbrown", @@ -2158,9 +2163,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.235.0" +version = "0.238.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "161296c618fa2d63f6ed5fffd1112937e803cb9ec71b32b01a76321555660917" +checksum = "3fa99c8328024423875ae4a55345cfde8f0371327fb2d0f33b0f52a06fc44408" dependencies = [ "bitflags", "hashbrown", @@ -2171,22 +2176,22 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.233.0" +version = "0.236.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf8e5b732895c99b21aa615f1b73352e51bbe2b2cb6c87eae7f990d07c1ac18" +checksum = "2df225df06a6df15b46e3f73ca066ff92c2e023670969f7d50ce7d5e695abbb1" dependencies = [ "anyhow", "termcolor", - "wasmparser 0.233.0", + "wasmparser 0.236.1", ] [[package]] name = "wasmtime" -version = "34.0.1" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2523d3347356a74e9c312c2c96e709c82d998dcafdca97f6d620e69c032fd043" +checksum = "5b3e1fab634681494213138ea3a18e958e5ea99da13a4a01a4b870d51a41680b" dependencies = [ - "addr2line", + "addr2line 0.25.0", "anyhow", "async-trait", "bitflags", @@ -2195,7 +2200,7 @@ dependencies = [ "cfg-if", "encoding_rs", "fxprof-processed-profile", - "gimli", + "gimli 0.32.2", "hashbrown", "indexmap", "ittapi", @@ -2203,10 +2208,9 @@ dependencies = [ "log", "mach2", "memfd", - "object", + "object 0.37.3", "once_cell", "postcard", - "psm", "pulley-interpreter", "rayon", "rustix 1.0.7", @@ -2216,40 +2220,67 @@ dependencies = [ "serde_json", "smallvec", "target-lexicon", - "trait-variant", - "wasm-encoder 0.233.0", - "wasmparser 0.233.0", - "wasmtime-asm-macros", - "wasmtime-cache", - "wasmtime-component-macro", - "wasmtime-component-util", - "wasmtime-cranelift", + "wasm-encoder 0.236.1", + "wasmparser 0.236.1", "wasmtime-environ", - "wasmtime-fiber", - "wasmtime-jit-debug", - "wasmtime-jit-icache-coherence", - "wasmtime-math", - "wasmtime-slab", - "wasmtime-versioned-export-macros", - "wasmtime-winch", + "wasmtime-internal-asm-macros", + "wasmtime-internal-cache", + "wasmtime-internal-component-macro", + "wasmtime-internal-component-util", + "wasmtime-internal-cranelift", + "wasmtime-internal-fiber", + "wasmtime-internal-jit-debug", + "wasmtime-internal-jit-icache-coherence", + "wasmtime-internal-math", + "wasmtime-internal-slab", + "wasmtime-internal-unwinder", + "wasmtime-internal-versioned-export-macros", + "wasmtime-internal-winch", "wat", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] -name = "wasmtime-asm-macros" -version = "34.0.1" +name = "wasmtime-environ" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c45ecc343d3ad4629d5882e94f3b0f0fac22a043c07e64373381168ae00c259" +checksum = "6750e519977953a018fe994aada7e02510aea4babb03310aa5f5b4145b6e6577" +dependencies = [ + "anyhow", + "cpp_demangle", + "cranelift-bitset", + "cranelift-entity", + "gimli 0.32.2", + "indexmap", + "log", + "object 0.37.3", + "postcard", + "rustc-demangle", + "semver", + "serde", + "serde_derive", + "smallvec", + "target-lexicon", + "wasm-encoder 0.236.1", + "wasmparser 0.236.1", + "wasmprinter", + "wasmtime-internal-component-util", +] + +[[package]] +name = "wasmtime-internal-asm-macros" +version = "36.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdbf38adac6e81d5c0326e8fd25f80450e3038f2fc103afd3c5cc8b83d5dd78b" dependencies = [ "cfg-if", ] [[package]] -name = "wasmtime-cache" -version = "34.0.1" +name = "wasmtime-internal-cache" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb1976337108c8b9f80b05e9b909bf603f85c4ea97e31c112876a36d3cdcb98" +checksum = "c0c9085d8c04cc294612d743e2f355382b39250de4bd20bf4b0b0b7c0ae7067a" dependencies = [ "anyhow", "base64", @@ -2261,36 +2292,36 @@ dependencies = [ "serde_derive", "sha2", "toml", - "windows-sys 0.59.0", + "windows-sys 0.60.2", "zstd", ] [[package]] -name = "wasmtime-component-macro" -version = "34.0.1" +name = "wasmtime-internal-component-macro" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3491c0f2511be561a92ac9b086351abc3a0f48c5f5f7d14f3975e246c13838be" +checksum = "26a578a474e3b7ddce063cd169ced292b5185013341457522891b10e989aa42a" dependencies = [ "anyhow", "proc-macro2", "quote", "syn", - "wasmtime-component-util", - "wasmtime-wit-bindgen", - "wit-parser 0.233.0", + "wasmtime-internal-component-util", + "wasmtime-internal-wit-bindgen", + "wit-parser 0.236.1", ] [[package]] -name = "wasmtime-component-util" -version = "34.0.1" +name = "wasmtime-internal-component-util" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26bc084e249f74e61c79077d8937c34fb0af223752b9b1725e3d7ed94b006f23" +checksum = "edc23d46ec1b1cd42b6f73205eb80498ed94b47098ec53456c0b18299405b158" [[package]] -name = "wasmtime-cranelift" -version = "34.0.1" +name = "wasmtime-internal-cranelift" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0010bd93362c634837e6bb13e213c2d83673b28dc12208b64ddd821fa55f7d33" +checksum = "d85b8ba128525bff91b89ac8a97755136a4fb0fb59df5ffb7539dd646455d441" dependencies = [ "anyhow", "cfg-if", @@ -2299,118 +2330,134 @@ dependencies = [ "cranelift-entity", "cranelift-frontend", "cranelift-native", - "gimli", + "gimli 0.32.2", "itertools", "log", - "object", + "object 0.37.3", "pulley-interpreter", "smallvec", "target-lexicon", "thiserror 2.0.12", - "wasmparser 0.233.0", + "wasmparser 0.236.1", "wasmtime-environ", - "wasmtime-math", - "wasmtime-versioned-export-macros", + "wasmtime-internal-math", + "wasmtime-internal-versioned-export-macros", ] [[package]] -name = "wasmtime-environ" -version = "34.0.1" +name = "wasmtime-internal-fiber" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36a035dc308ff6be3d790dafdc2e41a128415e20ad864580da49470073e21dc1" -dependencies = [ - "anyhow", - "cpp_demangle", - "cranelift-bitset", - "cranelift-entity", - "gimli", - "indexmap", - "log", - "object", - "postcard", - "rustc-demangle", - "semver", - "serde", - "serde_derive", - "smallvec", - "target-lexicon", - "wasm-encoder 0.233.0", - "wasmparser 0.233.0", - "wasmprinter", - "wasmtime-component-util", -] - -[[package]] -name = "wasmtime-fiber" -version = "34.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc3c1e4e70cdd3a4572dff79062caa48988f7f1ccf6850d98a4e4c41bf3cfc8" +checksum = "0c566f5137de1f55339df8a236a5ec89698b466a3d33f9cc07823a58a3f85e16" dependencies = [ "anyhow", "cc", "cfg-if", "libc", "rustix 1.0.7", - "wasmtime-asm-macros", - "wasmtime-versioned-export-macros", - "windows-sys 0.59.0", + "wasmtime-internal-asm-macros", + "wasmtime-internal-versioned-export-macros", + "windows-sys 0.60.2", ] [[package]] -name = "wasmtime-jit-debug" -version = "34.0.1" +name = "wasmtime-internal-jit-debug" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5d83fa2dea686f76b5437b66045aae6351d359ee11cc4124f9842de63837b81" +checksum = "e03f0b11f8fe4d456feac11e7e9dc6f02ddb34d4f6a1912775dbc63c5bdd5670" dependencies = [ "cc", - "object", + "object 0.37.3", "rustix 1.0.7", - "wasmtime-versioned-export-macros", + "wasmtime-internal-versioned-export-macros", ] [[package]] -name = "wasmtime-jit-icache-coherence" -version = "34.0.1" +name = "wasmtime-internal-jit-icache-coherence" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c71d64e8ebe132cd45e9d299a4d0daf261d66bd05cf50a204a1bf8cf96ff1f" +checksum = "71aeb74f9b3fd9225319c723e59832a77a674b0c899ba9795f9b2130a6d1b167" dependencies = [ "anyhow", "cfg-if", "libc", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] -name = "wasmtime-math" -version = "34.0.1" +name = "wasmtime-internal-math" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222bfa4769c6931c985711eb49a92748ea0acc4ca85fcd24e945a2f1bacda0c1" +checksum = "31d5dad8a609c6cc47a5f265f13b52e347e893450a69641af082b8a276043fa7" dependencies = [ "libm", ] [[package]] -name = "wasmtime-slab" -version = "34.0.1" +name = "wasmtime-internal-slab" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ac42c7fb0639f7c3e0c1ed0c984050245c55410f3fae334dd5b102e0edfab14" +checksum = "6d152a7b875d62e395bfe0ae7d12e7b47cd332eb380353cce3eb831f9843731d" [[package]] -name = "wasmtime-versioned-export-macros" -version = "34.0.1" +name = "wasmtime-internal-unwinder" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e052e1d9c30b8f31aff64380caaaff492a9890a412658bcc8866fe626b8e91f" +checksum = "2aaacc0fea00293f7af7e6c25cef74b7d213ebbe7560c86305eec15fc318fab8" +dependencies = [ + "anyhow", + "cfg-if", + "cranelift-codegen", + "log", + "object 0.37.3", +] + +[[package]] +name = "wasmtime-internal-versioned-export-macros" +version = "36.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61c7f75326434944cc5f3b75409a063fa37e537f6247f00f0f733679f0be406" dependencies = [ "proc-macro2", "quote", "syn", ] +[[package]] +name = "wasmtime-internal-winch" +version = "36.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cfbaa87e1ac4972bb096c9cb1800fedc113e36332cc4bc2c96a2ef1d7c5e750" +dependencies = [ + "anyhow", + "cranelift-codegen", + "gimli 0.32.2", + "object 0.37.3", + "target-lexicon", + "wasmparser 0.236.1", + "wasmtime-environ", + "wasmtime-internal-cranelift", + "winch-codegen", +] + +[[package]] +name = "wasmtime-internal-wit-bindgen" +version = "36.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "169042d58002f16da149ab7d608b71164411abd1fc5140f48f4c200b44bb5565" +dependencies = [ + "anyhow", + "bitflags", + "heck", + "indexmap", + "wit-parser 0.236.1", +] + [[package]] name = "wasmtime-wasi" -version = "34.0.1" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8392e2256e2b56167a69c4d5ea5505fc3cd164f088ce7009824ee0abd1671dc" +checksum = "b9049a5fedcd24fa0f665ba7c17c4445c1a547536a9560d960e15bee2d8428d0" dependencies = [ "anyhow", "async-trait", @@ -2434,14 +2481,14 @@ dependencies = [ "wasmtime", "wasmtime-wasi-io", "wiggle", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] name = "wasmtime-wasi-io" -version = "34.0.1" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92a8348338594ee5b46c2decdb921a54fabaaed4cb448f6effb97c49d09e44e7" +checksum = "d62156d8695d80df8e85baeb56379b3ba6b6bf5996671594724c24d40b67825f" dependencies = [ "anyhow", "async-trait", @@ -2450,35 +2497,6 @@ dependencies = [ "wasmtime", ] -[[package]] -name = "wasmtime-winch" -version = "34.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2d71e002033124221f6633a462c26067280519fdd7527ba2751f585db779cc6" -dependencies = [ - "anyhow", - "cranelift-codegen", - "gimli", - "object", - "target-lexicon", - "wasmparser 0.233.0", - "wasmtime-cranelift", - "wasmtime-environ", - "winch-codegen", -] - -[[package]] -name = "wasmtime-wit-bindgen" -version = "34.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f967f5efaaac7694e6bd0d67542a5a036830860e4adf95684260181e85a5d299" -dependencies = [ - "anyhow", - "heck", - "indexmap", - "wit-parser 0.233.0", -] - [[package]] name = "wast" version = "35.0.2" @@ -2490,31 +2508,31 @@ dependencies = [ [[package]] name = "wast" -version = "235.0.0" +version = "238.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eda4293f626c99021bb3a6fbe4fbbe90c0e31a5ace89b5f620af8925de72e13" +checksum = "b0a564e7eab2abb8920c1302b90eb2c98a15efbbe30fc060d4e2d88483aa23fe" dependencies = [ "bumpalo", "leb128fmt", "memchr", "unicode-width", - "wasm-encoder 0.235.0", + "wasm-encoder 0.238.1", ] [[package]] name = "wat" -version = "1.235.0" +version = "1.238.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e777e0327115793cb96ab220b98f85327ec3d11f34ec9e8d723264522ef206aa" +checksum = "0eb84e6ac2997025f80482266fdc9f60fa28ba791b674bfd33855e77fe867631" dependencies = [ - "wast 235.0.0", + "wast 238.0.1", ] [[package]] name = "wiggle" -version = "34.0.1" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab89466227933ce3d44f2b60eedd2cc46ba3dfd350cf1e938b6422bea18aa422" +checksum = "e233166bc0ef02371ebe2c630aba51dd3f015bcaf616d32b4171efab84d09137" dependencies = [ "anyhow", "async-trait", @@ -2527,9 +2545,9 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "34.0.1" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f650b2d5981c3359778c49eada0796fcc98e9135bc6f7bb894cab2e2bc4fd04d" +checksum = "93048543902e61c65b75d8a9ea0e78d5a8723e5db6e11ff93870165807c4463d" dependencies = [ "anyhow", "heck", @@ -2541,9 +2559,9 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "34.0.1" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4e5f692091b53dbb0835f74cfc03cbd8f384fd3fb493bde6bdc96426e105e84" +checksum = "fd7e511edbcaa045079dea564486c4ff7946ae491002227c41d74ea62a59d329" dependencies = [ "proc-macro2", "quote", @@ -2584,22 +2602,22 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "34.0.1" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d2bf456780101aff8950642fdf984f182816d7f555d5375699200242be78762" +checksum = "6e615fe205d7d4c9aa62217862f2e0969d00b9b0843af0b1b8181adaea3cfef3" dependencies = [ "anyhow", "cranelift-assembler-x64", "cranelift-codegen", - "gimli", + "gimli 0.32.2", "regalloc2", "smallvec", "target-lexicon", "thiserror 2.0.12", - "wasmparser 0.233.0", - "wasmtime-cranelift", + "wasmparser 0.236.1", "wasmtime-environ", - "wasmtime-math", + "wasmtime-internal-cranelift", + "wasmtime-internal-math", ] [[package]] @@ -2837,23 +2855,25 @@ dependencies = [ [[package]] name = "wit-bindgen" -version = "0.43.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a18712ff1ec5bd09da500fe1e91dec11256b310da0ff33f8b4ec92b927cf0c6" +checksum = "052283831dbae3d879dc7f51f3d92703a316ca49f91540417d38591826127814" dependencies = [ - "wit-bindgen-rt 0.43.0", + "bitflags", + "futures", + "once_cell", "wit-bindgen-rust-macro", ] [[package]] name = "wit-bindgen-core" -version = "0.43.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c53468e077362201de11999c85c07c36e12048a990a3e0d69da2bd61da355d0" +checksum = "1df0102d506f94732b6b517015e7e951293ed51e98f1615f15056e5e1a7a4d67" dependencies = [ "anyhow", "heck", - "wit-parser 0.235.0", + "wit-parser 0.238.1", ] [[package]] @@ -2865,22 +2885,11 @@ dependencies = [ "bitflags", ] -[[package]] -name = "wit-bindgen-rt" -version = "0.43.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd734226eac1fd7c450956964e3a9094c9cee65e9dafdf126feef8c0096db65" -dependencies = [ - "bitflags", - "futures", - "once_cell", -] - [[package]] name = "wit-bindgen-rust" -version = "0.43.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531ebfcec48e56473805285febdb450e270fa75b2dacb92816861d0473b4c15f" +checksum = "8e128967ed7895a41c5541bd8cd2875472caad6434e6699c1b269302a0d60b39" dependencies = [ "anyhow", "heck", @@ -2894,9 +2903,9 @@ dependencies = [ [[package]] name = "wit-bindgen-rust-macro" -version = "0.43.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7852bf8a9d1ea80884d26b864ddebd7b0c7636697c6ca10f4c6c93945e023966" +checksum = "ea08d8273179bf25a7aa87fc498380f7a7f56a2df93cd1135d0ca36af1eae962" dependencies = [ "anyhow", "prettyplease", @@ -2909,9 +2918,9 @@ dependencies = [ [[package]] name = "wit-component" -version = "0.235.0" +version = "0.238.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a57a11109cc553396f89f3a38a158a97d0b1adaec113bd73e0f64d30fb601f" +checksum = "7d31c985f541330d1a809547043ad19dd58739a2f83c7f116aeabcab86aed597" dependencies = [ "anyhow", "bitflags", @@ -2920,17 +2929,17 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "wasm-encoder 0.235.0", + "wasm-encoder 0.238.1", "wasm-metadata", - "wasmparser 0.235.0", - "wit-parser 0.235.0", + "wasmparser 0.238.1", + "wit-parser 0.238.1", ] [[package]] name = "wit-parser" -version = "0.233.0" +version = "0.236.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f22f1cd55247a2e616870b619766e9522df36b7abafbb29bbeb34b7a9da7e9f0" +checksum = "16e4833a20cd6e85d6abfea0e63a399472d6f88c6262957c17f546879a80ba15" dependencies = [ "anyhow", "id-arena", @@ -2941,14 +2950,14 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.233.0", + "wasmparser 0.236.1", ] [[package]] name = "wit-parser" -version = "0.235.0" +version = "0.238.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1f95a87d03a33e259af286b857a95911eb46236a0f726cbaec1227b3dfc67a" +checksum = "1eea12c964ed423ed14745e51aac2f1e28e5572ca012b0503bdcf65ffee3b44c" dependencies = [ "anyhow", "id-arena", @@ -2959,7 +2968,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.235.0", + "wasmparser 0.238.1", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index c39c789..51a0f61 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ members = [ resolver = "3" [workspace.package] -version = "0.1.0" +version = "0.2.0" edition = "2024" license = "MIT" repository = "https://github.com/dicej/component-init" @@ -20,21 +20,21 @@ repository = "https://github.com/dicej/component-init" anyhow = "1.0.89" async-trait = "0.1.83" clap = { version = "4", features = ["derive"] } -component-init = { version = "0.1.0", path = "./guest-rust" } -component-init-macro = { version = "0.1.0", path = "./guest-rust/macro" } -component-init-transform = { version = "0.1.0", path = "./transform" } -component-init-wasmtime = { version = "0.1.0", path = "./wasmtime" } +component-init = { version = "0.2.0", path = "./guest-rust" } +component-init-macro = { version = "0.2.0", path = "./guest-rust/macro" } +component-init-transform = { version = "0.2.0", path = "./transform" } +component-init-wasmtime = { version = "0.2.0", path = "./wasmtime" } futures = "0.3.31" quote = "1.0" syn = "2.0" test-programs = { path = "./test-programs" } test-programs-artifacts = { path = "./test-programs/artifacts" } tokio = { version = "1", features = ["full"] } -wasm-encoder = { version = "0.235.0", features = ["wasmparser"] } -wasmparser = "0.235.0" -wasmtime = "34.0.1" -wasmtime-wasi = "34.0.1" -wasmtime-wasi-http = "34.0.1" -wat = "1.235.0" -wit-bindgen = "0.43.0" -wasm-metadata = "0.235.0" +wasm-encoder = { version = "0.238.1", features = ["wasmparser"] } +wasmparser = "0.238.1" +wasmtime = "36.0.2" +wasmtime-wasi = "36.0.2" +wasmtime-wasi-http = "36.0.2" +wat = "1.238.1" +wit-bindgen = "0.45.0" +wasm-metadata = "0.238.1" diff --git a/wasmtime/src/lib.rs b/wasmtime/src/lib.rs index 32bbdc9..0216832 100644 --- a/wasmtime/src/lib.rs +++ b/wasmtime/src/lib.rs @@ -48,7 +48,10 @@ struct Impl { } impl Impl { - async fn call(&mut self, name: &str) -> Result { + async fn call( + &mut self, + name: &str, + ) -> Result { let export = self .instance .get_export_index(&mut self.store, None, name) diff --git a/wasmtime/tests/rust.rs b/wasmtime/tests/rust.rs index d734359..c01e6bd 100644 --- a/wasmtime/tests/rust.rs +++ b/wasmtime/tests/rust.rs @@ -6,7 +6,7 @@ async fn execute(component: &[u8]) -> Result<()> { Config, Engine, Store, component::{Component, Linker, ResourceTable}, }; - use wasmtime_wasi::p2::WasiCtx; + use wasmtime_wasi::{WasiCtx, WasiCtxView}; let mut config = Config::new(); config.async_support(true); @@ -17,14 +17,12 @@ async fn execute(component: &[u8]) -> Result<()> { table: ResourceTable, wasi: WasiCtx, } - impl wasmtime_wasi::p2::IoView for Ctx { - fn table(&mut self) -> &mut ResourceTable { - &mut self.table - } - } - impl wasmtime_wasi::p2::WasiView for Ctx { - fn ctx(&mut self) -> &mut WasiCtx { - &mut self.wasi + impl wasmtime_wasi::WasiView for Ctx { + fn ctx(&mut self) -> WasiCtxView<'_> { + WasiCtxView { + ctx: &mut self.wasi, + table: &mut self.table, + } } } @@ -54,15 +52,15 @@ async fn execute(component: &[u8]) -> Result<()> { .ok_or_else(|| anyhow!("`wasi:cli/run.run` export is not a func"))?; let func = func .typed::<(), (Result<(), ()>,)>(&mut store) - .with_context(|| format!("type of run func"))?; + .context("type of run func")?; func.call_async(&mut store, ()) .await - .with_context(|| format!("executing run"))? + .context("executing run")? .0 .map_err(|()| anyhow!("run returned error"))?; func.post_return_async(&mut store) .await - .with_context(|| format!("post-return run"))?; + .context("post-return run")?; Ok(()) }