diff --git a/native/wasmex/Cargo.lock b/native/wasmex/Cargo.lock index 43bfa92a..a887784a 100644 --- a/native/wasmex/Cargo.lock +++ b/native/wasmex/Cargo.lock @@ -160,8 +160,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", ] @@ -172,8 +184,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", ] @@ -195,6 +207,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" @@ -205,13 +234,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", @@ -224,7 +275,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", @@ -248,6 +313,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" @@ -278,7 +349,7 @@ version = "0.105.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "496c993b62bdfbe9b4c518b8b3e1fdba9f89ef89fcccc050ab61d91dfba9fbaf" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.105.4", ] [[package]] @@ -292,7 +363,7 @@ dependencies = [ "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-control", - "cranelift-entity", + "cranelift-entity 0.105.4", "cranelift-isle", "gimli 0.28.1", "hashbrown 0.14.5", @@ -336,6 +407,16 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "cranelift-entity" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8cfdc315e5d18997093e040a8d234bea1ac1e118a716d3e30f40d449e78207b" +dependencies = [ + "serde", + "serde_derive", +] + [[package]] name = "cranelift-frontend" version = "0.105.4" @@ -372,13 +453,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d4c4a785a7866da89d20df159e3c4f96a5f14feb83b1f5998cfd5fe2e74d06" dependencies = [ "cranelift-codegen", - "cranelift-entity", + "cranelift-entity 0.105.4", "cranelift-frontend", "itertools", "log", "smallvec", - "wasmparser", - "wasmtime-types", + "wasmparser 0.121.2", + "wasmtime-types 18.0.4", ] [[package]] @@ -502,6 +583,12 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +[[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.34" @@ -701,6 +788,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", + "serde", ] [[package]] @@ -978,6 +1066,12 @@ version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + [[package]] name = "libredox" version = "0.1.3" @@ -1015,6 +1109,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" @@ -1132,6 +1235,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" @@ -1402,6 +1516,9 @@ name = "smallvec" version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] [[package]] name = "socket2" @@ -1454,8 +1571,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0682e006dd35771e392a6623ac180999a9a854b1d4a6c12fb2e804941c2b1f58" dependencies = [ "bitflags", - "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", + "cap-fs-ext 3.1.0", + "cap-std 3.1.0", "fd-lock", "io-lifetimes", "rustix", @@ -1644,21 +1777,47 @@ checksum = "5ce5d3e7e6f0fabe518a9bea9c803081544ef38d986f04d7f86737faed32d2ae" dependencies = [ "anyhow", "bitflags", - "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", + "system-interface 0.26.1", "thiserror", "tracing", - "wasmtime", - "wiggle", + "wasmtime 18.0.4", + "wiggle 18.0.4", + "windows-sys 0.52.0", +] + +[[package]] +name = "wasi-common" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b86fd41e1e26ff6af9451c6a332a5ce5f5283ca51e87d875cdd9a05305598ee3" +dependencies = [ + "anyhow", + "bitflags", + "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 0.27.2", + "thiserror", + "tracing", + "wasmtime 22.0.0", + "wiggle 22.0.0", "windows-sys 0.52.0", ] @@ -1741,11 +1900,11 @@ dependencies = [ "once_cell", "rand", "rustler", - "wasi-common", - "wasmtime", + "wasi-common 22.0.0", + "wasmtime 18.0.4", "wasmtime-wasi", "wat", - "wiggle", + "wiggle 18.0.4", ] [[package]] @@ -1759,6 +1918,20 @@ dependencies = [ "semver", ] +[[package]] +name = "wasmparser" +version = "0.209.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07035cc9a9b41e62d3bb3a3815a66ab87c993c06fe1cf6b2a3f2a18499d937db" +dependencies = [ + "ahash", + "bitflags", + "hashbrown 0.14.5", + "indexmap", + "semver", + "serde", +] + [[package]] name = "wasmprinter" version = "0.2.80" @@ -1766,7 +1939,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60e73986a6b7fdfedb7c5bf9e7eb71135486507c8fbc4c0c42cffcb6532988b7" dependencies = [ "anyhow", - "wasmparser", + "wasmparser 0.121.2", ] [[package]] @@ -1798,21 +1971,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.4", "wasmtime-fiber", "wasmtime-jit-debug", - "wasmtime-jit-icache-coherence", + "wasmtime-jit-icache-coherence 18.0.4", "wasmtime-runtime", "wasmtime-winch", "wat", "windows-sys 0.52.0", ] +[[package]] +name = "wasmtime" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "786d8b5e7a4d54917c5ebe555b9667337e5f93383f49bddaaeec2eba68093b45" +dependencies = [ + "anyhow", + "bumpalo", + "cc", + "cfg-if", + "hashbrown 0.14.5", + "indexmap", + "libc", + "libm", + "log", + "mach2", + "memfd", + "memoffset", + "object 0.36.0", + "once_cell", + "paste", + "postcard", + "psm", + "rustix", + "serde", + "serde_derive", + "smallvec", + "sptr", + "target-lexicon", + "wasmparser 0.209.1", + "wasmtime-asm-macros 22.0.0", + "wasmtime-environ 22.0.0", + "wasmtime-jit-icache-coherence 22.0.0", + "wasmtime-slab", + "wasmtime-versioned-export-macros 22.0.0", + "windows-sys 0.52.0", +] + [[package]] name = "wasmtime-asm-macros" version = "18.0.4" @@ -1822,6 +2033,15 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "wasmtime-asm-macros" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d697d99c341d4a9ffb72f3af7a02124d233eeb59aee010f36d88e97cca553d5e" +dependencies = [ + "cfg-if", +] + [[package]] name = "wasmtime-cache" version = "18.0.4" @@ -1873,7 +2093,7 @@ dependencies = [ "cfg-if", "cranelift-codegen", "cranelift-control", - "cranelift-entity", + "cranelift-entity 0.105.4", "cranelift-frontend", "cranelift-native", "cranelift-wasm", @@ -1882,10 +2102,10 @@ dependencies = [ "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.4", + "wasmtime-versioned-export-macros 18.0.4", ] [[package]] @@ -1901,7 +2121,7 @@ dependencies = [ "gimli 0.28.1", "object 0.32.2", "target-lexicon", - "wasmtime-environ", + "wasmtime-environ 18.0.4", ] [[package]] @@ -1913,7 +2133,7 @@ dependencies = [ "anyhow", "bincode", "cpp_demangle", - "cranelift-entity", + "cranelift-entity 0.105.4", "gimli 0.28.1", "indexmap", "log", @@ -1924,10 +2144,30 @@ dependencies = [ "target-lexicon", "thiserror", "wasm-encoder 0.41.2", - "wasmparser", + "wasmparser 0.121.2", "wasmprinter", "wasmtime-component-util", - "wasmtime-types", + "wasmtime-types 18.0.4", +] + +[[package]] +name = "wasmtime-environ" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f444e900e848b884d8a8a2949b6f5b92af642a3e663ff8fbe78731143a55be61" +dependencies = [ + "anyhow", + "cranelift-entity 0.109.0", + "gimli 0.28.1", + "indexmap", + "log", + "object 0.36.0", + "postcard", + "serde", + "serde_derive", + "target-lexicon", + "wasmparser 0.209.1", + "wasmtime-types 22.0.0", ] [[package]] @@ -1940,8 +2180,8 @@ dependencies = [ "cc", "cfg-if", "rustix", - "wasmtime-asm-macros", - "wasmtime-versioned-export-macros", + "wasmtime-asm-macros 18.0.4", + "wasmtime-versioned-export-macros 18.0.4", "windows-sys 0.52.0", ] @@ -1954,7 +2194,7 @@ dependencies = [ "object 0.32.2", "once_cell", "rustix", - "wasmtime-versioned-export-macros", + "wasmtime-versioned-export-macros 18.0.4", ] [[package]] @@ -1968,6 +2208,18 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5afe2f0499542f9a4bcfa1b55bfdda803b6ade4e7c93c6b99e0f39dba44b0a91" +dependencies = [ + "anyhow", + "cfg-if", + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "wasmtime-runtime" version = "18.0.4" @@ -1989,26 +2241,45 @@ dependencies = [ "rustix", "sptr", "wasm-encoder 0.41.2", - "wasmtime-asm-macros", - "wasmtime-environ", + "wasmtime-asm-macros 18.0.4", + "wasmtime-environ 18.0.4", "wasmtime-fiber", "wasmtime-jit-debug", - "wasmtime-versioned-export-macros", + "wasmtime-versioned-export-macros 18.0.4", "wasmtime-wmemcheck", "windows-sys 0.52.0", ] +[[package]] +name = "wasmtime-slab" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a7de1f2bec5bbb35d532e61c85c049dc84ae671df60492f90b954ecf21169e7" + [[package]] name = "wasmtime-types" version = "18.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "530b94c627a454d24f520173d3145112d1b807c44c82697a57e1d8e28390cde4" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.105.4", "serde", "serde_derive", "thiserror", - "wasmparser", + "wasmparser 0.121.2", +] + +[[package]] +name = "wasmtime-types" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "412463e9000e14cf6856be48628d2213c20c153e29ffc22b036980c892ea6964" +dependencies = [ + "cranelift-entity 0.109.0", + "serde", + "serde_derive", + "smallvec", + "wasmparser 0.209.1", ] [[package]] @@ -2022,6 +2293,17 @@ dependencies = [ "syn", ] +[[package]] +name = "wasmtime-versioned-export-macros" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de5a9bc4f44ceeb168e9e8e3be4e0b4beb9095b468479663a9e24c667e36826f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "wasmtime-wasi" version = "18.0.4" @@ -2032,11 +2314,11 @@ dependencies = [ "async-trait", "bitflags", "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", @@ -2044,14 +2326,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.4", + "wasmtime 18.0.4", + "wiggle 18.0.4", "windows-sys 0.52.0", ] @@ -2066,9 +2348,9 @@ dependencies = [ "gimli 0.28.1", "object 0.32.2", "target-lexicon", - "wasmparser", + "wasmparser 0.121.2", "wasmtime-cranelift-shared", - "wasmtime-environ", + "wasmtime-environ 18.0.4", "winch-codegen", ] @@ -2132,11 +2414,26 @@ dependencies = [ "bitflags", "thiserror", "tracing", - "wasmtime", - "wiggle-macro", + "wasmtime 18.0.4", + "wiggle-macro 18.0.4", "witx", ] +[[package]] +name = "wiggle" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29830e5d01c182d24b94092c697aa7ab0ee97d22e78a2bf40ca91eae6ebca5c2" +dependencies = [ + "anyhow", + "async-trait", + "bitflags", + "thiserror", + "tracing", + "wasmtime 22.0.0", + "wiggle-macro 22.0.0", +] + [[package]] name = "wiggle-generate" version = "18.0.4" @@ -2152,6 +2449,21 @@ dependencies = [ "witx", ] +[[package]] +name = "wiggle-generate" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "557567f2793508760cd855f7659b7a0b9dc4dbc451f53f1415d6943a15311ade" +dependencies = [ + "anyhow", + "heck", + "proc-macro2", + "quote", + "shellexpand", + "syn", + "witx", +] + [[package]] name = "wiggle-macro" version = "18.0.4" @@ -2161,7 +2473,19 @@ dependencies = [ "proc-macro2", "quote", "syn", - "wiggle-generate", + "wiggle-generate 18.0.4", +] + +[[package]] +name = "wiggle-macro" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc26129a8aea20b62c961d1b9ab4a3c3b56b10042ed85d004f8678af0f21ba6e" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wiggle-generate 22.0.0", ] [[package]] @@ -2198,8 +2522,8 @@ dependencies = [ "regalloc2", "smallvec", "target-lexicon", - "wasmparser", - "wasmtime-environ", + "wasmparser 0.121.2", + "wasmtime-environ 18.0.4", ] [[package]] diff --git a/native/wasmex/Cargo.toml b/native/wasmex/Cargo.toml index 6f720ff3..ed95bee9 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 = "22.0.0" wiggle = "18.0.2" wat = "1.202.0"