diff --git a/native/wasmex/Cargo.lock b/native/wasmex/Cargo.lock index 9885a91c..cc8753da 100644 --- a/native/wasmex/Cargo.lock +++ b/native/wasmex/Cargo.lock @@ -274,7 +274,7 @@ version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b5bb9245ec7dcc04d03110e538d31f0969d301c9d673145f4b4d5c3478539a3" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.101.4", ] [[package]] @@ -288,7 +288,7 @@ dependencies = [ "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-control", - "cranelift-entity", + "cranelift-entity 0.101.4", "cranelift-isle", "gimli", "hashbrown 0.14.3", @@ -332,6 +332,16 @@ dependencies = [ "serde_derive", ] +[[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.101.4" @@ -368,13 +378,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0edaa4cbec1bc787395c074233df2652dd62f3e29d3ee60329514a0a51e6b045" dependencies = [ "cranelift-codegen", - "cranelift-entity", + "cranelift-entity 0.101.4", "cranelift-frontend", "itertools", "log", "smallvec", "wasmparser 0.115.0", - "wasmtime-types", + "wasmtime-types 14.0.4", ] [[package]] @@ -1525,8 +1535,8 @@ dependencies = [ "rustix", "thiserror", "tracing", - "wasmtime", - "wiggle", + "wasmtime 14.0.4", + "wiggle 14.0.4", "windows-sys 0.48.0", ] @@ -1593,6 +1603,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" @@ -1610,10 +1629,10 @@ dependencies = [ "rand", "rustler", "wasi-common", - "wasmtime", + "wasmtime 14.0.4", "wasmtime-wasi", "wat", - "wiggle", + "wiggle 18.0.2", ] [[package]] @@ -1675,18 +1694,50 @@ dependencies = [ "wasm-encoder 0.35.0", "wasmparser 0.115.0", "wasmtime-cache", - "wasmtime-component-macro", - "wasmtime-component-util", + "wasmtime-component-macro 14.0.4", + "wasmtime-component-util 14.0.4", "wasmtime-cranelift", - "wasmtime-environ", - "wasmtime-fiber", + "wasmtime-environ 14.0.4", + "wasmtime-fiber 14.0.4", "wasmtime-jit", - "wasmtime-runtime", + "wasmtime-runtime 14.0.4", "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", + "indexmap", + "libc", + "log", + "object", + "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 = "14.0.4" @@ -1696,6 +1747,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 = "14.0.4" @@ -1726,9 +1786,24 @@ dependencies = [ "proc-macro2", "quote", "syn", - "wasmtime-component-util", - "wasmtime-wit-bindgen", - "wit-parser", + "wasmtime-component-util 14.0.4", + "wasmtime-wit-bindgen 14.0.4", + "wit-parser 0.12.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]] @@ -1737,6 +1812,12 @@ version = "14.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f9141a8df069e106eee0c3a8173c0809cf1a4b5630628cfb1f25ab114720093" +[[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 = "14.0.4" @@ -1747,7 +1828,7 @@ dependencies = [ "cfg-if", "cranelift-codegen", "cranelift-control", - "cranelift-entity", + "cranelift-entity 0.101.4", "cranelift-frontend", "cranelift-native", "cranelift-wasm", @@ -1758,8 +1839,8 @@ dependencies = [ "thiserror", "wasmparser 0.115.0", "wasmtime-cranelift-shared", - "wasmtime-environ", - "wasmtime-versioned-export-macros", + "wasmtime-environ 14.0.4", + "wasmtime-versioned-export-macros 14.0.4", ] [[package]] @@ -1775,7 +1856,7 @@ dependencies = [ "gimli", "object", "target-lexicon", - "wasmtime-environ", + "wasmtime-environ 14.0.4", ] [[package]] @@ -1785,7 +1866,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb6a445ce2b2810127caee6c1b79b8da4ae57712b05556a674592c18b7500a14" dependencies = [ "anyhow", - "cranelift-entity", + "cranelift-entity 0.101.4", "gimli", "indexmap", "log", @@ -1797,8 +1878,29 @@ dependencies = [ "wasm-encoder 0.35.0", "wasmparser 0.115.0", "wasmprinter", - "wasmtime-component-util", - "wasmtime-types", + "wasmtime-component-util 14.0.4", + "wasmtime-types 14.0.4", +] + +[[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", + "indexmap", + "log", + "object", + "serde", + "serde_derive", + "target-lexicon", + "thiserror", + "wasmparser 0.121.2", + "wasmtime-types 18.0.2", ] [[package]] @@ -1810,11 +1912,26 @@ dependencies = [ "cc", "cfg-if", "rustix", - "wasmtime-asm-macros", - "wasmtime-versioned-export-macros", + "wasmtime-asm-macros 14.0.4", + "wasmtime-versioned-export-macros 14.0.4", "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 = "14.0.4" @@ -1835,10 +1952,10 @@ dependencies = [ "serde", "serde_derive", "target-lexicon", - "wasmtime-environ", + "wasmtime-environ 14.0.4", "wasmtime-jit-debug", - "wasmtime-jit-icache-coherence", - "wasmtime-runtime", + "wasmtime-jit-icache-coherence 14.0.4", + "wasmtime-runtime 14.0.4", "windows-sys 0.48.0", ] @@ -1851,7 +1968,7 @@ dependencies = [ "object", "once_cell", "rustix", - "wasmtime-versioned-export-macros", + "wasmtime-versioned-export-macros 14.0.4", ] [[package]] @@ -1865,6 +1982,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 = "14.0.4" @@ -1886,28 +2014,69 @@ dependencies = [ "rustix", "sptr", "wasm-encoder 0.35.0", - "wasmtime-asm-macros", - "wasmtime-environ", - "wasmtime-fiber", + "wasmtime-asm-macros 14.0.4", + "wasmtime-environ 14.0.4", + "wasmtime-fiber 14.0.4", "wasmtime-jit-debug", - "wasmtime-versioned-export-macros", - "wasmtime-wmemcheck", + "wasmtime-versioned-export-macros 14.0.4", + "wasmtime-wmemcheck 14.0.4", "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", + "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 18.0.2", + "windows-sys 0.52.0", +] + [[package]] name = "wasmtime-types" version = "14.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e810a0d2e869abd1cb42bd232990f6bd211672b3d202d2ae7e70ffb97ed70ea3" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.101.4", "serde", "serde_derive", "thiserror", "wasmparser 0.115.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 = "14.0.4" @@ -1919,6 +2088,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 = "14.0.4" @@ -1949,8 +2129,8 @@ dependencies = [ "url", "wasi-cap-std-sync", "wasi-common", - "wasmtime", - "wiggle", + "wasmtime 14.0.4", + "wiggle 14.0.4", "windows-sys 0.48.0", ] @@ -1967,7 +2147,7 @@ dependencies = [ "target-lexicon", "wasmparser 0.115.0", "wasmtime-cranelift-shared", - "wasmtime-environ", + "wasmtime-environ 14.0.4", "winch-codegen", ] @@ -1980,7 +2160,19 @@ dependencies = [ "anyhow", "heck", "indexmap", - "wit-parser", + "wit-parser 0.12.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", + "wit-parser 0.13.2", ] [[package]] @@ -1989,6 +2181,12 @@ version = "14.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9dafab2db172a53e23940e0fa3078c202f567ee5f13f4b42f66b694fab43c658" +[[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" @@ -2031,8 +2229,23 @@ dependencies = [ "bitflags 2.4.2", "thiserror", "tracing", - "wasmtime", - "wiggle-macro", + "wasmtime 14.0.4", + "wiggle-macro 14.0.4", +] + +[[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", ] @@ -2051,6 +2264,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 = "14.0.4" @@ -2060,7 +2288,19 @@ dependencies = [ "proc-macro2", "quote", "syn", - "wiggle-generate", + "wiggle-generate 14.0.4", +] + +[[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]] @@ -2098,7 +2338,7 @@ dependencies = [ "smallvec", "target-lexicon", "wasmparser 0.115.0", - "wasmtime-environ", + "wasmtime-environ 14.0.4", ] [[package]] @@ -2269,6 +2509,23 @@ dependencies = [ "unicode-xid", ] +[[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", + "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 c00fc7d3..b37b232d 100644 --- a/native/wasmex/Cargo.toml +++ b/native/wasmex/Cargo.toml @@ -24,5 +24,5 @@ rand = "0.8.5" wasmtime = "14.0.4" wasmtime-wasi = "14.0.4" wasi-common = "14.0.4" -wiggle = "14.0.4" -wat = "1.0.82" +wiggle = "18.0.2" +wat = "1.201.0"