diff --git a/native/wasmex/Cargo.lock b/native/wasmex/Cargo.lock index d2bebc72..98780678 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", ] @@ -274,7 +274,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 +288,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 +332,16 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "cranelift-entity" +version = "0.107.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32acd0632ba65c2566e75f64af9ef094bb8d90e58a9fbd33d920977a9d85c054" +dependencies = [ + "serde", + "serde_derive", +] + [[package]] name = "cranelift-frontend" version = "0.105.2" @@ -368,13 +378,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]] @@ -869,6 +879,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 +960,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" @@ -1508,8 +1536,8 @@ dependencies = [ "system-interface", "thiserror", "tracing", - "wasmtime", - "wiggle", + "wasmtime 18.0.2", + "wiggle 18.0.2", "windows-sys 0.52.0", ] @@ -1593,10 +1621,10 @@ dependencies = [ "rand", "rustler", "wasi-common", - "wasmtime", + "wasmtime 18.0.2", "wasmtime-wasi", "wat", - "wiggle", + "wiggle 20.0.2", ] [[package]] @@ -1610,6 +1638,17 @@ dependencies = [ "semver", ] +[[package]] +name = "wasmparser" +version = "0.202.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6998515d3cf3f8b980ef7c11b29a9b1017d4cf86b99ae93b546992df9931413" +dependencies = [ + "bitflags 2.4.2", + "indexmap", + "semver", +] + [[package]] name = "wasmprinter" version = "0.2.80" @@ -1617,7 +1656,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60e73986a6b7fdfedb7c5bf9e7eb71135486507c8fbc4c0c42cffcb6532988b7" dependencies = [ "anyhow", - "wasmparser", + "wasmparser 0.121.2", ] [[package]] @@ -1639,7 +1678,7 @@ dependencies = [ "ittapi", "libc", "log", - "object", + "object 0.32.2", "once_cell", "paste", "rayon", @@ -1649,21 +1688,54 @@ dependencies = [ "serde_json", "target-lexicon", "wasm-encoder 0.41.2", - "wasmparser", + "wasmparser 0.121.2", "wasmtime-cache", - "wasmtime-component-macro", - "wasmtime-component-util", + "wasmtime-component-macro 18.0.2", + "wasmtime-component-util 18.0.2", "wasmtime-cranelift", - "wasmtime-environ", - "wasmtime-fiber", + "wasmtime-environ 18.0.2", + "wasmtime-fiber 18.0.2", "wasmtime-jit-debug", - "wasmtime-jit-icache-coherence", - "wasmtime-runtime", + "wasmtime-jit-icache-coherence 18.0.2", + "wasmtime-runtime 18.0.2", "wasmtime-winch", "wat", "windows-sys 0.52.0", ] +[[package]] +name = "wasmtime" +version = "20.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4af5cb32045daee8476711eb12b8b71275c2dd1fc7a58cc2a11b33ce9205f6a2" +dependencies = [ + "anyhow", + "async-trait", + "bincode", + "bumpalo", + "cfg-if", + "gimli", + "indexmap", + "libc", + "log", + "object 0.33.0", + "once_cell", + "paste", + "rustix", + "serde", + "serde_derive", + "serde_json", + "target-lexicon", + "wasmparser 0.202.0", + "wasmtime-component-macro 20.0.2", + "wasmtime-environ 20.0.2", + "wasmtime-fiber 20.0.2", + "wasmtime-jit-icache-coherence 20.0.2", + "wasmtime-runtime 20.0.2", + "wasmtime-slab", + "windows-sys 0.52.0", +] + [[package]] name = "wasmtime-asm-macros" version = "18.0.2" @@ -1673,6 +1745,15 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "wasmtime-asm-macros" +version = "20.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7515c4d24c8b55c0feab67e3d52a42f999fda8b9cfafbd69a82ed6bcf299d26e" +dependencies = [ + "cfg-if", +] + [[package]] name = "wasmtime-cache" version = "18.0.2" @@ -1703,9 +1784,24 @@ dependencies = [ "proc-macro2", "quote", "syn", - "wasmtime-component-util", - "wasmtime-wit-bindgen", - "wit-parser", + "wasmtime-component-util 18.0.2", + "wasmtime-wit-bindgen 18.0.2", + "wit-parser 0.13.2", +] + +[[package]] +name = "wasmtime-component-macro" +version = "20.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794839a710a39a12677c67ff43fec54ef00d0ca6c6f631209a7c5524522221d3" +dependencies = [ + "anyhow", + "proc-macro2", + "quote", + "syn", + "wasmtime-component-util 20.0.2", + "wasmtime-wit-bindgen 20.0.2", + "wit-parser 0.202.0", ] [[package]] @@ -1714,6 +1810,12 @@ version = "18.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d6d69c430cddc70ec42159506962c66983ce0192ebde4eb125b7aabc49cff88" +[[package]] +name = "wasmtime-component-util" +version = "20.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7839a1b9e15d17be1cb2a105f18be8e0bbf52bdec7a7cd6eb5d80d4c2cdf74f0" + [[package]] name = "wasmtime-cranelift" version = "18.0.2" @@ -1724,19 +1826,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 +1852,9 @@ dependencies = [ "cranelift-control", "cranelift-native", "gimli", - "object", + "object 0.32.2", "target-lexicon", - "wasmtime-environ", + "wasmtime-environ 18.0.2", ] [[package]] @@ -1764,21 +1866,42 @@ 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-component-util 18.0.2", + "wasmtime-types 18.0.2", +] + +[[package]] +name = "wasmtime-environ" +version = "20.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad72e2e3f7ea5b50fedf66dd36ba24634e4f445c370644683b433d45d88f6126" +dependencies = [ + "anyhow", + "bincode", + "cranelift-entity 0.107.2", + "gimli", + "indexmap", + "log", + "object 0.33.0", + "serde", + "serde_derive", + "target-lexicon", + "thiserror", + "wasmparser 0.202.0", + "wasmtime-types 20.0.2", ] [[package]] @@ -1791,8 +1914,23 @@ 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", +] + +[[package]] +name = "wasmtime-fiber" +version = "20.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dbdf3053e7e7ced0cd4ed76579995b62169a1a43696890584eae2de2e33bf54" +dependencies = [ + "anyhow", + "cc", + "cfg-if", + "rustix", + "wasmtime-asm-macros 20.0.2", + "wasmtime-versioned-export-macros 20.0.2", "windows-sys 0.52.0", ] @@ -1802,10 +1940,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 +1957,17 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "20.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ede45379f3b4d395d8947006de8043801806099a240a26db553919b68e96ab15" +dependencies = [ + "cfg-if", + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "wasmtime-runtime" version = "18.0.2" @@ -1840,26 +1989,72 @@ dependencies = [ "rustix", "sptr", "wasm-encoder 0.41.2", - "wasmtime-asm-macros", - "wasmtime-environ", - "wasmtime-fiber", + "wasmtime-asm-macros 18.0.2", + "wasmtime-environ 18.0.2", + "wasmtime-fiber 18.0.2", "wasmtime-jit-debug", - "wasmtime-versioned-export-macros", + "wasmtime-versioned-export-macros 18.0.2", "wasmtime-wmemcheck", "windows-sys 0.52.0", ] +[[package]] +name = "wasmtime-runtime" +version = "20.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65019d29d175c567b84173f2adf3b7a3af6d5592f8fe510dccae55d2569ec0d2" +dependencies = [ + "anyhow", + "cc", + "cfg-if", + "indexmap", + "libc", + "log", + "mach2", + "memfd", + "memoffset", + "paste", + "psm", + "rustix", + "sptr", + "wasmtime-asm-macros 20.0.2", + "wasmtime-environ 20.0.2", + "wasmtime-fiber 20.0.2", + "wasmtime-slab", + "wasmtime-versioned-export-macros 20.0.2", + "windows-sys 0.52.0", +] + +[[package]] +name = "wasmtime-slab" +version = "20.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6585868f5c427c3e9d2a8c0c3354e6d7d4518a0d17723ab25a0c1eebf5d5b4" + [[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 = "20.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84d5381ff174faded38c7b2085fbe430dff59489c87a91403354d710075750fb" +dependencies = [ + "cranelift-entity 0.107.2", + "serde", + "serde_derive", + "thiserror", + "wasmparser 0.202.0", ] [[package]] @@ -1873,6 +2068,17 @@ dependencies = [ "syn", ] +[[package]] +name = "wasmtime-versioned-export-macros" +version = "20.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d3b70422fdfa915c903f003b8b42554a8ae1aa0c6208429d8314ebf5721f3ac" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "wasmtime-wasi" version = "18.0.2" @@ -1901,8 +2107,8 @@ dependencies = [ "tracing", "url", "wasi-common", - "wasmtime", - "wiggle", + "wasmtime 18.0.2", + "wiggle 18.0.2", "windows-sys 0.52.0", ] @@ -1915,11 +2121,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", ] @@ -1932,7 +2138,19 @@ dependencies = [ "anyhow", "heck", "indexmap", - "wit-parser", + "wit-parser 0.13.2", +] + +[[package]] +name = "wasmtime-wit-bindgen" +version = "20.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01840c0cfbbb01664c796e3f4edbd656e58f9d76db083c7e7c6bba59ea657a96" +dependencies = [ + "anyhow", + "heck", + "indexmap", + "wit-parser 0.202.0", ] [[package]] @@ -1983,8 +2201,23 @@ dependencies = [ "bitflags 2.4.2", "thiserror", "tracing", - "wasmtime", - "wiggle-macro", + "wasmtime 18.0.2", + "wiggle-macro 18.0.2", +] + +[[package]] +name = "wiggle" +version = "20.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93fc3510978a905f931d74784ed8685bd6453e18ad8f92809e793d48827e3cd" +dependencies = [ + "anyhow", + "async-trait", + "bitflags 2.4.2", + "thiserror", + "tracing", + "wasmtime 20.0.2", + "wiggle-macro 20.0.2", "witx", ] @@ -2003,6 +2236,21 @@ dependencies = [ "witx", ] +[[package]] +name = "wiggle-generate" +version = "20.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec3909e70f36066526ad3b2abb4855ab836f8a6b293449582563ac50d651083" +dependencies = [ + "anyhow", + "heck", + "proc-macro2", + "quote", + "shellexpand", + "syn", + "witx", +] + [[package]] name = "wiggle-macro" version = "18.0.2" @@ -2012,7 +2260,19 @@ dependencies = [ "proc-macro2", "quote", "syn", - "wiggle-generate", + "wiggle-generate 18.0.2", +] + +[[package]] +name = "wiggle-macro" +version = "20.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c31124572ab16401c491c0d4fb5fe5d17dab65fcfcc56d7d8efb1c1e56a3db" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wiggle-generate 20.0.2", ] [[package]] @@ -2049,8 +2309,8 @@ dependencies = [ "regalloc2", "smallvec", "target-lexicon", - "wasmparser", - "wasmtime-environ", + "wasmparser 0.121.2", + "wasmtime-environ 18.0.2", ] [[package]] @@ -2221,6 +2481,24 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "wit-parser" +version = "0.202.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "744237b488352f4f27bca05a10acb79474415951c450e52ebd0da784c1df2bcc" +dependencies = [ + "anyhow", + "id-arena", + "indexmap", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser 0.202.0", +] + [[package]] name = "witx" version = "0.9.1" diff --git a/native/wasmex/Cargo.toml b/native/wasmex/Cargo.toml index 6f720ff3..95dfb3fc 100644 --- a/native/wasmex/Cargo.toml +++ b/native/wasmex/Cargo.toml @@ -24,5 +24,5 @@ rand = "0.8.5" wasmtime = "18.0.2" wasmtime-wasi = "18.0.2" wasi-common = "18.0.2" -wiggle = "18.0.2" +wiggle = "20.0.2" wat = "1.202.0"