diff --git a/native/wasmex/Cargo.lock b/native/wasmex/Cargo.lock index cbbdbde7..aa24c4e8 100644 --- a/native/wasmex/Cargo.lock +++ b/native/wasmex/Cargo.lock @@ -271,7 +271,7 @@ version = "0.99.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a91a1ccf6fb772808742db2f51e2179f25b1ec559cbe39ea080c72ff61caf8f" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.99.2", ] [[package]] @@ -285,7 +285,7 @@ dependencies = [ "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-control", - "cranelift-entity", + "cranelift-entity 0.99.2", "cranelift-isle", "gimli 0.27.3", "hashbrown 0.13.2", @@ -328,6 +328,16 @@ dependencies = [ "serde", ] +[[package]] +name = "cranelift-entity" +version = "0.105.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a71e11061a75b1184c09bea97c026a88f08b59ade96a7bb1f259d4ea0df2e942" +dependencies = [ + "serde", + "serde_derive", +] + [[package]] name = "cranelift-frontend" version = "0.99.2" @@ -364,13 +374,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8635c88b424f1d232436f683a301143b36953cd98fc6f86f7bac862dfeb6f5" dependencies = [ "cranelift-codegen", - "cranelift-entity", + "cranelift-entity 0.99.2", "cranelift-frontend", "itertools", "log", "smallvec", "wasmparser 0.110.0", - "wasmtime-types", + "wasmtime-types 12.0.2", ] [[package]] @@ -527,6 +537,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + [[package]] name = "fd-lock" version = "4.0.2" @@ -678,7 +694,7 @@ version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" dependencies = [ - "fallible-iterator", + "fallible-iterator 0.2.0", "indexmap 1.9.3", "stable_deref_trait", ] @@ -688,6 +704,11 @@ name = "gimli" version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +dependencies = [ + "fallible-iterator 0.3.0", + "indexmap 2.2.5", + "stable_deref_trait", +] [[package]] name = "hashbrown" @@ -709,6 +730,9 @@ name = "hashbrown" version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash", +] [[package]] name = "heck" @@ -1002,6 +1026,9 @@ version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ + "crc32fast", + "hashbrown 0.14.3", + "indexmap 2.2.5", "memchr", ] @@ -1619,8 +1646,8 @@ dependencies = [ "rustix", "thiserror", "tracing", - "wasmtime", - "wiggle", + "wasmtime 12.0.2", + "wiggle 12.0.2", "windows-sys 0.48.0", ] @@ -1687,6 +1714,15 @@ dependencies = [ "leb128", ] +[[package]] +name = "wasm-encoder" +version = "0.41.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "972f97a5d8318f908dded23594188a90bcd09365986b1163e66d70170e5287ae" +dependencies = [ + "leb128", +] + [[package]] name = "wasm-encoder" version = "0.201.0" @@ -1704,10 +1740,10 @@ dependencies = [ "rand", "rustler", "wasi-common", - "wasmtime", + "wasmtime 12.0.2", "wasmtime-wasi", "wat", - "wiggle", + "wiggle 18.0.2", ] [[package]] @@ -1768,18 +1804,50 @@ dependencies = [ "wasm-encoder 0.31.1", "wasmparser 0.110.0", "wasmtime-cache", - "wasmtime-component-macro", - "wasmtime-component-util", + "wasmtime-component-macro 12.0.2", + "wasmtime-component-util 12.0.2", "wasmtime-cranelift", - "wasmtime-environ", - "wasmtime-fiber", + "wasmtime-environ 12.0.2", + "wasmtime-fiber 12.0.2", "wasmtime-jit", - "wasmtime-runtime", + "wasmtime-runtime 12.0.2", "wasmtime-winch", "wat", "windows-sys 0.48.0", ] +[[package]] +name = "wasmtime" +version = "18.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c843b8bc4dd4f3a76173ba93405c71111d570af0d90ea5f6299c705d0c2add2" +dependencies = [ + "anyhow", + "async-trait", + "bincode", + "bumpalo", + "cfg-if", + "gimli 0.28.1", + "indexmap 2.2.5", + "libc", + "log", + "object 0.32.2", + "once_cell", + "paste", + "rustix", + "serde", + "serde_derive", + "serde_json", + "target-lexicon", + "wasmparser 0.121.2", + "wasmtime-component-macro 18.0.2", + "wasmtime-environ 18.0.2", + "wasmtime-fiber 18.0.2", + "wasmtime-jit-icache-coherence 18.0.2", + "wasmtime-runtime 18.0.2", + "windows-sys 0.52.0", +] + [[package]] name = "wasmtime-asm-macros" version = "12.0.2" @@ -1789,6 +1857,15 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "wasmtime-asm-macros" +version = "18.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b9d329c718b3a18412a6a017c912b539baa8fe1210d21b651f6b4dbafed743" +dependencies = [ + "cfg-if", +] + [[package]] name = "wasmtime-cache" version = "12.0.2" @@ -1819,9 +1896,24 @@ dependencies = [ "proc-macro2", "quote", "syn", - "wasmtime-component-util", - "wasmtime-wit-bindgen", - "wit-parser", + "wasmtime-component-util 12.0.2", + "wasmtime-wit-bindgen 12.0.2", + "wit-parser 0.9.2", +] + +[[package]] +name = "wasmtime-component-macro" +version = "18.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8d55ddfd02898885c39638eae9631cd430c83a368f5996ed0f7bfb181d02157" +dependencies = [ + "anyhow", + "proc-macro2", + "quote", + "syn", + "wasmtime-component-util 18.0.2", + "wasmtime-wit-bindgen 18.0.2", + "wit-parser 0.13.2", ] [[package]] @@ -1830,6 +1922,12 @@ version = "12.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74f421bc59c753dcd24e39601928a0f2915adf15f40d8ba0066c4cf23f92c9a0" +[[package]] +name = "wasmtime-component-util" +version = "18.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6d69c430cddc70ec42159506962c66983ce0192ebde4eb125b7aabc49cff88" + [[package]] name = "wasmtime-cranelift" version = "12.0.2" @@ -1839,7 +1937,7 @@ dependencies = [ "anyhow", "cranelift-codegen", "cranelift-control", - "cranelift-entity", + "cranelift-entity 0.99.2", "cranelift-frontend", "cranelift-native", "cranelift-wasm", @@ -1850,8 +1948,8 @@ dependencies = [ "thiserror", "wasmparser 0.110.0", "wasmtime-cranelift-shared", - "wasmtime-environ", - "wasmtime-versioned-export-macros", + "wasmtime-environ 12.0.2", + "wasmtime-versioned-export-macros 12.0.2", ] [[package]] @@ -1867,7 +1965,7 @@ dependencies = [ "gimli 0.27.3", "object 0.31.1", "target-lexicon", - "wasmtime-environ", + "wasmtime-environ 12.0.2", ] [[package]] @@ -1877,7 +1975,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8b9227b1001229ff125e0f76bf1d5b9dc4895e6bcfd5cc35a56f84685964ec7" dependencies = [ "anyhow", - "cranelift-entity", + "cranelift-entity 0.99.2", "gimli 0.27.3", "indexmap 2.2.5", "log", @@ -1888,8 +1986,29 @@ dependencies = [ "wasm-encoder 0.31.1", "wasmparser 0.110.0", "wasmprinter", - "wasmtime-component-util", - "wasmtime-types", + "wasmtime-component-util 12.0.2", + "wasmtime-types 12.0.2", +] + +[[package]] +name = "wasmtime-environ" +version = "18.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82bf1a47f384610da19f58b0fd392ca6a3b720974315c08afb0392c0f3951fed" +dependencies = [ + "anyhow", + "bincode", + "cranelift-entity 0.105.2", + "gimli 0.28.1", + "indexmap 2.2.5", + "log", + "object 0.32.2", + "serde", + "serde_derive", + "target-lexicon", + "thiserror", + "wasmparser 0.121.2", + "wasmtime-types 18.0.2", ] [[package]] @@ -1901,11 +2020,26 @@ dependencies = [ "cc", "cfg-if", "rustix", - "wasmtime-asm-macros", - "wasmtime-versioned-export-macros", + "wasmtime-asm-macros 12.0.2", + "wasmtime-versioned-export-macros 12.0.2", "windows-sys 0.48.0", ] +[[package]] +name = "wasmtime-fiber" +version = "18.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e31aecada2831e067ebfe93faa3001cc153d506f8af40bbea58aa1d20fe4820" +dependencies = [ + "anyhow", + "cc", + "cfg-if", + "rustix", + "wasmtime-asm-macros 18.0.2", + "wasmtime-versioned-export-macros 18.0.2", + "windows-sys 0.52.0", +] + [[package]] name = "wasmtime-jit" version = "12.0.2" @@ -1925,10 +2059,10 @@ dependencies = [ "rustix", "serde", "target-lexicon", - "wasmtime-environ", + "wasmtime-environ 12.0.2", "wasmtime-jit-debug", - "wasmtime-jit-icache-coherence", - "wasmtime-runtime", + "wasmtime-jit-icache-coherence 12.0.2", + "wasmtime-runtime 12.0.2", "windows-sys 0.48.0", ] @@ -1941,7 +2075,7 @@ dependencies = [ "object 0.31.1", "once_cell", "rustix", - "wasmtime-versioned-export-macros", + "wasmtime-versioned-export-macros 12.0.2", ] [[package]] @@ -1955,6 +2089,17 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "18.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33f4121cb29dda08139b2824a734dd095d83ce843f2d613a84eb580b9cfc17ac" +dependencies = [ + "cfg-if", + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "wasmtime-runtime" version = "12.0.2" @@ -1976,26 +2121,67 @@ dependencies = [ "rustix", "sptr", "wasm-encoder 0.31.1", - "wasmtime-asm-macros", - "wasmtime-environ", - "wasmtime-fiber", + "wasmtime-asm-macros 12.0.2", + "wasmtime-environ 12.0.2", + "wasmtime-fiber 12.0.2", "wasmtime-jit-debug", - "wasmtime-versioned-export-macros", + "wasmtime-versioned-export-macros 12.0.2", "windows-sys 0.48.0", ] +[[package]] +name = "wasmtime-runtime" +version = "18.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e517f2b996bb3b0e34a82a2bce194f850d9bcfc25c08328ef5fb71b071066b8" +dependencies = [ + "anyhow", + "cc", + "cfg-if", + "indexmap 2.2.5", + "libc", + "log", + "mach", + "memfd", + "memoffset", + "paste", + "psm", + "rustix", + "sptr", + "wasm-encoder 0.41.2", + "wasmtime-asm-macros 18.0.2", + "wasmtime-environ 18.0.2", + "wasmtime-fiber 18.0.2", + "wasmtime-versioned-export-macros 18.0.2", + "wasmtime-wmemcheck", + "windows-sys 0.52.0", +] + [[package]] name = "wasmtime-types" version = "12.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77943729d4b46141538e8d0b6168915dc5f88575ecdfea26753fd3ba8bab244a" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.99.2", "serde", "thiserror", "wasmparser 0.110.0", ] +[[package]] +name = "wasmtime-types" +version = "18.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a327d7a0ef57bd52a507d28b4561a74126c7a8535a2fc6f2025716bc6a52e8" +dependencies = [ + "cranelift-entity 0.105.2", + "serde", + "serde_derive", + "thiserror", + "wasmparser 0.121.2", +] + [[package]] name = "wasmtime-versioned-export-macros" version = "12.0.2" @@ -2007,6 +2193,17 @@ dependencies = [ "syn", ] +[[package]] +name = "wasmtime-versioned-export-macros" +version = "18.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ef32eea9fc7035a55159a679d1e89b43ece5ae45d24eed4808e6a92c99a0da4" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "wasmtime-wasi" version = "12.0.2" @@ -2033,8 +2230,8 @@ dependencies = [ "tracing", "wasi-cap-std-sync", "wasi-common", - "wasmtime", - "wiggle", + "wasmtime 12.0.2", + "wiggle 12.0.2", "windows-sys 0.48.0", ] @@ -2051,7 +2248,7 @@ dependencies = [ "target-lexicon", "wasmparser 0.110.0", "wasmtime-cranelift-shared", - "wasmtime-environ", + "wasmtime-environ 12.0.2", "winch-codegen", ] @@ -2064,9 +2261,27 @@ dependencies = [ "anyhow", "heck", "indexmap 2.2.5", - "wit-parser", + "wit-parser 0.9.2", +] + +[[package]] +name = "wasmtime-wit-bindgen" +version = "18.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca677c36869e45602617b25a9968ec0d895ad9a0aee3756d9dee1ddd89456f91" +dependencies = [ + "anyhow", + "heck", + "indexmap 2.2.5", + "wit-parser 0.13.2", ] +[[package]] +name = "wasmtime-wmemcheck" +version = "18.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4cbfb052d66f03603a9b77f18171ea245c7805714caad370a549a6344bf86b" + [[package]] name = "wast" version = "35.0.2" @@ -2109,8 +2324,23 @@ dependencies = [ "bitflags 2.4.2", "thiserror", "tracing", - "wasmtime", - "wiggle-macro", + "wasmtime 12.0.2", + "wiggle-macro 12.0.2", +] + +[[package]] +name = "wiggle" +version = "18.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b69812e493f8a43d8551abfaaf9539e1aff0cf56a58cdd276845fc4af035d0cd" +dependencies = [ + "anyhow", + "async-trait", + "bitflags 2.4.2", + "thiserror", + "tracing", + "wasmtime 18.0.2", + "wiggle-macro 18.0.2", "witx", ] @@ -2129,6 +2359,21 @@ dependencies = [ "witx", ] +[[package]] +name = "wiggle-generate" +version = "18.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0446357a5a7af0172848b6eca7b2aa1ab7d90065cd2ab02b633a322e1a52f636" +dependencies = [ + "anyhow", + "heck", + "proc-macro2", + "quote", + "shellexpand", + "syn", + "witx", +] + [[package]] name = "wiggle-macro" version = "12.0.2" @@ -2138,7 +2383,19 @@ dependencies = [ "proc-macro2", "quote", "syn", - "wiggle-generate", + "wiggle-generate 12.0.2", +] + +[[package]] +name = "wiggle-macro" +version = "18.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9498ef53a12cf25dc6de9baef6ccd8b58d159202c412a19f4d72b218393086c5" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wiggle-generate 18.0.2", ] [[package]] @@ -2185,7 +2442,7 @@ dependencies = [ "smallvec", "target-lexicon", "wasmparser 0.110.0", - "wasmtime-environ", + "wasmtime-environ 12.0.2", ] [[package]] @@ -2355,6 +2612,23 @@ dependencies = [ "url", ] +[[package]] +name = "wit-parser" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "316b36a9f0005f5aa4b03c39bc3728d045df136f8c13a73b7db4510dec725e08" +dependencies = [ + "anyhow", + "id-arena", + "indexmap 2.2.5", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", +] + [[package]] name = "witx" version = "0.9.1" diff --git a/native/wasmex/Cargo.toml b/native/wasmex/Cargo.toml index bcdfa2e0..3b6af5b3 100644 --- a/native/wasmex/Cargo.toml +++ b/native/wasmex/Cargo.toml @@ -24,5 +24,5 @@ rand = "0.8.5" wasmtime = "12.0.2" wasmtime-wasi = "12.0.2" wasi-common = "12.0.2" -wiggle = "12.0.2" +wiggle = "18.0.2" wat = "1.0.82"