diff --git a/native/wasmex/Cargo.lock b/native/wasmex/Cargo.lock index d2bebc72..7b12159f 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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78689d6588f53981bf005b82d94125cc40cf9856b667bc276d1acdede400b633" +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.1", ] [[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2364a810370f08ece49d013255058c3c88ca6c0a080de66549233b7d2ca078b8" +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.1", + "wasmtime-environ 20.0.1", + "wasmtime-fiber 20.0.1", + "wasmtime-jit-icache-coherence 20.0.1", + "wasmtime-runtime 20.0.1", + "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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c52cceae147514e279460ac3c43c1ea440c51c39202842611623b3f9734f73a8" +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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8fd43a734bf424e3983363f1b7532a997edb206f52104568058e412e18db9ba" +dependencies = [ + "anyhow", + "proc-macro2", + "quote", + "syn", + "wasmtime-component-util 20.0.1", + "wasmtime-wit-bindgen 20.0.1", + "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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d65e6a21c3e3482240ff03cc26f5c7ae7ee5df524c2283f39cf492ab711a15" + [[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90f7b5dbae8c3c6586e22f063ddb9e5cbf02c09629df75e5d8710f7bf880b117" +dependencies = [ + "anyhow", + "bincode", + "cranelift-entity 0.107.1", + "gimli", + "indexmap", + "log", + "object 0.33.0", + "serde", + "serde_derive", + "target-lexicon", + "thiserror", + "wasmparser 0.202.0", + "wasmtime-types 20.0.1", ] [[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "582e7ef625be814c57b1f8c3924c8899560d315f2285436c9184a09985dc3756" +dependencies = [ + "anyhow", + "cc", + "cfg-if", + "rustix", + "wasmtime-asm-macros 20.0.1", + "wasmtime-versioned-export-macros 20.0.1", "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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b55b43e693c0beeca494d522f4850afca53cb46acf309483aef32a125276ee78" +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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2b876c09b7863d8a01bf87eb45f3b121fab245f8afbff7c38c38c1c9059aee" +dependencies = [ + "anyhow", + "cc", + "cfg-if", + "indexmap", + "libc", + "log", + "mach2", + "memfd", + "memoffset", + "paste", + "psm", + "rustix", + "sptr", + "wasmtime-asm-macros 20.0.1", + "wasmtime-environ 20.0.1", + "wasmtime-fiber 20.0.1", + "wasmtime-slab", + "wasmtime-versioned-export-macros 20.0.1", + "windows-sys 0.52.0", +] + +[[package]] +name = "wasmtime-slab" +version = "20.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05c8ddfb8ebbab6ac186bc1f8c02ed988bc9ea455fea10f72bc3a07503309b4b" + [[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fa3a1f3c0deb3034d76e7dcf340c5df670a6603019ee5b58adb70870649c769" +dependencies = [ + "cranelift-entity 0.107.1", + "serde", + "serde_derive", + "thiserror", + "wasmparser 0.202.0", ] [[package]] @@ -1873,6 +2068,17 @@ dependencies = [ "syn", ] +[[package]] +name = "wasmtime-versioned-export-macros" +version = "20.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b85321f0a1cd3c859b94e728533ba00074d3eca62362acf6998be0eab6f4001c" +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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d1d0c83af38eb6918af9c7cbc07d39f741a7baa9ddd152e19d9f93ff627dc05" +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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "909dcda9e41ab1f8280cf7d774fa16d240792d6fe086a88ef69a9dd97827d289" +dependencies = [ + "anyhow", + "async-trait", + "bitflags 2.4.2", + "thiserror", + "tracing", + "wasmtime 20.0.1", + "wiggle-macro 20.0.1", "witx", ] @@ -2003,6 +2236,21 @@ dependencies = [ "witx", ] +[[package]] +name = "wiggle-generate" +version = "20.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce431612cd480dbf925fb7c3c513dec176a57ea977bf3685726e4b0ab41a6408" +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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9815f5f4b6c6e01449569469416783992ac703c8fbf83d3724dfb16a02fe2e5c" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wiggle-generate 20.0.1", ] [[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..8dcc0355 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.1" wat = "1.202.0"