diff --git a/rust/Cargo.lock b/rust/Cargo.lock index b327d0ba..654f06b1 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -229,7 +229,16 @@ version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c22542c0b95bd3302f7ed6839869c561f2324bac2fd5e7e99f5cfa65fdc8b92" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.103.0", +] + +[[package]] +name = "cranelift-bforest" +version = "0.104.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d819feeda4c420a18f1e28236ca0ce1177b22bf7c8a44ddee92dfe40de15bcf0" +dependencies = [ + "cranelift-entity 0.104.0", ] [[package]] @@ -239,12 +248,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b3db903ef2e9c8a4de2ea6db5db052c7857282952f9df604aa55d169e6000d8" dependencies = [ "bumpalo", - "cranelift-bforest", - "cranelift-codegen-meta", - "cranelift-codegen-shared", - "cranelift-control", - "cranelift-entity", - "cranelift-isle", + "cranelift-bforest 0.103.0", + "cranelift-codegen-meta 0.103.0", + "cranelift-codegen-shared 0.103.0", + "cranelift-control 0.103.0", + "cranelift-entity 0.103.0", + "cranelift-isle 0.103.0", + "gimli", + "hashbrown 0.14.3", + "log", + "regalloc2", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-codegen" +version = "0.104.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9b8d03d5bdbca7e5f72b0e0a0f69933ed1f09e24be6c075aa6fe3f802b0cc0c" +dependencies = [ + "bumpalo", + "cranelift-bforest 0.104.0", + "cranelift-codegen-meta 0.104.0", + "cranelift-codegen-shared 0.104.0", + "cranelift-control 0.104.0", + "cranelift-entity 0.104.0", + "cranelift-isle 0.104.0", "gimli", "hashbrown 0.14.3", "log", @@ -259,7 +289,16 @@ version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6590feb5a1d6438f974bf6a5ac4dddf69fca14e1f07f3265d880f69e61a94463" dependencies = [ - "cranelift-codegen-shared", + "cranelift-codegen-shared 0.103.0", +] + +[[package]] +name = "cranelift-codegen-meta" +version = "0.104.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3fd3664e38e51649b17dc30cfdd561273fe2f590dcd013fb75d9eabc6272dfb" +dependencies = [ + "cranelift-codegen-shared 0.104.0", ] [[package]] @@ -268,6 +307,12 @@ version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7239038c56fafe77fddc8788fc8533dd6c474dc5bdc5637216404f41ba807330" +[[package]] +name = "cranelift-codegen-shared" +version = "0.104.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b031ec5e605828975952622b5a77d49126f20ffe88d33719a0af66b23a0fc36" + [[package]] name = "cranelift-control" version = "0.103.0" @@ -277,6 +322,15 @@ dependencies = [ "arbitrary", ] +[[package]] +name = "cranelift-control" +version = "0.104.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fada054d017cf2ed8f7ed2336e0517fc1b19e6825be1790de9eb00c94788362b" +dependencies = [ + "arbitrary", +] + [[package]] name = "cranelift-entity" version = "0.103.0" @@ -287,13 +341,35 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "cranelift-entity" +version = "0.104.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177b6f94ae8de6348eb45bf977c79ab9e3c40fc3ac8cb7ed8109560ea39bee7d" +dependencies = [ + "serde", + "serde_derive", +] + [[package]] name = "cranelift-frontend" version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a612c94d09e653662ec37681dc2d6fd2b9856e6df7147be0afc9aabb0abf19df" dependencies = [ - "cranelift-codegen", + "cranelift-codegen 0.103.0", + "log", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-frontend" +version = "0.104.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebebd23a69a23e3ddea78e98ff3a2de222e88c8e045d81ef4a72f042e0d79dbd" +dependencies = [ + "cranelift-codegen 0.104.0", "log", "smallvec", "target-lexicon", @@ -305,13 +381,30 @@ version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85db9830abeb1170b7d29b536ffd55af1d4d26ac8a77570b5d1aca003bf225cc" +[[package]] +name = "cranelift-isle" +version = "0.104.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1571bfc14df8966d12c6121b5325026591a4b4009e22fea0fe3765ab7cd33b96" + [[package]] name = "cranelift-native" version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "301ef0edafeaeda5771a5d2db64ac53e1818ae3111220a185677025fe91db4a1" dependencies = [ - "cranelift-codegen", + "cranelift-codegen 0.103.0", + "libc", + "target-lexicon", +] + +[[package]] +name = "cranelift-native" +version = "0.104.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35a69c37e0c10b46fe5527f2397ac821046efbf5f7ec112c8b84df25712f465b" +dependencies = [ + "cranelift-codegen 0.104.0", "libc", "target-lexicon", ] @@ -322,14 +415,30 @@ version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "380f0abe8264e4570ac615fc31cef32a3b90a77f7eb97b08331f9dd357b1f500" dependencies = [ - "cranelift-codegen", - "cranelift-entity", - "cranelift-frontend", + "cranelift-codegen 0.103.0", + "cranelift-entity 0.103.0", + "cranelift-frontend 0.103.0", "itertools 0.10.5", "log", "smallvec", "wasmparser", - "wasmtime-types", + "wasmtime-types 16.0.0", +] + +[[package]] +name = "cranelift-wasm" +version = "0.104.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b3fef8bbceb8cb56d3f1778b0418d75c5cf12ec571a35fc01eb41abb0227a25" +dependencies = [ + "cranelift-codegen 0.104.0", + "cranelift-entity 0.104.0", + "cranelift-frontend 0.104.0", + "itertools 0.10.5", + "log", + "smallvec", + "wasmparser", + "wasmtime-types 17.0.0", ] [[package]] @@ -993,7 +1102,7 @@ dependencies = [ "tracing-subscriber", "walkdir", "wasi-common", - "wasmtime", + "wasmtime 17.0.0", "wasmtime-wasi", "zerocopy", ] @@ -1652,7 +1761,7 @@ dependencies = [ "rustix", "thiserror", "tracing", - "wasmtime", + "wasmtime 16.0.0", "wiggle", "windows-sys 0.48.0", ] @@ -1711,15 +1820,43 @@ dependencies = [ "wasmparser", "wasmtime-component-macro", "wasmtime-component-util", - "wasmtime-cranelift", - "wasmtime-environ", + "wasmtime-cranelift 16.0.0", + "wasmtime-environ 16.0.0", "wasmtime-fiber", - "wasmtime-jit", - "wasmtime-runtime", + "wasmtime-jit 16.0.0", + "wasmtime-runtime 16.0.0", "wasmtime-winch", "windows-sys 0.48.0", ] +[[package]] +name = "wasmtime" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "910fabce77e660f0e0e41cfd5f69fc8bf020a025f059718846e918db7177f469" +dependencies = [ + "anyhow", + "bincode", + "bumpalo", + "cfg-if", + "indexmap", + "libc", + "log", + "object", + "once_cell", + "paste", + "serde", + "serde_derive", + "serde_json", + "target-lexicon", + "wasmparser", + "wasmtime-cranelift 17.0.0", + "wasmtime-environ 17.0.0", + "wasmtime-jit 17.0.0", + "wasmtime-runtime 17.0.0", + "windows-sys 0.52.0", +] + [[package]] name = "wasmtime-asm-macros" version = "16.0.0" @@ -1729,6 +1866,15 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "wasmtime-asm-macros" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37288142e9b4a61655a3bcbdc7316c2e4bb9e776b10ce3dd758f8186b4469572" +dependencies = [ + "cfg-if", +] + [[package]] name = "wasmtime-component-macro" version = "16.0.0" @@ -1758,21 +1904,46 @@ checksum = "2d648c8b4064a7911093b02237cd5569f71ca171d3a0a486bf80600b19e1cba2" dependencies = [ "anyhow", "cfg-if", - "cranelift-codegen", - "cranelift-control", - "cranelift-entity", - "cranelift-frontend", - "cranelift-native", - "cranelift-wasm", + "cranelift-codegen 0.103.0", + "cranelift-control 0.103.0", + "cranelift-entity 0.103.0", + "cranelift-frontend 0.103.0", + "cranelift-native 0.103.0", + "cranelift-wasm 0.103.0", + "gimli", + "log", + "object", + "target-lexicon", + "thiserror", + "wasmparser", + "wasmtime-cranelift-shared 16.0.0", + "wasmtime-environ 16.0.0", + "wasmtime-versioned-export-macros 16.0.0", +] + +[[package]] +name = "wasmtime-cranelift" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3734cc01b7cd37bc62fdbcd9529ca9547440052d4b3886cfdec3b8081a5d3647" +dependencies = [ + "anyhow", + "cfg-if", + "cranelift-codegen 0.104.0", + "cranelift-control 0.104.0", + "cranelift-entity 0.104.0", + "cranelift-frontend 0.104.0", + "cranelift-native 0.104.0", + "cranelift-wasm 0.104.0", "gimli", "log", "object", "target-lexicon", "thiserror", "wasmparser", - "wasmtime-cranelift-shared", - "wasmtime-environ", - "wasmtime-versioned-export-macros", + "wasmtime-cranelift-shared 17.0.0", + "wasmtime-environ 17.0.0", + "wasmtime-versioned-export-macros 17.0.0", ] [[package]] @@ -1782,13 +1953,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290a89027688782da8ff60b12bb95695494b1874e0d0ba2ba387d23dace6d70c" dependencies = [ "anyhow", - "cranelift-codegen", - "cranelift-control", - "cranelift-native", + "cranelift-codegen 0.103.0", + "cranelift-control 0.103.0", + "cranelift-native 0.103.0", "gimli", "object", "target-lexicon", - "wasmtime-environ", + "wasmtime-environ 16.0.0", +] + +[[package]] +name = "wasmtime-cranelift-shared" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0eb33cd30c47844aa228d4d0030587e65c1108343f311fe9f7248b5bd9cb65c" +dependencies = [ + "anyhow", + "cranelift-codegen 0.104.0", + "cranelift-control 0.104.0", + "cranelift-native 0.104.0", + "gimli", + "object", + "target-lexicon", + "wasmtime-environ 17.0.0", ] [[package]] @@ -1798,7 +1985,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61eb64fb3e0da883e2df4a13a81d6282e072336e6cb6295021d0f7ab2e352754" dependencies = [ "anyhow", - "cranelift-entity", + "cranelift-entity 0.103.0", "gimli", "indexmap", "log", @@ -1811,7 +1998,27 @@ dependencies = [ "wasmparser", "wasmprinter", "wasmtime-component-util", - "wasmtime-types", + "wasmtime-types 16.0.0", +] + +[[package]] +name = "wasmtime-environ" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a056b041fdea604f0972e2fae97958e7748d629a55180228348baefdfc217" +dependencies = [ + "anyhow", + "cranelift-entity 0.104.0", + "gimli", + "indexmap", + "log", + "object", + "serde", + "serde_derive", + "target-lexicon", + "thiserror", + "wasmparser", + "wasmtime-types 17.0.0", ] [[package]] @@ -1824,8 +2031,8 @@ dependencies = [ "cc", "cfg-if", "rustix", - "wasmtime-asm-macros", - "wasmtime-versioned-export-macros", + "wasmtime-asm-macros 16.0.0", + "wasmtime-versioned-export-macros 16.0.0", "windows-sys 0.48.0", ] @@ -1845,12 +2052,34 @@ dependencies = [ "serde", "serde_derive", "target-lexicon", - "wasmtime-environ", - "wasmtime-jit-icache-coherence", - "wasmtime-runtime", + "wasmtime-environ 16.0.0", + "wasmtime-jit-icache-coherence 16.0.0", + "wasmtime-runtime 16.0.0", "windows-sys 0.48.0", ] +[[package]] +name = "wasmtime-jit" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b3e48395ac672b386ed588d97a9612aa13a345008f26466f0dfb2a91628aa9f" +dependencies = [ + "anyhow", + "bincode", + "cfg-if", + "gimli", + "log", + "object", + "rustix", + "serde", + "serde_derive", + "target-lexicon", + "wasmtime-environ 17.0.0", + "wasmtime-jit-icache-coherence 17.0.0", + "wasmtime-runtime 17.0.0", + "windows-sys 0.52.0", +] + [[package]] name = "wasmtime-jit-icache-coherence" version = "16.0.0" @@ -1862,6 +2091,17 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdc26415bb89e9ccd3bdc498fef63aabf665c4c0dd710c107691deb9694955da" +dependencies = [ + "cfg-if", + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "wasmtime-runtime" version = "16.0.0" @@ -1883,21 +2123,61 @@ dependencies = [ "rustix", "sptr", "wasm-encoder", - "wasmtime-asm-macros", - "wasmtime-environ", + "wasmtime-asm-macros 16.0.0", + "wasmtime-environ 16.0.0", "wasmtime-fiber", - "wasmtime-versioned-export-macros", - "wasmtime-wmemcheck", + "wasmtime-versioned-export-macros 16.0.0", + "wasmtime-wmemcheck 16.0.0", "windows-sys 0.48.0", ] +[[package]] +name = "wasmtime-runtime" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0abddaf17912aabaf39be0802d5eba9a002e956e902d1ebd438a2fe1c88769a2" +dependencies = [ + "anyhow", + "cc", + "cfg-if", + "indexmap", + "libc", + "log", + "mach", + "memfd", + "memoffset", + "paste", + "psm", + "rustix", + "sptr", + "wasm-encoder", + "wasmtime-asm-macros 17.0.0", + "wasmtime-environ 17.0.0", + "wasmtime-versioned-export-macros 17.0.0", + "wasmtime-wmemcheck 17.0.0", + "windows-sys 0.52.0", +] + [[package]] name = "wasmtime-types" version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d995db8bb56f2cd8d2dc0ed5ffab94ffb435283b0fe6747f80f7aab40b2d06a1" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.103.0", + "serde", + "serde_derive", + "thiserror", + "wasmparser", +] + +[[package]] +name = "wasmtime-types" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b35a95cdc1433729085beab42c0a5c742b431f25b17c40d7718e46df63d5ffc7" +dependencies = [ + "cranelift-entity 0.104.0", "serde", "serde_derive", "thiserror", @@ -1915,6 +2195,17 @@ dependencies = [ "syn", ] +[[package]] +name = "wasmtime-versioned-export-macros" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fad322733fe67e45743784d8b1df452bcb54f581572a4f1a646a4332deecbcc2" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "wasmtime-wasi" version = "16.0.0" @@ -1945,7 +2236,7 @@ dependencies = [ "url", "wasi-cap-std-sync", "wasi-common", - "wasmtime", + "wasmtime 16.0.0", "wiggle", "windows-sys 0.48.0", ] @@ -1957,13 +2248,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c6f945ff9bad96e0a69973d74f193c19f627c8adbf250e7cb73ae7564b6cc8a" dependencies = [ "anyhow", - "cranelift-codegen", + "cranelift-codegen 0.103.0", "gimli", "object", "target-lexicon", "wasmparser", - "wasmtime-cranelift-shared", - "wasmtime-environ", + "wasmtime-cranelift-shared 16.0.0", + "wasmtime-environ 16.0.0", "winch-codegen", ] @@ -1985,6 +2276,12 @@ version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67761d8f8c0b3c13a5d34356274b10a40baba67fe9cfabbfc379a8b414e45de2" +[[package]] +name = "wasmtime-wmemcheck" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b20a19e10d8cb50b45412fb21192982b7ce85c0122dc33bb71f1813e25dc6e52" + [[package]] name = "wast" version = "35.0.2" @@ -2017,7 +2314,7 @@ dependencies = [ "bitflags 2.4.1", "thiserror", "tracing", - "wasmtime", + "wasmtime 16.0.0", "wiggle-macro", ] @@ -2086,13 +2383,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58e58c236a6abdd9ab454552b4f29e16cfa837a86897c1503313b2e62e7609ec" dependencies = [ "anyhow", - "cranelift-codegen", + "cranelift-codegen 0.103.0", "gimli", "regalloc2", "smallvec", "target-lexicon", "wasmparser", - "wasmtime-environ", + "wasmtime-environ 16.0.0", ] [[package]] diff --git a/rust/plugin_wasm/Cargo.toml b/rust/plugin_wasm/Cargo.toml index d6a69873..6f009ef6 100644 --- a/rust/plugin_wasm/Cargo.toml +++ b/rust/plugin_wasm/Cargo.toml @@ -14,7 +14,7 @@ notify = { version = "6", default-features = false, features = [ parking_lot = "0.12" tracing = { version = "0.1", default-features = false, features = ["std"] } tracing-subscriber = "0.3" -wasmtime = { version = "16", default-features = false, features = [ +wasmtime = { version = "17", default-features = false, features = [ "cranelift", ] } wasmtime-wasi = { version = "16" }