diff --git a/native/wasmex/Cargo.lock b/native/wasmex/Cargo.lock index d2bebc72..f5f47eef 100644 --- a/native/wasmex/Cargo.lock +++ b/native/wasmex/Cargo.lock @@ -93,7 +93,7 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object", + "object 0.32.2", "rustc-demangle", ] @@ -157,8 +157,20 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88e341d15ac1029aadce600be764a1a1edafe40e03cde23285bc1d261b3a4866" dependencies = [ - "cap-primitives", - "cap-std", + "cap-primitives 2.0.1", + "cap-std 2.0.1", + "io-lifetimes", + "windows-sys 0.52.0", +] + +[[package]] +name = "cap-fs-ext" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fc2d2954524be4866aaa720f008fba9995de54784957a1b0e0119992d6d5e52" +dependencies = [ + "cap-primitives 3.1.0", + "cap-std 3.1.0", "io-lifetimes", "windows-sys 0.52.0", ] @@ -169,8 +181,8 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "434168fe6533055f0f4204039abe3ff6d7db338ef46872a5fa39e9d5ad5ab7a9" dependencies = [ - "cap-primitives", - "cap-std", + "cap-primitives 2.0.1", + "cap-std 2.0.1", "rustix", "smallvec", ] @@ -192,6 +204,23 @@ dependencies = [ "winx", ] +[[package]] +name = "cap-primitives" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00172660727e2d7f808e7cc2bfffd093fdb3ea2ff2ef819289418a3c3ffab5ac" +dependencies = [ + "ambient-authority", + "fs-set-times", + "io-extras", + "io-lifetimes", + "ipnet", + "maybe-owned", + "rustix", + "windows-sys 0.52.0", + "winx", +] + [[package]] name = "cap-rand" version = "2.0.1" @@ -202,13 +231,35 @@ dependencies = [ "rand", ] +[[package]] +name = "cap-rand" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "270f1d341a2afc62604f8f688bee4e444d052b7a74c1458dd3aa7efb47d4077f" +dependencies = [ + "ambient-authority", + "rand", +] + [[package]] name = "cap-std" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "593db20e4c51f62d3284bae7ee718849c3214f93a3b94ea1899ad85ba119d330" dependencies = [ - "cap-primitives", + "cap-primitives 2.0.1", + "io-extras", + "io-lifetimes", + "rustix", +] + +[[package]] +name = "cap-std" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cd9187bb3f7478a4c135ea10473a41a5f029d2ac800c1adf64f35ec7d4c8603" +dependencies = [ + "cap-primitives 3.1.0", "io-extras", "io-lifetimes", "rustix", @@ -221,7 +272,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03261630f291f425430a36f38c847828265bc928f517cdd2004c56f4b02f002b" dependencies = [ "ambient-authority", - "cap-primitives", + "cap-primitives 2.0.1", + "iana-time-zone", + "once_cell", + "rustix", + "winx", +] + +[[package]] +name = "cap-time-ext" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91666f31e30c85b1d2ee8432c90987f752c45f5821f5638027b41e73e16a395b" +dependencies = [ + "ambient-authority", + "cap-primitives 3.1.0", "iana-time-zone", "once_cell", "rustix", @@ -244,6 +309,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cobs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" + [[package]] name = "core-foundation-sys" version = "0.8.6" @@ -274,7 +345,7 @@ version = "0.105.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9515fcc42b6cb5137f76b84c1a6f819782d0cf12473d145d3bc5cd67eedc8bc2" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.105.2", ] [[package]] @@ -288,7 +359,7 @@ dependencies = [ "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-control", - "cranelift-entity", + "cranelift-entity 0.105.2", "cranelift-isle", "gimli", "hashbrown 0.14.3", @@ -332,6 +403,16 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "cranelift-entity" +version = "0.108.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eabb8d36b0ca8906bec93c78ea516741cac2d7e6b266fa7b0ffddcc09004990" +dependencies = [ + "serde", + "serde_derive", +] + [[package]] name = "cranelift-frontend" version = "0.105.2" @@ -368,13 +449,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8cd747ed7f9a461dda9c388415392f6bb95d1a6ef3b7694d17e0817eb74b7798" dependencies = [ "cranelift-codegen", - "cranelift-entity", + "cranelift-entity 0.105.2", "cranelift-frontend", "itertools", "log", "smallvec", - "wasmparser", - "wasmtime-types", + "wasmparser 0.121.2", + "wasmtime-types 18.0.2", ] [[package]] @@ -487,6 +568,12 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +[[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + [[package]] name = "encoding_rs" version = "0.8.33" @@ -837,6 +924,12 @@ version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + [[package]] name = "libredox" version = "0.0.1" @@ -869,6 +962,15 @@ dependencies = [ "libc", ] +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +dependencies = [ + "libc", +] + [[package]] name = "maybe-owned" version = "0.3.4" @@ -941,6 +1043,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "object" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8dd6c0cdf9429bce006e1362bfce61fa1bfd8c898a643ed8d2b471934701d3d" +dependencies = [ + "memchr", +] + [[package]] name = "once_cell" version = "1.19.0" @@ -977,6 +1088,17 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +[[package]] +name = "postcard" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" +dependencies = [ + "cobs", + "embedded-io", + "serde", +] + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -1136,9 +1258,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.4.2", "errno", @@ -1256,6 +1378,9 @@ name = "smallvec" version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +dependencies = [ + "serde", +] [[package]] name = "socket2" @@ -1297,8 +1422,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0682e006dd35771e392a6623ac180999a9a854b1d4a6c12fb2e804941c2b1f58" dependencies = [ "bitflags 2.4.2", - "cap-fs-ext", - "cap-std", + "cap-fs-ext 2.0.1", + "cap-std 2.0.1", + "fd-lock", + "io-lifetimes", + "rustix", + "windows-sys 0.52.0", + "winx", +] + +[[package]] +name = "system-interface" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b858526d22750088a9b3cf2e3c2aacebd5377f13adeec02860c30d09113010a6" +dependencies = [ + "bitflags 2.4.2", + "cap-fs-ext 3.1.0", + "cap-std 3.1.0", "fd-lock", "io-lifetimes", "rustix", @@ -1495,21 +1636,47 @@ checksum = "880c1461417b2bf90262591bf8a5f04358fb86dac8a585a49b87024971296763" dependencies = [ "anyhow", "bitflags 2.4.2", - "cap-fs-ext", - "cap-rand", - "cap-std", - "cap-time-ext", + "cap-fs-ext 2.0.1", + "cap-rand 2.0.1", + "cap-std 2.0.1", + "cap-time-ext 2.0.1", + "fs-set-times", + "io-extras", + "io-lifetimes", + "log", + "once_cell", + "rustix", + "system-interface 0.26.1", + "thiserror", + "tracing", + "wasmtime 18.0.2", + "wiggle 18.0.2", + "windows-sys 0.52.0", +] + +[[package]] +name = "wasi-common" +version = "21.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f1ff7fb4a1ce516d349598c62cc95e077b7016a2cc6471548ab066cc3849078" +dependencies = [ + "anyhow", + "bitflags 2.4.2", + "cap-fs-ext 3.1.0", + "cap-rand 3.1.0", + "cap-std 3.1.0", + "cap-time-ext 3.1.0", "fs-set-times", "io-extras", "io-lifetimes", "log", "once_cell", "rustix", - "system-interface", + "system-interface 0.27.2", "thiserror", "tracing", - "wasmtime", - "wiggle", + "wasmtime 21.0.1", + "wiggle 21.0.1", "windows-sys 0.52.0", ] @@ -1592,11 +1759,11 @@ dependencies = [ "once_cell", "rand", "rustler", - "wasi-common", - "wasmtime", + "wasi-common 21.0.1", + "wasmtime 18.0.2", "wasmtime-wasi", "wat", - "wiggle", + "wiggle 18.0.2", ] [[package]] @@ -1610,6 +1777,19 @@ dependencies = [ "semver", ] +[[package]] +name = "wasmparser" +version = "0.207.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e19bb9f8ab07616da582ef8adb24c54f1424c7ec876720b7da9db8ec0626c92c" +dependencies = [ + "ahash", + "bitflags 2.4.2", + "hashbrown 0.14.3", + "indexmap", + "semver", +] + [[package]] name = "wasmprinter" version = "0.2.80" @@ -1617,7 +1797,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60e73986a6b7fdfedb7c5bf9e7eb71135486507c8fbc4c0c42cffcb6532988b7" dependencies = [ "anyhow", - "wasmparser", + "wasmparser 0.121.2", ] [[package]] @@ -1639,7 +1819,7 @@ dependencies = [ "ittapi", "libc", "log", - "object", + "object 0.32.2", "once_cell", "paste", "rayon", @@ -1649,21 +1829,59 @@ dependencies = [ "serde_json", "target-lexicon", "wasm-encoder 0.41.2", - "wasmparser", + "wasmparser 0.121.2", "wasmtime-cache", "wasmtime-component-macro", "wasmtime-component-util", "wasmtime-cranelift", - "wasmtime-environ", + "wasmtime-environ 18.0.2", "wasmtime-fiber", "wasmtime-jit-debug", - "wasmtime-jit-icache-coherence", + "wasmtime-jit-icache-coherence 18.0.2", "wasmtime-runtime", "wasmtime-winch", "wat", "windows-sys 0.52.0", ] +[[package]] +name = "wasmtime" +version = "21.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f92a1370c66a0022e6d92dcc277e2c84f5dece19569670b8ce7db8162560d8b6" +dependencies = [ + "anyhow", + "bumpalo", + "cc", + "cfg-if", + "hashbrown 0.14.3", + "indexmap", + "libc", + "libm", + "log", + "mach2", + "memfd", + "memoffset", + "object 0.33.0", + "once_cell", + "paste", + "postcard", + "psm", + "rustix", + "serde", + "serde_derive", + "smallvec", + "sptr", + "target-lexicon", + "wasmparser 0.207.0", + "wasmtime-asm-macros 21.0.1", + "wasmtime-environ 21.0.1", + "wasmtime-jit-icache-coherence 21.0.1", + "wasmtime-slab", + "wasmtime-versioned-export-macros 21.0.1", + "windows-sys 0.52.0", +] + [[package]] name = "wasmtime-asm-macros" version = "18.0.2" @@ -1673,6 +1891,15 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "wasmtime-asm-macros" +version = "21.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dee8679c974a7f258c03d60d3c747c426ed219945b6d08cbc77fd2eab15b2d1" +dependencies = [ + "cfg-if", +] + [[package]] name = "wasmtime-cache" version = "18.0.2" @@ -1724,19 +1951,19 @@ dependencies = [ "cfg-if", "cranelift-codegen", "cranelift-control", - "cranelift-entity", + "cranelift-entity 0.105.2", "cranelift-frontend", "cranelift-native", "cranelift-wasm", "gimli", "log", - "object", + "object 0.32.2", "target-lexicon", "thiserror", - "wasmparser", + "wasmparser 0.121.2", "wasmtime-cranelift-shared", - "wasmtime-environ", - "wasmtime-versioned-export-macros", + "wasmtime-environ 18.0.2", + "wasmtime-versioned-export-macros 18.0.2", ] [[package]] @@ -1750,9 +1977,9 @@ dependencies = [ "cranelift-control", "cranelift-native", "gimli", - "object", + "object 0.32.2", "target-lexicon", - "wasmtime-environ", + "wasmtime-environ 18.0.2", ] [[package]] @@ -1764,21 +1991,41 @@ dependencies = [ "anyhow", "bincode", "cpp_demangle", - "cranelift-entity", + "cranelift-entity 0.105.2", "gimli", "indexmap", "log", - "object", + "object 0.32.2", "rustc-demangle", "serde", "serde_derive", "target-lexicon", "thiserror", "wasm-encoder 0.41.2", - "wasmparser", + "wasmparser 0.121.2", "wasmprinter", "wasmtime-component-util", - "wasmtime-types", + "wasmtime-types 18.0.2", +] + +[[package]] +name = "wasmtime-environ" +version = "21.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40e227f9ed2f5421473723d6c0352b5986e6e6044fde5410a274a394d726108f" +dependencies = [ + "anyhow", + "cranelift-entity 0.108.1", + "gimli", + "indexmap", + "log", + "object 0.33.0", + "postcard", + "serde", + "serde_derive", + "target-lexicon", + "wasmparser 0.207.0", + "wasmtime-types 21.0.1", ] [[package]] @@ -1791,8 +2038,8 @@ dependencies = [ "cc", "cfg-if", "rustix", - "wasmtime-asm-macros", - "wasmtime-versioned-export-macros", + "wasmtime-asm-macros 18.0.2", + "wasmtime-versioned-export-macros 18.0.2", "windows-sys 0.52.0", ] @@ -1802,10 +2049,10 @@ version = "18.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "833dae95bc7a4f9177bf93f9497419763535b74e37eb8c37be53937d3281e287" dependencies = [ - "object", + "object 0.32.2", "once_cell", "rustix", - "wasmtime-versioned-export-macros", + "wasmtime-versioned-export-macros 18.0.2", ] [[package]] @@ -1819,6 +2066,18 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "21.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afe088f9b56bb353adaf837bf7e10f1c2e1676719dd5be4cac8e37f2ba1ee5bc" +dependencies = [ + "anyhow", + "cfg-if", + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "wasmtime-runtime" version = "18.0.2" @@ -1840,26 +2099,45 @@ dependencies = [ "rustix", "sptr", "wasm-encoder 0.41.2", - "wasmtime-asm-macros", - "wasmtime-environ", + "wasmtime-asm-macros 18.0.2", + "wasmtime-environ 18.0.2", "wasmtime-fiber", "wasmtime-jit-debug", - "wasmtime-versioned-export-macros", + "wasmtime-versioned-export-macros 18.0.2", "wasmtime-wmemcheck", "windows-sys 0.52.0", ] +[[package]] +name = "wasmtime-slab" +version = "21.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ff75cafffe47b04b036385ce3710f209153525b0ed19d57b0cf44a22d446460" + [[package]] name = "wasmtime-types" version = "18.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54a327d7a0ef57bd52a507d28b4561a74126c7a8535a2fc6f2025716bc6a52e8" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.105.2", "serde", "serde_derive", "thiserror", - "wasmparser", + "wasmparser 0.121.2", +] + +[[package]] +name = "wasmtime-types" +version = "21.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f2fa462bfea3220711c84e2b549f147e4df89eeb49b8a2a3d89148f6cc4a8b1" +dependencies = [ + "cranelift-entity 0.108.1", + "serde", + "serde_derive", + "smallvec", + "wasmparser 0.207.0", ] [[package]] @@ -1873,6 +2151,17 @@ dependencies = [ "syn", ] +[[package]] +name = "wasmtime-versioned-export-macros" +version = "21.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4cedc5bfef3db2a85522ee38564b47ef3b7fc7c92e94cacbce99808e63cdd47" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "wasmtime-wasi" version = "18.0.2" @@ -1883,11 +2172,11 @@ dependencies = [ "async-trait", "bitflags 2.4.2", "bytes", - "cap-fs-ext", + "cap-fs-ext 2.0.1", "cap-net-ext", - "cap-rand", - "cap-std", - "cap-time-ext", + "cap-rand 2.0.1", + "cap-std 2.0.1", + "cap-time-ext 2.0.1", "fs-set-times", "futures", "io-extras", @@ -1895,14 +2184,14 @@ dependencies = [ "log", "once_cell", "rustix", - "system-interface", + "system-interface 0.26.1", "thiserror", "tokio", "tracing", "url", - "wasi-common", - "wasmtime", - "wiggle", + "wasi-common 18.0.2", + "wasmtime 18.0.2", + "wiggle 18.0.2", "windows-sys 0.52.0", ] @@ -1915,11 +2204,11 @@ dependencies = [ "anyhow", "cranelift-codegen", "gimli", - "object", + "object 0.32.2", "target-lexicon", - "wasmparser", + "wasmparser 0.121.2", "wasmtime-cranelift-shared", - "wasmtime-environ", + "wasmtime-environ 18.0.2", "winch-codegen", ] @@ -1983,11 +2272,26 @@ dependencies = [ "bitflags 2.4.2", "thiserror", "tracing", - "wasmtime", - "wiggle-macro", + "wasmtime 18.0.2", + "wiggle-macro 18.0.2", "witx", ] +[[package]] +name = "wiggle" +version = "21.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a89ea6f74ece6d1cfbd089783006b8eb69a0219ca83cad22068f0d9fa9df3f91" +dependencies = [ + "anyhow", + "async-trait", + "bitflags 2.4.2", + "thiserror", + "tracing", + "wasmtime 21.0.1", + "wiggle-macro 21.0.1", +] + [[package]] name = "wiggle-generate" version = "18.0.2" @@ -2003,6 +2307,21 @@ dependencies = [ "witx", ] +[[package]] +name = "wiggle-generate" +version = "21.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36beda94813296ecaf0d91b7ada9da073fd41865ba339bdd3b7764e2e785b8e9" +dependencies = [ + "anyhow", + "heck", + "proc-macro2", + "quote", + "shellexpand", + "syn", + "witx", +] + [[package]] name = "wiggle-macro" version = "18.0.2" @@ -2012,7 +2331,19 @@ dependencies = [ "proc-macro2", "quote", "syn", - "wiggle-generate", + "wiggle-generate 18.0.2", +] + +[[package]] +name = "wiggle-macro" +version = "21.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b47d2b4442ce93106dba5d1a9c59d5f85b5732878bb3d0598d3c93c0d01b16b" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wiggle-generate 21.0.1", ] [[package]] @@ -2049,8 +2380,8 @@ dependencies = [ "regalloc2", "smallvec", "target-lexicon", - "wasmparser", - "wasmtime-environ", + "wasmparser 0.121.2", + "wasmtime-environ 18.0.2", ] [[package]] diff --git a/native/wasmex/Cargo.toml b/native/wasmex/Cargo.toml index 6f720ff3..dd62bc38 100644 --- a/native/wasmex/Cargo.toml +++ b/native/wasmex/Cargo.toml @@ -23,6 +23,6 @@ once_cell = "1.19.0" rand = "0.8.5" wasmtime = "18.0.2" wasmtime-wasi = "18.0.2" -wasi-common = "18.0.2" +wasi-common = "21.0.1" wiggle = "18.0.2" wat = "1.202.0"