From 7ed09c9d3c0bcfba189bb2da0f08c69cafc1a76c Mon Sep 17 00:00:00 2001 From: Jeff Charles Date: Mon, 2 Mar 2026 17:15:24 -0500 Subject: [PATCH] Update to Wasmtime 42 --- Cargo.lock | 330 +++++++++++----------------- Cargo.toml | 6 +- crates/codegen/src/lib.rs | 6 +- crates/plugin-processing/src/lib.rs | 10 +- crates/runner/src/lib.rs | 8 +- supply-chain/audits.toml | 12 + supply-chain/config.toml | 90 ++++---- supply-chain/imports.lock | 87 +++----- 8 files changed, 231 insertions(+), 318 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9d6da407..40600295 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,11 +4,11 @@ version = 4 [[package]] name = "addr2line" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b" +checksum = "9698bf0769c641b18618039fe2ebd41eb3541f98433000f64e663fab7cea2c87" dependencies = [ - "gimli 0.32.3", + "gimli 0.33.0", ] [[package]] @@ -562,46 +562,47 @@ dependencies = [ [[package]] name = "cranelift-assembler-x64" -version = "0.128.3" +version = "0.129.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0377b13bf002a0774fcccac4f1102a10f04893d24060cf4b7350c87e4cbb647c" +checksum = "40630d663279bc855bff805d6f5e8a0b6a1867f9df95b010511ac6dc894e9395" dependencies = [ "cranelift-assembler-x64-meta", ] [[package]] name = "cranelift-assembler-x64-meta" -version = "0.128.3" +version = "0.129.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa027979140d023b25bf7509fb7ede3a54c3d3871fb5ead4673c4b633f671a2" +checksum = "3ee6aec5ceb55e5fdbcf7ef677d7c7195531360ff181ce39b2b31df11d57305f" dependencies = [ "cranelift-srcgen", ] [[package]] name = "cranelift-bforest" -version = "0.128.3" +version = "0.129.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "618e4da87d9179a70b3c2f664451ca8898987aa6eb9f487d16988588b5d8cc40" +checksum = "9a92d78cc3f087d7e7073828f08d98c7074a3a062b6b29a1b7783ce74305685e" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-bitset" -version = "0.128.3" +version = "0.129.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db53764b5dad233b37b8f5dc54d3caa9900c54579195e00f17ea21f03f71aaa7" +checksum = "edcc73d756f2e0d7eda6144fe64a2bc69c624de893cb1be51f1442aed77881d2" dependencies = [ "serde", "serde_derive", + "wasmtime-internal-core", ] [[package]] name = "cranelift-codegen" -version = "0.128.3" +version = "0.129.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae927f1d8c0abddaa863acd201471d56e7fc6c3925104f4861ed4dc3e28b421" +checksum = "683d94c2cd0d73b41369b88da1129589bc3a2d99cf49979af1d14751f35b7a1b" dependencies = [ "bumpalo", "cranelift-assembler-x64", @@ -612,8 +613,9 @@ dependencies = [ "cranelift-control", "cranelift-entity", "cranelift-isle", - "gimli 0.32.3", + "gimli 0.33.0", "hashbrown 0.15.5", + "libm", "log", "pulley-interpreter", "regalloc2", @@ -621,14 +623,14 @@ dependencies = [ "serde", "smallvec", "target-lexicon", - "wasmtime-internal-math", + "wasmtime-internal-core", ] [[package]] name = "cranelift-codegen-meta" -version = "0.128.3" +version = "0.129.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fcf1e3e6757834bd2584f4cbff023fcc198e9279dcb5d684b4bb27a9b19f54" +checksum = "235da0e52ee3a0052d0e944c3470ff025b1f4234f6ec4089d3109f2d2ffa6cbd" dependencies = [ "cranelift-assembler-x64-meta", "cranelift-codegen-shared", @@ -639,35 +641,36 @@ dependencies = [ [[package]] name = "cranelift-codegen-shared" -version = "0.128.3" +version = "0.129.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "205dcb9e6ccf9d368b7466be675ff6ee54a63e36da6fe20e72d45169cf6fd254" +checksum = "20c07c6c440bd1bf920ff7597a1e743ede1f68dcd400730bd6d389effa7662af" [[package]] name = "cranelift-control" -version = "0.128.3" +version = "0.129.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "108eca9fcfe86026054f931eceaf57b722c1b97464bf8265323a9b5877238817" +checksum = "8797c022e02521901e1aee483dea3ed3c67f2bf0a26405c9dd48e8ee7a70944b" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.128.3" +version = "0.129.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0d96496910065d3165f84ff8e1e393916f4c086f88ac8e1b407678bc78735aa" +checksum = "59d8e72637246edd2cba337939850caa8b201f6315925ec4c156fdd089999699" dependencies = [ "cranelift-bitset", "serde", "serde_derive", + "wasmtime-internal-core", ] [[package]] name = "cranelift-frontend" -version = "0.128.3" +version = "0.129.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e303983ad7e23c850f24d9c41fc3cb346e1b930f066d3966545e4c98dac5c9fb" +checksum = "4c31db0085c3dfa131e739c3b26f9f9c84d69a9459627aac1ac4ef8355e3411b" dependencies = [ "cranelift-codegen", "log", @@ -677,15 +680,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.128.3" +version = "0.129.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b0cf8d867d891245836cac7abafb0a5b0ea040a019d720702b3b8bcba40bfa" +checksum = "524d804c1ebd8c542e6f64e71aa36934cec17c5da4a9ae3799796220317f5d23" [[package]] name = "cranelift-native" -version = "0.128.3" +version = "0.129.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e24b641e315443e27807b69c440fe766737d7e718c68beb665a2d69259c77bf3" +checksum = "dc9598f02540e382e1772416eba18e93c5275b746adbbf06ac1f3cf149415270" dependencies = [ "cranelift-codegen", "libc", @@ -694,9 +697,9 @@ dependencies = [ [[package]] name = "cranelift-srcgen" -version = "0.128.3" +version = "0.129.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e378a54e7168a689486d67ee1f818b7e5356e54ae51a1d7a53f4f13f7f8b7a" +checksum = "d953932541249c91e3fa70a75ff1e52adc62979a2a8132145d4b9b3e6d1a9b6a" [[package]] name = "crc32fast" @@ -1009,12 +1012,6 @@ 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 = "fastrand" version = "2.3.0" @@ -1239,18 +1236,19 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" dependencies = [ - "fallible-iterator 0.2.0", + "fallible-iterator", "indexmap 1.9.3", "stable_deref_trait", ] [[package]] name = "gimli" -version = "0.32.3" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" +checksum = "0bf7f043f89559805f8c7cacc432749b2fa0d0a0a9ee46ce47164ed5ba7f126c" dependencies = [ - "fallible-iterator 0.3.0", + "fnv", + "hashbrown 0.16.0", "indexmap 2.12.0", "stable_deref_trait", ] @@ -1669,11 +1667,11 @@ dependencies = [ "walrus", "wasm-opt", "wasmparser 0.244.0", - "wasmprinter 0.244.0", + "wasmprinter", "wasmtime", "wasmtime-wasi", "wasmtime-wizer", - "wit-parser 0.244.0", + "wit-parser", ] [[package]] @@ -1824,9 +1822,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" +checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libredox" @@ -2154,21 +2152,21 @@ dependencies = [ [[package]] name = "pulley-interpreter" -version = "41.0.3" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01051a5b172e07f9197b85060e6583b942aec679dac08416647bf7e7dc916b65" +checksum = "bc2d61e068654529dc196437f8df0981db93687fdc67dec6a5de92363120b9da" dependencies = [ "cranelift-bitset", "log", "pulley-macros", - "wasmtime-internal-math", + "wasmtime-internal-core", ] [[package]] name = "pulley-macros" -version = "41.0.3" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cf194f5b1a415ef3a44ee35056f4009092cc4038a9f7e3c7c1e392f48ee7dbb" +checksum = "c3f210c61b6ecfaebbba806b6d9113a222519d4e5cc4ab2d5ecca047bb7927ae" dependencies = [ "proc-macro2", "quote", @@ -2315,9 +2313,9 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.13.3" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e249c660440317032a71ddac302f25f1d5dff387667bcc3978d1f77aa31ac34" +checksum = "08effbc1fa53aaebff69521a5c05640523fab037b34a4a2c109506bc938246fa" dependencies = [ "allocator-api2", "bumpalo", @@ -3440,9 +3438,9 @@ dependencies = [ [[package]] name = "wasm-compose" -version = "0.243.0" +version = "0.244.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af801b6f36459023eaec63fdbaedad2fd5a4ab7dc74ecc110a8b5d375c5775e4" +checksum = "92cda9c76ca8dcac01a8b497860c2cb15cd6f216dc07060517df5abbe82512ac" dependencies = [ "anyhow", "heck 0.5.0", @@ -3454,8 +3452,8 @@ dependencies = [ "serde_derive", "serde_yaml", "smallvec", - "wasm-encoder 0.243.0", - "wasmparser 0.243.0", + "wasm-encoder 0.244.0", + "wasmparser 0.244.0", "wat", ] @@ -3469,16 +3467,6 @@ dependencies = [ "wasmparser 0.240.0", ] -[[package]] -name = "wasm-encoder" -version = "0.243.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55db9c896d70bd9fa535ce83cd4e1f2ec3726b0edd2142079f594fc3be1cb35" -dependencies = [ - "leb128fmt", - "wasmparser 0.243.0", -] - [[package]] name = "wasm-encoder" version = "0.244.0" @@ -3554,19 +3542,6 @@ dependencies = [ "serde", ] -[[package]] -name = "wasmparser" -version = "0.243.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6d8db401b0528ec316dfbe579e6ab4152d61739cfe076706d2009127970159d" -dependencies = [ - "bitflags", - "hashbrown 0.15.5", - "indexmap 2.12.0", - "semver", - "serde", -] - [[package]] name = "wasmparser" version = "0.244.0" @@ -3580,17 +3555,6 @@ dependencies = [ "serde", ] -[[package]] -name = "wasmprinter" -version = "0.243.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2b6035559e146114c29a909a3232928ee488d6507a1504d8934e8607b36d7b" -dependencies = [ - "anyhow", - "termcolor", - "wasmparser 0.243.0", -] - [[package]] name = "wasmprinter" version = "0.244.0" @@ -3604,12 +3568,11 @@ dependencies = [ [[package]] name = "wasmtime" -version = "41.0.3" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19f56cece843fa95dd929f5568ff8739c7e3873b530ceea9eda2aa02a0b4142" +checksum = "39bef52be4fb4c5b47d36f847172e896bc94b35c9c6a6f07117686bd16ed89a7" dependencies = [ "addr2line", - "anyhow", "async-trait", "bitflags", "bumpalo", @@ -3618,9 +3581,7 @@ dependencies = [ "encoding_rs", "futures", "fxprof-processed-profile", - "gimli 0.32.3", - "hashbrown 0.15.5", - "indexmap 2.12.0", + "gimli 0.33.0", "ittapi", "libc", "log", @@ -3640,18 +3601,17 @@ dependencies = [ "target-lexicon", "tempfile", "wasm-compose", - "wasm-encoder 0.243.0", - "wasmparser 0.243.0", + "wasm-encoder 0.244.0", + "wasmparser 0.244.0", "wasmtime-environ", "wasmtime-internal-cache", "wasmtime-internal-component-macro", "wasmtime-internal-component-util", + "wasmtime-internal-core", "wasmtime-internal-cranelift", "wasmtime-internal-fiber", "wasmtime-internal-jit-debug", "wasmtime-internal-jit-icache-coherence", - "wasmtime-internal-math", - "wasmtime-internal-slab", "wasmtime-internal-unwinder", "wasmtime-internal-versioned-export-macros", "wasmtime-internal-winch", @@ -3661,15 +3621,16 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "41.0.3" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf9dff572c950258548cbbaf39033f68f8dcd0b43b22e80def9fe12d532d3e5" +checksum = "bb637d5aa960ac391ca5a4cbf3e45807632e56beceeeb530e14dfa67fdfccc62" dependencies = [ "anyhow", "cpp_demangle", "cranelift-bitset", "cranelift-entity", - "gimli 0.32.3", + "gimli 0.33.0", + "hashbrown 0.15.5", "indexmap 2.12.0", "log", "object", @@ -3680,17 +3641,18 @@ dependencies = [ "serde_derive", "smallvec", "target-lexicon", - "wasm-encoder 0.243.0", - "wasmparser 0.243.0", - "wasmprinter 0.243.0", + "wasm-encoder 0.244.0", + "wasmparser 0.244.0", + "wasmprinter", "wasmtime-internal-component-util", + "wasmtime-internal-core", ] [[package]] name = "wasmtime-internal-cache" -version = "41.0.3" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f52a985f5b5dae53147fc596f3a313c334e2c24fd1ba708634e1382f6ecd727" +checksum = "4ab6c428c610ae3e7acd25ca2681b4d23672c50d8769240d9dda99b751d4deec" dependencies = [ "base64", "directories-next", @@ -3708,9 +3670,9 @@ dependencies = [ [[package]] name = "wasmtime-internal-component-macro" -version = "41.0.3" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7920dc7dcb608352f5fe93c52582e65075b7643efc5dac3fc717c1645a8d29a0" +checksum = "ca768b11d5e7de017e8c3d4d444da6b4ce3906f565bcbc253d76b4ecbb5d2869" dependencies = [ "anyhow", "proc-macro2", @@ -3718,20 +3680,30 @@ dependencies = [ "syn 2.0.117", "wasmtime-internal-component-util", "wasmtime-internal-wit-bindgen", - "wit-parser 0.243.0", + "wit-parser", ] [[package]] name = "wasmtime-internal-component-util" -version = "41.0.3" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "066f5aed35aa60580a2ac0df145c0f0d4b04319862fee1d6036693e1cca43a12" +checksum = "763f504faf96c9b409051e96a1434655eea7f56a90bed9cb1e22e22c941253fd" + +[[package]] +name = "wasmtime-internal-core" +version = "42.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03a4a3f055a804a2f3d86e816a9df78a8fa57762212a8506164959224a40cd48" +dependencies = [ + "anyhow", + "libm", +] [[package]] name = "wasmtime-internal-cranelift" -version = "41.0.3" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb8002dc415b7773d7949ee360c05ee8f91627ec25a7a0b01ee03831bdfdda1" +checksum = "55154a91d22ad51f9551124ce7fb49ddddc6a82c4910813db4c790c97c9ccf32" dependencies = [ "cfg-if", "cranelift-codegen", @@ -3739,7 +3711,7 @@ dependencies = [ "cranelift-entity", "cranelift-frontend", "cranelift-native", - "gimli 0.32.3", + "gimli 0.33.0", "itertools 0.14.0", "log", "object", @@ -3747,18 +3719,18 @@ dependencies = [ "smallvec", "target-lexicon", "thiserror 2.0.17", - "wasmparser 0.243.0", + "wasmparser 0.244.0", "wasmtime-environ", - "wasmtime-internal-math", + "wasmtime-internal-core", "wasmtime-internal-unwinder", "wasmtime-internal-versioned-export-macros", ] [[package]] name = "wasmtime-internal-fiber" -version = "41.0.3" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9c562c5a272bc9f615d8f0c085a4360bafa28eef9aa5947e63d204b1129b22" +checksum = "05decfad1021ad2efcca5c1be9855acb54b6ee7158ac4467119b30b7481508e3" dependencies = [ "cc", "cfg-if", @@ -3771,9 +3743,9 @@ dependencies = [ [[package]] name = "wasmtime-internal-jit-debug" -version = "41.0.3" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db673148f26e1211db3913c12c75594be9e3858a71fa297561e9162b1a49cfb0" +checksum = "924980c50427885fd4feed2049b88380178e567768aaabf29045b02eb262eaa7" dependencies = [ "cc", "object", @@ -3783,36 +3755,21 @@ dependencies = [ [[package]] name = "wasmtime-internal-jit-icache-coherence" -version = "41.0.3" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bada5ca1cc47df7d14100e2254e187c2486b426df813cea2dd2553a7469f7674" +checksum = "c57d24e8d1334a0e5a8b600286ffefa1fc4c3e8176b110dff6fbc1f43c4a599b" dependencies = [ - "anyhow", "cfg-if", "libc", + "wasmtime-internal-core", "windows-sys 0.61.2", ] -[[package]] -name = "wasmtime-internal-math" -version = "41.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf6f615d528eda9adc6eefb062135f831b5215c348f4c3ec3e143690c730605b" -dependencies = [ - "libm", -] - -[[package]] -name = "wasmtime-internal-slab" -version = "41.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da169d4f789b586e1b2612ba8399c653ed5763edf3e678884ba785bb151d018f" - [[package]] name = "wasmtime-internal-unwinder" -version = "41.0.3" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4888301f3393e4e8c75c938cce427293fade300fee3fc8fd466fdf3e54ae068e" +checksum = "3a1a144bd4393593a868ba9df09f34a6a360cb5db6e71815f20d3f649c6e6735" dependencies = [ "cfg-if", "cranelift-codegen", @@ -3823,9 +3780,9 @@ dependencies = [ [[package]] name = "wasmtime-internal-versioned-export-macros" -version = "41.0.3" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63ba3124cc2cbcd362672f9f077303ccc4cd61daa908f73447b7fdaece75ff9f" +checksum = "9a6948b56bb00c62dbd205ea18a4f1ceccbe1e4b8479651fdb0bab2553790f20" dependencies = [ "proc-macro2", "quote", @@ -3834,16 +3791,16 @@ dependencies = [ [[package]] name = "wasmtime-internal-winch" -version = "41.0.3" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90a4182515dabba776656de4ebd62efad03399e261cf937ecccb838ce8823534" +checksum = "9130b3ab6fb01be80b27b9a2c84817af29ae8224094f2503d2afa9fea5bf9d00" dependencies = [ "cranelift-codegen", - "gimli 0.32.3", + "gimli 0.33.0", "log", "object", "target-lexicon", - "wasmparser 0.243.0", + "wasmparser 0.244.0", "wasmtime-environ", "wasmtime-internal-cranelift", "winch-codegen", @@ -3851,24 +3808,23 @@ dependencies = [ [[package]] name = "wasmtime-internal-wit-bindgen" -version = "41.0.3" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87acbd416227cdd279565ba49e57cf7f08d112657c3b3f39b70250acdfd094fe" +checksum = "102d0d70dbfede00e4cc9c24e86df6d32c03bf6f5ad06b5d6c76b0a4a5004c4a" dependencies = [ "anyhow", "bitflags", "heck 0.5.0", "indexmap 2.12.0", - "wit-parser 0.243.0", + "wit-parser", ] [[package]] name = "wasmtime-wasi" -version = "41.0.3" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9a1bdb4948463ed22559a640e687fed0df50b66353144aa6a9496c041ecd927" +checksum = "ea938f6f4f11e5ffe6d8b6f34c9a994821db9511c3e9c98e535896f27d06bb92" dependencies = [ - "anyhow", "async-trait", "bitflags", "bytes", @@ -3895,28 +3851,27 @@ dependencies = [ [[package]] name = "wasmtime-wasi-io" -version = "41.0.3" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7873d8b990d3cf1105ef491abf2b3cf1e19ff6722d24d5ca662026ea082cdff" +checksum = "71cb16a88d0443b509d6eca4298617233265179090abf03e0a8042b9b251e9da" dependencies = [ - "anyhow", "async-trait", "bytes", "futures", + "tracing", "wasmtime", ] [[package]] name = "wasmtime-wizer" -version = "41.0.3" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "706314d2b968289707a7752a56d6e8b58b56a69e8721bcf157886cbe1f15577f" +checksum = "3cb0722df2d5a01e7074593437d7ec503105e9b783a680c19d109372e3f23ac2" dependencies = [ - "anyhow", "log", "rayon", - "wasm-encoder 0.243.0", - "wasmparser 0.243.0", + "wasm-encoder 0.244.0", + "wasmparser 0.244.0", "wasmtime", ] @@ -3953,37 +3908,37 @@ dependencies = [ [[package]] name = "wiggle" -version = "41.0.3" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f05d2a9932ca235984248dc98471ae83d1985e095682d049af4c296f54f0fb4" +checksum = "2dca2bf96d20f0c70e6741cc6c8c1a9ee4c3c0310c7ad1971242628c083cc9a5" dependencies = [ - "anyhow", "bitflags", "thiserror 2.0.17", "tracing", "wasmtime", + "wasmtime-environ", "wiggle-macro", ] [[package]] name = "wiggle-generate" -version = "41.0.3" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57f773d51c1696bd7d028aa35c884d9fc58f48d79a1176dfbad6c908de314235" +checksum = "d0d8c016d6d3ec6dc6b8c80c23cede4ee2386ccf347d01984f7991d7659f73ef" dependencies = [ - "anyhow", "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.117", + "wasmtime-environ", "witx", ] [[package]] name = "wiggle-macro" -version = "41.0.3" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e976fe0cecd60041f66b15ad45ebc997952af13da9bf9d90261c7b025057edc" +checksum = "91a267096e48857096f035fffca29e22f0bbe840af4d74a6725eb695e1782110" dependencies = [ "proc-macro2", "quote", @@ -4024,22 +3979,21 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "41.0.3" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4f31dcfdfaf9d6df9e1124d7c8ee6fc29af5b99b89d11ae731c138e0f5bd77b" +checksum = "1977857998e4dd70d26e2bfc0618a9684a2fb65b1eca174dc13f3b3e9c2159ca" dependencies = [ - "anyhow", "cranelift-assembler-x64", "cranelift-codegen", - "gimli 0.32.3", + "gimli 0.33.0", "regalloc2", "smallvec", "target-lexicon", "thiserror 2.0.17", - "wasmparser 0.243.0", + "wasmparser 0.244.0", "wasmtime-environ", + "wasmtime-internal-core", "wasmtime-internal-cranelift", - "wasmtime-internal-math", ] [[package]] @@ -4309,7 +4263,7 @@ checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" dependencies = [ "anyhow", "heck 0.5.0", - "wit-parser 0.244.0", + "wit-parser", ] [[package]] @@ -4320,7 +4274,7 @@ checksum = "c15e7a56641cc9040480a26526a3229cbc4e8065adf98c9755d21c4c9b446c4c" dependencies = [ "anyhow", "heck 0.5.0", - "wit-parser 0.244.0", + "wit-parser", ] [[package]] @@ -4401,25 +4355,7 @@ dependencies = [ "wasm-encoder 0.244.0", "wasm-metadata", "wasmparser 0.244.0", - "wit-parser 0.244.0", -] - -[[package]] -name = "wit-parser" -version = "0.243.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df983a8608e513d8997f435bb74207bf0933d0e49ca97aa9d8a6157164b9b7fc" -dependencies = [ - "anyhow", - "id-arena", - "indexmap 2.12.0", - "log", - "semver", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser 0.243.0", + "wit-parser", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 7a285022..e52b7557 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,9 +24,9 @@ license = "Apache-2.0 WITH LLVM-exception" [workspace.dependencies] brotli = "8.0.2" clap = { version = "4.5.60", features = ["derive"] } -wasmtime = "41" -wasmtime-wasi = "41" -wasmtime-wizer = "41" +wasmtime = "42" +wasmtime-wasi = "42" +wasmtime-wizer = "42" wasm-opt = "0.116.1" anyhow = "1.0" javy = { path = "crates/javy", version = "7.0.0-alpha.1" } diff --git a/crates/codegen/src/lib.rs b/crates/codegen/src/lib.rs index 21d44c05..39f6789a 100644 --- a/crates/codegen/src/lib.rs +++ b/crates/codegen/src/lib.rs @@ -91,7 +91,7 @@ use walrus::{ DataId, DataKind, ExportItem, FunctionBuilder, FunctionId, LocalId, MemoryId, Module, ValType, }; use wasm_opt::{OptimizationOptions, ShrinkLevel}; -use wasmtime::{Config, Engine, Linker, Store}; +use wasmtime::{Engine, Linker, Store}; use wasmtime_wasi::{WasiCtxBuilder, p2::pipe::MemoryInputPipe}; use anyhow::Result; @@ -223,9 +223,7 @@ impl Generator { let config = transform::module_config(); let module = match &self.linking { LinkingKind::Static => { - let mut cfg = Config::new(); - cfg.async_support(true); - let engine = Engine::new(&cfg)?; + let engine = Engine::default(); let wasi = WasiCtxBuilder::new() .stdin(MemoryInputPipe::new(self.js_runtime_config.clone())) .inherit_stdout() diff --git a/crates/plugin-processing/src/lib.rs b/crates/plugin-processing/src/lib.rs index 2a5b2e03..58180be4 100644 --- a/crates/plugin-processing/src/lib.rs +++ b/crates/plugin-processing/src/lib.rs @@ -2,7 +2,7 @@ use anyhow::{Result, bail}; use std::{borrow::Cow, fs}; use walrus::{FunctionId, ImportKind, ValType}; use wasmparser::{Parser, Payload}; -use wasmtime::{Config, Engine, Linker, Store}; +use wasmtime::{Engine, Linker, Store}; use wasmtime_wasi::WasiCtxBuilder; use wasmtime_wizer::Wizer; @@ -126,13 +126,11 @@ fn optimize_module(wasm_bytes: &[u8]) -> Result> { } async fn preinitialize_module(wasm_bytes: &[u8]) -> Result> { - let mut cfg = Config::new(); - cfg.async_support(true); - let engine = Engine::new(&cfg)?; + let engine = Engine::default(); let wasi = WasiCtxBuilder::new().inherit_stderr().build_p1(); let mut store = Store::new(&engine, wasi); - Wizer::new() + Ok(Wizer::new() .init_func("initialize-runtime") .keep_init_func(true) .run(&mut store, wasm_bytes, async |store, module| { @@ -143,5 +141,5 @@ async fn preinitialize_module(wasm_bytes: &[u8]) -> Result> { let instance = linker.instantiate_async(store, module).await?; Ok(instance) }) - .await + .await?) } diff --git a/crates/runner/src/lib.rs b/crates/runner/src/lib.rs index 36d5d5c7..bbc77251 100644 --- a/crates/runner/src/lib.rs +++ b/crates/runner/src/lib.rs @@ -235,7 +235,7 @@ pub struct Runner { pub struct RunnerError { pub stdout: Vec, pub stderr: String, - pub err: anyhow::Error, + pub err: wasmtime::Error, } impl Error for RunnerError {} @@ -652,15 +652,15 @@ impl Runner { .get_typed_func::<(u32, u32, u32, u32), u32>(store.as_context_mut(), "cabi_realloc")?; let orig_ptr = 0; let orig_size = 0; - realloc_func.call( + Ok(realloc_func.call( store.as_context_mut(), (orig_ptr, orig_size, alignment, new_size), - ) + )?) } fn extract_store_data( &self, - call_result: Result<()>, + call_result: wasmtime::Result<()>, mut store: Store, ) -> Result<(Vec, Vec, u64)> { let fuel_consumed = self.initial_fuel - store.as_context_mut().get_fuel()?; diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml index b19a9a6a..c2b61a08 100644 --- a/supply-chain/audits.toml +++ b/supply-chain/audits.toml @@ -246,6 +246,12 @@ user-id = 6825 # Dan Gohman (sunfishcode) start = "2020-09-15" end = "2027-01-06" +[[trusted.gimli]] +criteria = "safe-to-deploy" +user-id = 4415 # Philip Craig (philipc) +start = "2019-04-25" +end = "2027-03-02" + [[trusted.glob]] criteria = "safe-to-deploy" user-id = 55123 # rust-lang-owner @@ -360,6 +366,12 @@ user-id = 696 # Nick Fitzgerald (fitzgen) start = "2020-01-14" end = "2027-03-02" +[[trusted.libm]] +criteria = "safe-to-deploy" +user-id = 55123 # rust-lang-owner +start = "2024-10-26" +end = "2027-03-02" + [[trusted.link-cplusplus]] criteria = "safe-to-deploy" user-id = 3618 # David Tolnay (dtolnay) diff --git a/supply-chain/config.toml b/supply-chain/config.toml index 6dfb91cd..1856d540 100644 --- a/supply-chain/config.toml +++ b/supply-chain/config.toml @@ -138,55 +138,55 @@ version = "0.2.17" criteria = "safe-to-deploy" [[exemptions.cranelift-assembler-x64]] -version = "0.128.3" +version = "0.129.1" criteria = "safe-to-deploy" [[exemptions.cranelift-assembler-x64-meta]] -version = "0.128.3" +version = "0.129.1" criteria = "safe-to-deploy" [[exemptions.cranelift-bforest]] -version = "0.128.3" +version = "0.129.1" criteria = "safe-to-deploy" [[exemptions.cranelift-bitset]] -version = "0.128.3" +version = "0.129.1" criteria = "safe-to-deploy" [[exemptions.cranelift-codegen]] -version = "0.128.3" +version = "0.129.1" criteria = "safe-to-deploy" [[exemptions.cranelift-codegen-meta]] -version = "0.128.3" +version = "0.129.1" criteria = "safe-to-deploy" [[exemptions.cranelift-codegen-shared]] -version = "0.128.3" +version = "0.129.1" criteria = "safe-to-deploy" [[exemptions.cranelift-control]] -version = "0.128.3" +version = "0.129.1" criteria = "safe-to-deploy" [[exemptions.cranelift-entity]] -version = "0.128.3" +version = "0.129.1" criteria = "safe-to-deploy" [[exemptions.cranelift-frontend]] -version = "0.128.3" +version = "0.129.1" criteria = "safe-to-deploy" [[exemptions.cranelift-isle]] -version = "0.128.3" +version = "0.129.1" criteria = "safe-to-deploy" [[exemptions.cranelift-native]] -version = "0.128.3" +version = "0.129.1" criteria = "safe-to-deploy" [[exemptions.cranelift-srcgen]] -version = "0.128.3" +version = "0.129.1" criteria = "safe-to-deploy" [[exemptions.crc32fast]] @@ -301,10 +301,6 @@ criteria = "safe-to-deploy" version = "0.4.1" criteria = "safe-to-deploy" -[[exemptions.gimli]] -version = "0.26.2" -criteria = "safe-to-deploy" - [[exemptions.halfbrown]] version = "0.4.0" criteria = "safe-to-deploy" @@ -365,10 +361,6 @@ criteria = "safe-to-deploy" version = "0.8.9" criteria = "safe-to-deploy" -[[exemptions.libm]] -version = "0.2.15" -criteria = "safe-to-deploy" - [[exemptions.libredox]] version = "0.1.10" criteria = "safe-to-deploy" @@ -450,11 +442,11 @@ version = "3.4.0" criteria = "safe-to-deploy" [[exemptions.pulley-interpreter]] -version = "41.0.3" +version = "42.0.1" criteria = "safe-to-deploy" [[exemptions.pulley-macros]] -version = "41.0.3" +version = "42.0.1" criteria = "safe-to-deploy" [[exemptions.r-efi]] @@ -690,87 +682,83 @@ version = "0.116.0" criteria = "safe-to-deploy" [[exemptions.wasmtime]] -version = "41.0.3" +version = "42.0.1" criteria = "safe-to-deploy" [[exemptions.wasmtime-environ]] -version = "41.0.3" +version = "42.0.1" criteria = "safe-to-deploy" [[exemptions.wasmtime-internal-cache]] -version = "41.0.3" +version = "42.0.1" criteria = "safe-to-deploy" [[exemptions.wasmtime-internal-component-macro]] -version = "41.0.3" +version = "42.0.1" criteria = "safe-to-deploy" [[exemptions.wasmtime-internal-component-util]] -version = "41.0.3" +version = "42.0.1" +criteria = "safe-to-deploy" + +[[exemptions.wasmtime-internal-core]] +version = "42.0.1" criteria = "safe-to-deploy" [[exemptions.wasmtime-internal-cranelift]] -version = "41.0.3" +version = "42.0.1" criteria = "safe-to-deploy" [[exemptions.wasmtime-internal-fiber]] -version = "41.0.3" +version = "42.0.1" criteria = "safe-to-deploy" [[exemptions.wasmtime-internal-jit-debug]] -version = "41.0.3" +version = "42.0.1" criteria = "safe-to-deploy" [[exemptions.wasmtime-internal-jit-icache-coherence]] -version = "41.0.3" -criteria = "safe-to-deploy" - -[[exemptions.wasmtime-internal-math]] -version = "41.0.3" -criteria = "safe-to-deploy" - -[[exemptions.wasmtime-internal-slab]] -version = "41.0.3" +version = "42.0.1" criteria = "safe-to-deploy" [[exemptions.wasmtime-internal-unwinder]] -version = "41.0.3" +version = "42.0.1" criteria = "safe-to-deploy" [[exemptions.wasmtime-internal-versioned-export-macros]] -version = "41.0.3" +version = "42.0.1" criteria = "safe-to-deploy" [[exemptions.wasmtime-internal-winch]] -version = "41.0.3" +version = "42.0.1" criteria = "safe-to-deploy" [[exemptions.wasmtime-internal-wit-bindgen]] -version = "41.0.3" +version = "42.0.1" criteria = "safe-to-deploy" [[exemptions.wasmtime-wasi]] -version = "41.0.3" +version = "42.0.1" criteria = "safe-to-deploy" [[exemptions.wasmtime-wasi-io]] -version = "41.0.3" +version = "42.0.1" criteria = "safe-to-deploy" [[exemptions.wasmtime-wizer]] -version = "41.0.3" +version = "42.0.1" criteria = "safe-to-deploy" [[exemptions.wiggle]] -version = "41.0.3" +version = "42.0.1" criteria = "safe-to-deploy" [[exemptions.wiggle-generate]] -version = "41.0.3" +version = "42.0.1" criteria = "safe-to-deploy" [[exemptions.wiggle-macro]] -version = "41.0.3" +version = "42.0.1" criteria = "safe-to-deploy" [[exemptions.winapi]] @@ -786,7 +774,7 @@ version = "0.4.0" criteria = "safe-to-deploy" [[exemptions.winch-codegen]] -version = "41.0.3" +version = "42.0.1" criteria = "safe-to-deploy" [[exemptions.windows-core]] diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock index 7dc1a399..1f2b93f9 100644 --- a/supply-chain/imports.lock +++ b/supply-chain/imports.lock @@ -232,6 +232,20 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.gimli]] +version = "0.26.2" +when = "2022-07-17" +user-id = 4415 +user-login = "philipc" +user-name = "Philip Craig" + +[[publisher.gimli]] +version = "0.33.0" +when = "2026-01-24" +user-id = 4415 +user-login = "philipc" +user-name = "Philip Craig" + [[publisher.glob]] version = "0.3.3" when = "2025-08-11" @@ -300,6 +314,12 @@ user-id = 696 user-login = "fitzgen" user-name = "Nick Fitzgerald" +[[publisher.libm]] +version = "0.2.16" +when = "2026-01-24" +user-id = 55123 +user-login = "rust-lang-owner" + [[publisher.link-cplusplus]] version = "1.0.12" when = "2025-09-06" @@ -399,8 +419,8 @@ user-login = "dtolnay" user-name = "David Tolnay" [[publisher.regalloc2]] -version = "0.13.3" -when = "2025-11-13" +version = "0.13.5" +when = "2026-01-09" user-id = 3726 user-login = "cfallin" user-name = "Chris Fallin" @@ -1121,6 +1141,12 @@ criteria = "safe-to-deploy" delta = "0.25.0 -> 0.25.1" notes = "Minor updates, looks like a minor bug fix, nothing awry." +[[audits.bytecode-alliance.audits.addr2line]] +who = "Alex Crichton " +criteria = "safe-to-deploy" +delta = "0.25.1 -> 0.26.0" +notes = "Nothing out of the ordinary for this update, all DWARF all the time." + [[audits.bytecode-alliance.audits.allocator-api2]] who = "Chris Fallin " criteria = "safe-to-deploy" @@ -1218,16 +1244,6 @@ criteria = "safe-to-deploy" delta = "0.4.0 -> 0.6.1" notes = "Major updates, but almost all safe code. Lots of pruning/deletions, nothing out of the ordrinary." -[[audits.bytecode-alliance.audits.fallible-iterator]] -who = "Alex Crichton " -criteria = "safe-to-deploy" -delta = "0.2.0 -> 0.3.0" -notes = """ -This major version update has a few minor breaking changes but everything -this crate has to do with iterators and `Result` and such. No `unsafe` or -anything like that, all looks good. -""" - [[audits.bytecode-alliance.audits.fastrand]] who = "Alex Crichton " criteria = "safe-to-deploy" @@ -1331,30 +1347,6 @@ who = "Pat Hickey " criteria = "safe-to-deploy" delta = "0.6.0 -> 0.8.1" -[[audits.bytecode-alliance.audits.gimli]] -who = "Alex Crichton " -criteria = "safe-to-deploy" -delta = "0.29.0 -> 0.31.0" -notes = "Various updates here and there, nothing too major, what you'd expect from a DWARF parsing crate." - -[[audits.bytecode-alliance.audits.gimli]] -who = "Alex Crichton " -criteria = "safe-to-deploy" -delta = "0.31.0 -> 0.31.1" -notes = "No fundmanetally new `unsafe` code, some small refactoring of existing code. Lots of changes in tests, not as many changes in the rest of the crate. More dwarf!" - -[[audits.bytecode-alliance.audits.gimli]] -who = "Alex Crichton " -criteria = "safe-to-deploy" -delta = "0.31.1 -> 0.32.0" -notes = "Ever more DWARF to parse, but also no new `unsafe` and everything looks like gimli." - -[[audits.bytecode-alliance.audits.gimli]] -who = "Alex Crichton " -criteria = "safe-to-deploy" -delta = "0.32.0 -> 0.32.3" -notes = "Ever more dwarf, it never ends! (nothing out of the ordinary)" - [[audits.bytecode-alliance.audits.hashbrown]] who = "Chris Fallin " criteria = "safe-to-deploy" @@ -1633,6 +1625,12 @@ criteria = "safe-to-deploy" delta = "0.242.0 -> 0.243.0" notes = "The Bytecode Alliance is the author of this crate" +[[audits.bytecode-alliance.audits.wasm-compose]] +who = "Alex Crichton " +criteria = "safe-to-deploy" +delta = "0.243.0 -> 0.244.0" +notes = "The Bytecode Alliance is the author of this crate" + [[audits.bytecode-alliance.audits.wasm-encoder]] who = "Alex Crichton " criteria = "safe-to-deploy" @@ -2720,23 +2718,6 @@ criteria = "safe-to-deploy" delta = "0.3.28 -> 0.3.27" aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" -[[audits.mozilla.audits.gimli]] -who = "Alex Franchuk " -criteria = "safe-to-deploy" -version = "0.30.0" -notes = """ -Unsafe code blocks are sound. Minimal dependencies used. No use of -side-effectful std functions. -""" -aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" - -[[audits.mozilla.audits.gimli]] -who = "Chris Martin " -criteria = "safe-to-deploy" -delta = "0.30.0 -> 0.29.0" -notes = "No unsafe code, mostly algorithms and parsing. Very unlikely to cause security issues." -aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" - [[audits.mozilla.audits.hashbrown]] who = "Mike Hommey " criteria = "safe-to-deploy"