diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d2ed6a7..8e827aca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ - Update test-fixtures to fastly 0.13.1. ([#707](https://github.com/fastly/Viceroy/pull/707)) - Internal unification of native/guest profiling config. (#[597](https://github.com/fastly/Viceroy/pull/597)) - Remove the warning about Wasm Component support. ([#709](https://github.com/fastly/Viceroy/pull/709)) +- Update to Wasmtime 46. ([#642](https://github.com/fastly/Viceroy/pull/642)) ## 0.21.0 (2026-08-25) diff --git a/Cargo.lock b/Cargo.lock index d2c99fc2..d3577455 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,11 +4,11 @@ version = 4 [[package]] name = "addr2line" -version = "0.25.1" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b" +checksum = "59317f77929f0e679d39364702289274de2f0f0b22cbf50b2b8cff2169a0b27a" dependencies = [ - "gimli 0.32.3", + "gimli 0.33.0", ] [[package]] @@ -188,15 +188,6 @@ version = "2.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06" -[[package]] -name = "bitmaps" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" -dependencies = [ - "typenum", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -247,7 +238,7 @@ checksum = "150941cefd3df4de2fea24604ba4949371576f62e527410298333f7d431a1bc6" dependencies = [ "cap-primitives", "cap-std", - "rustix 1.1.5", + "rustix", "smallvec", ] @@ -263,22 +254,12 @@ dependencies = [ "io-lifetimes", "ipnet", "maybe-owned", - "rustix 1.1.5", + "rustix", "rustix-linux-procfs", "windows-sys 0.59.0", "winx", ] -[[package]] -name = "cap-rand" -version = "3.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ec6a5b75f54547c579a6b117c6fdd5f04f4ab7598de747b9f440a53592b3a4a" -dependencies = [ - "ambient-authority", - "rand 0.8.8", -] - [[package]] name = "cap-std" version = "3.4.6" @@ -288,7 +269,7 @@ dependencies = [ "cap-primitives", "io-extras", "io-lifetimes", - "rustix 1.1.5", + "rustix", ] [[package]] @@ -301,7 +282,7 @@ dependencies = [ "cap-primitives", "iana-time-zone", "once_cell", - "rustix 1.1.5", + "rustix", "winx", ] @@ -323,6 +304,17 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e7648175b45a9a48536d676f68d918270699102aa8dab5496df06904c914600" +[[package]] +name = "chacha20" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.1", + "rand_core 0.10.1", +] + [[package]] name = "clap" version = "4.6.7" @@ -351,7 +343,7 @@ version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9c751b79415d4e559e3d1fcf128e09e720eb673a06d26cf6f392d37d75b66e0" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "syn 3.0.6", @@ -418,131 +410,133 @@ dependencies = [ "libc", ] +[[package]] +name = "cpufeatures" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca28b0ae3115b884660db4118d803791fd6756b6e88f39c0f3f7859060d7566" +dependencies = [ + "libc", +] + [[package]] name = "cranelift-assembler-x64" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f28665a3cba7b8fe75d885c2a1c1bbc661b65685df34f7d93a4669ceb2e719" +checksum = "0aadfd45214f09461ba0406f7dacecce5cac39bf0bdb4890eeb468f4ef090e07" dependencies = [ "cranelift-assembler-x64-meta", ] [[package]] name = "cranelift-assembler-x64-meta" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6308845400e41d9d34acf8f2d13454b907012d9de5265c66f731570adf82019e" +checksum = "57069faede9bd1f926364b4cf69ccc9bebc6f4af5ab897083581b7bc991bf20a" dependencies = [ "cranelift-srcgen", ] [[package]] name = "cranelift-bforest" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ed5df9b6cda90f2dd921760925079670ba6c86162efa4de9f6c6efea124384" +checksum = "0b1221450f2f9efaa996d916bf53a0a4d13346a4a75468afb828390209a4fdd4" dependencies = [ - "cranelift-entity 0.126.2", + "cranelift-entity", + "wasmtime-internal-core", ] [[package]] name = "cranelift-bitset" -version = "0.123.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "682c2ef5e13a8f33436e1ce0a3387e459f8446c6f3978dd1f027721d159aed3c" - -[[package]] -name = "cranelift-bitset" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006fe8776f6d81acb83571f52e7737a54c6dec1ba75e2b7b5a68af15451f88ee" +checksum = "97706f2b466d67bdf0f69d1cf5c5c4a5cd31087cf1fa2e8e5fe0450dddc8661d" dependencies = [ "serde", "serde_derive", + "wasmtime-internal-core", ] [[package]] name = "cranelift-codegen" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021b5a45c5ca4d414746a985c7241fea4202fd71aeef5a2891c0be32518e3201" +checksum = "432246ee44b2fc0140b412dca55801d200d6fb25d2d7d18c44bb29e8cd71268b" dependencies = [ "bumpalo", "cranelift-assembler-x64", "cranelift-bforest", - "cranelift-bitset 0.126.2", + "cranelift-bitset", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-control", - "cranelift-entity 0.126.2", + "cranelift-entity", "cranelift-isle", - "gimli 0.32.3", - "hashbrown 0.15.5", + "gimli 0.33.0", + "hashbrown 0.17.1", + "libm", "log", + "postcard", "pulley-interpreter", "regalloc2", "rustc-hash", "serde", + "serde_derive", + "sha2", "smallvec", "target-lexicon", - "wasmtime-internal-math", + "wasmtime-internal-core", ] [[package]] name = "cranelift-codegen-meta" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5350ad78964a8cc301bc83cbc9b5144ccb44e1c2f604b551cc8ec15c99900dcb" +checksum = "b5aa51eff0949f06a5c8f3d5adefef94a12ea99f71cd8985047b91d45f367150" dependencies = [ "cranelift-assembler-x64-meta", "cranelift-codegen-shared", "cranelift-srcgen", - "heck 0.5.0", + "heck", "pulley-interpreter", ] [[package]] name = "cranelift-codegen-shared" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6918b5db84d5a9b09eb8fae05466cd57fb04d97a88ac47c24698830c8714747e" +checksum = "6095e7095930b6169490138b4262fe7ec24290d3f604d7fe62e1e3138e740daa" [[package]] name = "cranelift-control" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec4ea4593cd6ef06573d7a6bc5a4231368f96a5b57f65900b24553cca3284bcd" +checksum = "e61dfa0766c0eadf42b3febd145a35f81f31086e207f534e5fb406fc3d08fc47" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.123.15" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43fba0e38f2029ee1d524e1a7283a3111e6464282dbe0675c372ca4251f6445" +checksum = "e93867a79a06dd5d9ffeb96f7563dc7b6b142b5d89e42ab77e458a408a8aa9d5" dependencies = [ - "cranelift-bitset 0.123.15", -] - -[[package]] -name = "cranelift-entity" -version = "0.126.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcca10e8c33eac67a45be4e09d236e274697831ca6bf4c4a927f7570eb8436a8" -dependencies = [ - "cranelift-bitset 0.126.2", + "cranelift-bitset", "serde", "serde_derive", + "wasmtime-internal-core", ] [[package]] name = "cranelift-frontend" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dcc8b7e922ab1a6ec4640be3533698e291a4111b83d96f8d9e3367162e290ef" +checksum = "d1991dc32fefa54f14d2a63570d1e963826257605e478558733f83450b7e7661" dependencies = [ "cranelift-codegen", + "hashbrown 0.17.1", "log", "smallvec", "target-lexicon", @@ -550,15 +544,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9db87d9e6fe9ba89a71434a06c9f19153f3dd273a1c5c9a6365bc4f019213d1b" +checksum = "784546de9988ff6e1df0fd4d2450760469a7607344156c661e69ec28082c5da4" [[package]] name = "cranelift-native" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6aa4002a6569b047ecb846f5a952d21b81963817a0c1dad064b69e5a80f5952" +checksum = "7107a4ae4a2ba48b5df8648365e638b08322fa1da11e86206bf5eddb862b21dd" dependencies = [ "cranelift-codegen", "libc", @@ -567,9 +561,9 @@ dependencies = [ [[package]] name = "cranelift-srcgen" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "289ab02de2733de3a857c98bdaace8f4dfab1cc1d322ba8637280ce2a7d15d8e" +checksum = "4b3f161aa81ee5dd8d7b0eb8828988f57baf2f78d288e62b6b3714b37aa6d6a1" [[package]] name = "crc32fast" @@ -804,12 +798,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 = "fastly-shared" version = "0.13.1" @@ -826,17 +814,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223" -[[package]] -name = "fd-lock" -version = "4.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce92ff622d6dadf7349484f42c93271a0d49b7cc4d466a936405bacbe10aa78" -dependencies = [ - "cfg-if", - "rustix 1.1.5", - "windows-sys 0.59.0", -] - [[package]] name = "find-msvc-tools" version = "0.1.12" @@ -866,12 +843,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foldhash" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" - [[package]] name = "foldhash" version = "0.2.0" @@ -894,7 +865,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94e7099f6313ecacbe1256e8ff9d617b75d1bcb16a6fddef94866d225a01a14a" dependencies = [ "io-lifetimes", - "rustix 1.1.5", + "rustix", "windows-sys 0.59.0", ] @@ -1042,6 +1013,7 @@ dependencies = [ "cfg-if", "libc", "r-efi 6.0.0", + "rand_core 0.10.1", ] [[package]] @@ -1050,18 +1022,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.1", "indexmap 2.14.2", "stable_deref_trait", ] @@ -1103,13 +1076,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.5" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" -dependencies = [ - "foldhash 0.1.5", - "serde", -] +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" [[package]] name = "hashbrown" @@ -1117,17 +1086,11 @@ version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" dependencies = [ - "foldhash 0.2.0", + "foldhash", "serde", "serde_core", ] -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - [[package]] name = "heck" version = "0.5.0" @@ -1336,20 +1299,6 @@ dependencies = [ "icu_properties", ] -[[package]] -name = "im-rc" -version = "15.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1955a75fa080c677d3972822ec4bad316169ab1cfc6c257a942c2265dbe5fe" -dependencies = [ - "bitmaps", - "rand_core 0.6.4", - "rand_xoshiro", - "sized-chunks", - "typenum", - "version_check", -] - [[package]] name = "indexmap" version = "1.9.3" @@ -1551,12 +1500,6 @@ dependencies = [ "libc", ] -[[package]] -name = "linux-raw-sys" -version = "0.4.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" - [[package]] name = "linux-raw-sys" version = "0.12.1" @@ -1586,12 +1529,9 @@ checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" [[package]] name = "mach2" -version = "0.4.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d640282b302c0bb0a2a8e0233ead9035e3bed871f0b7e81fe4a1ec829765db44" -dependencies = [ - "libc", -] +checksum = "dae608c151f68243f2b000364e1f7b186d9c29845f7d2d85bd31b9ad77ad552b" [[package]] name = "matchers" @@ -1620,7 +1560,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57804b2c9b69967f1536a56f86297e367a33b19e98852ed624b84551cdbc0d90" dependencies = [ - "rustix 1.1.5", + "rustix", ] [[package]] @@ -1711,12 +1651,12 @@ dependencies = [ [[package]] name = "object" -version = "0.37.3" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" +checksum = "2e5a6c098c7a3b6547378093f5cc30bc54fd361ce711e05293a5cc589562739b" dependencies = [ "crc32fast", - "hashbrown 0.15.5", + "hashbrown 0.17.1", "indexmap 2.14.2", "memchr", ] @@ -1912,7 +1852,7 @@ dependencies = [ "bitflags 2.13.2", "num-traits", "rand 0.9.5", - "rand_chacha 0.9.0", + "rand_chacha", "rand_xorshift", "regex-syntax", "rusty-fork", @@ -1933,21 +1873,21 @@ dependencies = [ [[package]] name = "pulley-interpreter" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0412168ab18b7d37047011474788846d1be290ea548867789b5a8b45651004a7" +checksum = "3f647f8aefd39efd5e38b484a8b7a926dd035ae366127df75c1d94d196f0a4ba" dependencies = [ - "cranelift-bitset 0.126.2", + "cranelift-bitset", "log", "pulley-macros", - "wasmtime-internal-math", + "wasmtime-internal-core", ] [[package]] name = "pulley-macros" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "752233a382efa1026438aa8409c72489ebaa7ed94148bfabdf5282dc864276ef" +checksum = "3e902032e329008b189b67498b1be7784d5849276f32402eca17441df08a6bcb" dependencies = [ "proc-macro2", "quote", @@ -1981,35 +1921,25 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" -[[package]] -name = "rand" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e058c7de0b26af77780c769414d6257830bb240f3c38477dbc2c16e5f54d6d4c" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - [[package]] name = "rand" version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41" dependencies = [ - "rand_chacha 0.9.0", + "rand_chacha", "rand_core 0.9.5", ] [[package]] -name = "rand_chacha" -version = "0.3.1" +name = "rand" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80" dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", + "chacha20", + "getrandom 0.4.3", + "rand_core 0.10.1", ] [[package]] @@ -2024,21 +1954,18 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" dependencies = [ - "getrandom 0.2.17", + "getrandom 0.3.4", ] [[package]] name = "rand_core" -version = "0.9.5" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" -dependencies = [ - "getrandom 0.3.4", -] +checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" [[package]] name = "rand_xorshift" @@ -2049,15 +1976,6 @@ dependencies = [ "rand_core 0.9.5", ] -[[package]] -name = "rand_xoshiro" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" -dependencies = [ - "rand_core 0.6.4", -] - [[package]] name = "rayon" version = "1.12.0" @@ -2100,15 +2018,16 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.13.5" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08effbc1fa53aaebff69521a5c05640523fab037b34a4a2c109506bc938246fa" +checksum = "757712e8e61590d6d4f5d563483755538b5aa13467837a3b41cd9832509a7f85" dependencies = [ "allocator-api2", "bumpalo", - "hashbrown 0.15.5", + "hashbrown 0.17.1", "log", "rustc-hash", + "serde", "smallvec", ] @@ -2167,19 +2086,6 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d" -[[package]] -name = "rustix" -version = "0.38.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" -dependencies = [ - "bitflags 2.13.2", - "errno", - "libc", - "linux-raw-sys 0.4.15", - "windows-sys 0.59.0", -] - [[package]] name = "rustix" version = "1.1.5" @@ -2189,7 +2095,7 @@ dependencies = [ "bitflags 2.13.2", "errno", "libc", - "linux-raw-sys 0.12.1", + "linux-raw-sys", "windows-sys 0.61.2", ] @@ -2200,7 +2106,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fc84bf7e9aa16c4f2c758f27412dc9841341e16aa682d9c7ac308fe3ee12056" dependencies = [ "once_cell", - "rustix 1.1.5", + "rustix", ] [[package]] @@ -2264,12 +2170,6 @@ dependencies = [ "wait-timeout", ] -[[package]] -name = "ryu" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" - [[package]] name = "same-file" version = "1.0.6" @@ -2389,19 +2289,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "serde_yaml" -version = "0.9.34+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" -dependencies = [ - "indexmap 2.14.2", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - [[package]] name = "sha2" version = "0.10.9" @@ -2409,7 +2296,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "digest", ] @@ -2450,16 +2337,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" -[[package]] -name = "sized-chunks" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" -dependencies = [ - "bitmaps", - "typenum", -] - [[package]] name = "slab" version = "0.4.12" @@ -2540,22 +2417,6 @@ dependencies = [ "syn 3.0.6", ] -[[package]] -name = "system-interface" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4592f674ce18521c2a81483873a49596655b179f71c5e05d10c1fe66c78745" -dependencies = [ - "bitflags 2.13.2", - "cap-fs-ext", - "cap-std", - "fd-lock", - "io-lifetimes", - "rustix 0.38.44", - "windows-sys 0.59.0", - "winx", -] - [[package]] name = "tagptr" version = "0.2.0" @@ -2577,7 +2438,7 @@ dependencies = [ "fastrand", "getrandom 0.4.3", "once_cell", - "rustix 1.1.5", + "rustix", "windows-sys 0.61.2", ] @@ -2876,12 +2737,6 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" -[[package]] -name = "unsafe-libyaml" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" - [[package]] name = "untrusted" version = "0.9.0" @@ -2973,7 +2828,7 @@ dependencies = [ "bytesize", "cfg-if", "clap", - "cranelift-entity 0.123.15", + "cranelift-entity", "fastly-shared", "flate2", "futures", @@ -3002,9 +2857,9 @@ dependencies = [ "tracing-futures", "url", "walrus", - "wasm-encoder 0.250.0", + "wasm-encoder 0.251.0", "wasm-metadata", - "wasmparser 0.250.0", + "wasmparser 0.251.0", "wasmtime", "wasmtime-wasi", "wasmtime-wasi-io", @@ -3055,7 +2910,7 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439ad39ff894c43c9649fa724cdde9a6fc50b855d517ef071a93e5df82fe51d3" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "syn 2.0.119", @@ -3132,22 +2987,18 @@ dependencies = [ [[package]] name = "wasm-compose" -version = "0.240.0" +version = "0.251.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feeb9a231e63bd5d5dfe07e9f8daa53d5c85e4f7de5ef756d3b4e6a5f501c578" +checksum = "b089037d7eb453ed57b560fe7833de0707411c8b9fdc429745ced77e2a1bacb9" dependencies = [ "anyhow", - "heck 0.4.1", - "im-rc", + "heck", "indexmap 2.14.2", "log", "petgraph", - "serde", - "serde_derive", - "serde_yaml", "smallvec", - "wasm-encoder 0.240.0", - "wasmparser 0.240.0", + "wasm-encoder 0.251.0", + "wasmparser 0.251.0", "wat", ] @@ -3162,22 +3013,12 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.240.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06d642d8c5ecc083aafe9ceb32809276a304547a3a6eeecceb5d8152598bc71f" -dependencies = [ - "leb128fmt", - "wasmparser 0.240.0", -] - -[[package]] -name = "wasm-encoder" -version = "0.250.0" +version = "0.251.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2271adb766023046af314460f1fae02cc34ea16d736d93404d3b65be44270923" +checksum = "5a879a421bd17c528b74721b2abf4c62e8f1d1889c2ba8c3c50d02deaf2ce395" dependencies = [ "leb128fmt", - "wasmparser 0.250.0", + "wasmparser 0.251.0", ] [[package]] @@ -3192,14 +3033,14 @@ dependencies = [ [[package]] name = "wasm-metadata" -version = "0.250.0" +version = "0.251.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d2fe7edf8b5c8870da3f6796f8ebe1898af1276f18490c861fcb1a11436556" +checksum = "5f998ccc6e012f7b86865eb2a106c8a0422017a1a88977ce01a69f2244be2e57" dependencies = [ "anyhow", "indexmap 2.14.2", - "wasm-encoder 0.250.0", - "wasmparser 0.250.0", + "wasm-encoder 0.251.0", + "wasmparser 0.251.0", ] [[package]] @@ -3218,22 +3059,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.240.0" +version = "0.251.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b722dcf61e0ea47440b53ff83ccb5df8efec57a69d150e4f24882e4eba7e24a4" -dependencies = [ - "bitflags 2.13.2", - "hashbrown 0.15.5", - "indexmap 2.14.2", - "semver", - "serde", -] - -[[package]] -name = "wasmparser" -version = "0.250.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071d99cdfb8111603ed05500506c3298a940b58d609dd0259d3981785dd33556" +checksum = "437970b35b1a85cfde9c74b2398352d8d653f3bd8e3a3db0c063ea8f5b4b36ff" dependencies = [ "bitflags 2.13.2", "hashbrown 0.17.1", @@ -3255,23 +3083,22 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.240.0" +version = "0.251.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a84d6e25c198da67d0150ee7c2c62d33d784f0a565d1e670bdf1eeccca8158bc" +checksum = "8798c1a699bd25648b6708eefe94d97c6f9891febb94b42cca1f7a4b086ea64e" dependencies = [ "anyhow", "termcolor", - "wasmparser 0.240.0", + "wasmparser 0.251.0", ] [[package]] name = "wasmtime" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a667153732c6cfba625cf5adc5db60ea2849f9a027b012a48cdd81e691e7b70a" +checksum = "d39226663bd765601279a79b88645a7c4a4d3c2fe73040afdc27bead02ee6659" dependencies = [ "addr2line", - "anyhow", "async-trait", "bitflags 2.13.2", "bumpalo", @@ -3280,9 +3107,7 @@ dependencies = [ "encoding_rs", "futures", "fxprof-processed-profile", - "gimli 0.32.3", - "hashbrown 0.15.5", - "indexmap 2.14.2", + "gimli 0.33.0", "ittapi", "libc", "log", @@ -3293,7 +3118,7 @@ dependencies = [ "postcard", "pulley-interpreter", "rayon", - "rustix 1.1.5", + "rustix", "semver", "serde", "serde_derive", @@ -3302,36 +3127,37 @@ dependencies = [ "target-lexicon", "tempfile", "wasm-compose", - "wasm-encoder 0.240.0", - "wasmparser 0.240.0", + "wasm-encoder 0.251.0", + "wasmparser 0.251.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", "wat", - "windows-sys 0.60.2", + "windows-sys 0.61.2", + "wit-parser", ] [[package]] name = "wasmtime-environ" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd342272a338b98ca2b5d82c0bd687f76e0214beeafbed107666bb16ff654a1e" +checksum = "2595a168541e8a7faeacf21e3d59da93628ee71468cd69fee9fc2a92c9b1c7d8" dependencies = [ "anyhow", "cpp_demangle", - "cranelift-bitset 0.126.2", - "cranelift-entity 0.126.2", - "gimli 0.32.3", + "cranelift-bforest", + "cranelift-bitset", + "cranelift-entity", + "gimli 0.33.0", + "hashbrown 0.17.1", "indexmap 2.14.2", "log", "object", @@ -3340,39 +3166,41 @@ dependencies = [ "semver", "serde", "serde_derive", + "sha2", "smallvec", "target-lexicon", - "wasm-encoder 0.240.0", - "wasmparser 0.240.0", + "wasm-encoder 0.251.0", + "wasmparser 0.251.0", "wasmprinter", "wasmtime-internal-component-util", + "wasmtime-internal-core", ] [[package]] name = "wasmtime-internal-cache" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4184b4dba5f5ba95eb219c745ff3b80c86eba479b54804e81ca7f9db91869567" +checksum = "a37d629957320219db11336663e0947e19afe77150403509cac21c47ead60c69" dependencies = [ - "anyhow", "base64 0.22.1", "directories-next", "log", "postcard", - "rustix 1.1.5", + "rustix", "serde", "serde_derive", "sha2", "toml 0.9.12+spec-1.1.0", - "windows-sys 0.60.2", + "wasmtime-environ", + "windows-sys 0.61.2", "zstd", ] [[package]] name = "wasmtime-internal-component-macro" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0903eaf417c3f8250f5fd7e4f94ad195041d3d8d3d84fddcfcf778453c3e5c8" +checksum = "9abf0fb4ce458eb6edbfaf6cbf13fcbf4216eac5a85febfe90224a1f6064c990" dependencies = [ "anyhow", "proc-macro2", @@ -3380,29 +3208,40 @@ dependencies = [ "syn 2.0.119", "wasmtime-internal-component-util", "wasmtime-internal-wit-bindgen", - "wit-parser 0.240.0", + "wit-parser", ] [[package]] name = "wasmtime-internal-component-util" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a336ff2954a447d4698b85ba1e9d6138076fa6b668e48fd9bf5da54712649a" +checksum = "0e50df18c9a8e0deec353ad1e6364ef50538231719a12d80fa5dcb300be8d36b" [[package]] -name = "wasmtime-internal-cranelift" -version = "39.0.2" +name = "wasmtime-internal-core" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e114a5f504df7784101a8fc15a25206d594ec5496c44ec9b925fd2193d03be0a" +checksum = "93b097389e5fad89c8ff8ee0aeafd16447b5a288d52aa1131f17ab4c19fd5be3" dependencies = [ "anyhow", + "hashbrown 0.17.1", + "libm", + "serde", +] + +[[package]] +name = "wasmtime-internal-cranelift" +version = "46.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08b3e909115836655b83c8bdef7c2e20a34293e785218d9f71a4e5382a09c6b0" +dependencies = [ "cfg-if", "cranelift-codegen", "cranelift-control", - "cranelift-entity 0.126.2", + "cranelift-entity", "cranelift-frontend", "cranelift-native", - "gimli 0.32.3", + "gimli 0.33.0", "itertools 0.14.0", "log", "object", @@ -3410,143 +3249,108 @@ dependencies = [ "smallvec", "target-lexicon", "thiserror 2.0.20", - "wasmparser 0.240.0", + "wasmparser 0.251.0", "wasmtime-environ", - "wasmtime-internal-math", + "wasmtime-internal-core", "wasmtime-internal-unwinder", "wasmtime-internal-versioned-export-macros", ] [[package]] name = "wasmtime-internal-fiber" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c78d4e39c954198de2f9bd9937eb61408ed4419a6c75b5472fcce926d859cbe5" +checksum = "a000d1124dd40417ce8433d07de1063ecc9be7cac21745c8de7f9cf7684c3ead" dependencies = [ - "anyhow", "cc", "cfg-if", "libc", - "rustix 1.1.5", + "rustix", + "wasmtime-environ", "wasmtime-internal-versioned-export-macros", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] name = "wasmtime-internal-jit-debug" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2add04119fa43ce6e57f2638ab978a17adafbba738a2aa66f29c5bb528bd030b" +checksum = "a7439956e78ba68e2cd766f34c3f056d625fad9a055eafb0c4569ac91c09e6b4" dependencies = [ "cc", "object", - "rustix 1.1.5", + "rustix", "wasmtime-internal-versioned-export-macros", ] [[package]] name = "wasmtime-internal-jit-icache-coherence" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "967b84e1a766a59955450473fd39a90c77529a0d4928b3bbae81b9c9cbccdc67" +checksum = "ee3a381a9dd1ffe3893507733300b420605f465655d78c7a75a965a09d7b43d5" dependencies = [ - "anyhow", "cfg-if", "libc", - "windows-sys 0.60.2", -] - -[[package]] -name = "wasmtime-internal-math" -version = "39.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d51480b15d802e7203630ea338da956f5e96b6ae6308db265d14d92a3c29870" -dependencies = [ - "libm", + "wasmtime-internal-core", + "windows-sys 0.61.2", ] -[[package]] -name = "wasmtime-internal-slab" -version = "39.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7227392fed8096183a33ae25fade1b040f4abcf7a3943366467cbc3801d7ec20" - [[package]] name = "wasmtime-internal-unwinder" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d60c5615cf820bef46f78652d22dc45c9727af363406f78185d1661e78e3e00d" +checksum = "22f951f78a1a09001547838fa557522d56655385db97e47307d0f582ca866974" dependencies = [ - "anyhow", "cfg-if", "cranelift-codegen", "log", "object", + "wasmtime-environ", ] [[package]] name = "wasmtime-internal-versioned-export-macros" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47f6bf5957ba823cb170996073edf4596b26d5f44c53f9e96b586c64fa04f7e9" +checksum = "51e06f9fabbe647e5c2ed186e6920ab1fb48174688d7d3fdadbda537b8499b51" dependencies = [ "proc-macro2", "quote", "syn 2.0.119", ] -[[package]] -name = "wasmtime-internal-winch" -version = "39.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b399a054107359137bbeba8a7795ca30b222d59df634d3d7db5a42408f9be7b5" -dependencies = [ - "anyhow", - "cranelift-codegen", - "gimli 0.32.3", - "log", - "object", - "target-lexicon", - "wasmparser 0.240.0", - "wasmtime-environ", - "wasmtime-internal-cranelift", - "winch-codegen", -] - [[package]] name = "wasmtime-internal-wit-bindgen" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62798d4fed29a560bbb2360669481f7419c704e6bf85b6c25b52f23c11bb0909" +checksum = "f49ac5121036c2255bdc203b1b75a1c04544744cd5f51c93240b58bddca9f0f1" dependencies = [ "anyhow", "bitflags 2.13.2", - "heck 0.5.0", + "heck", "indexmap 2.14.2", - "wit-parser 0.240.0", + "wit-parser", ] [[package]] name = "wasmtime-wasi" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e10672929acc96e8492d8e1e2fb02b69e1f22002aaea08dd366f790dfe11f5e9" +checksum = "16d23668f18d6fd0a932c1fc58600bbb8a2e4f9b217f08bb61841e2c275d4ce3" dependencies = [ - "anyhow", "async-trait", "bitflags 2.13.2", "bytes", "cap-fs-ext", "cap-net-ext", - "cap-rand", "cap-std", "cap-time-ext", - "fs-set-times", + "cfg-if", "futures", "io-extras", "io-lifetimes", - "rustix 1.1.5", - "system-interface", + "rand 0.10.2", + "rustix", "thiserror 2.0.20", "tokio", "tracing", @@ -3554,29 +3358,28 @@ dependencies = [ "wasmtime", "wasmtime-wasi-io", "wiggle", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] name = "wasmtime-wasi-io" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145a2ae59e73be4a802524946250807bb9aada5e7932de071cba6ee24346b835" +checksum = "0df5ffcd5aca96285be7745d4677ca5e2851245ca7c066a98c0fbee5bc6375f1" dependencies = [ - "anyhow", "async-trait", "bytes", "futures", + "tracing", "wasmtime", ] [[package]] name = "wasmtime-wasi-nn" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f958f4e00a57efaa3879e98842aad61a3528cc1f76bb05166aac576b9a8fd61" +checksum = "2ade4e806eb50062e4257999221e9941d4938545928e2de64464a6d28633709a" dependencies = [ - "anyhow", "openvino", "thiserror 2.0.20", "tracing", @@ -3619,38 +3422,38 @@ dependencies = [ [[package]] name = "wiggle" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd8188b23eea8625cc96b29b26ffea7ae82fd50cd2b3394c49f30109933cb25" +checksum = "a77deefc2b0fe8c258316372ec322da627ce8c5b5ea9eec3b001190e9f8f2f69" dependencies = [ - "anyhow", "bitflags 2.13.2", "thiserror 2.0.20", "tracing", "wasmtime", + "wasmtime-environ", "wiggle-macro", "witx", ] [[package]] name = "wiggle-generate" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a019ec6a7531645e43786805c11c2e7920a2390aa23e067a16485b9bd16720c" +checksum = "0a52145d29793eb1e0c5be9b6be5a74552b9236f01866c769ec1c3270584085f" dependencies = [ - "anyhow", - "heck 0.5.0", + "heck", "proc-macro2", "quote", "syn 2.0.119", + "wasmtime-environ", "witx", ] [[package]] name = "wiggle-macro" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "885e44efc8547387700b4bdf9caa66a9d04364f394e31bd3aa240cbce2d47296" +checksum = "c26242c5c54d0f2837e1fecc933e1581e45d39cde1b1f6b3ad72955e0851ec20" dependencies = [ "proc-macro2", "quote", @@ -3689,26 +3492,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "winch-codegen" -version = "39.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac192a0d21224c027d56e69b91578f0f758dce26a1641e166312518c18e948a" -dependencies = [ - "anyhow", - "cranelift-assembler-x64", - "cranelift-codegen", - "gimli 0.32.3", - "regalloc2", - "smallvec", - "target-lexicon", - "thiserror 2.0.20", - "wasmparser 0.240.0", - "wasmtime-environ", - "wasmtime-internal-cranelift", - "wasmtime-internal-math", -] - [[package]] name = "windows" version = "0.52.0" @@ -3718,7 +3501,7 @@ dependencies = [ "windows-core 0.52.0", "windows-implement 0.52.0", "windows-interface 0.52.0", - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -3727,7 +3510,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -3817,7 +3600,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -3826,16 +3609,7 @@ version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets 0.53.5", + "windows-targets", ] [[package]] @@ -3853,31 +3627,14 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.53.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" -dependencies = [ - "windows-link", - "windows_aarch64_gnullvm 0.53.1", - "windows_aarch64_msvc 0.53.1", - "windows_i686_gnu 0.53.1", - "windows_i686_gnullvm 0.53.1", - "windows_i686_msvc 0.53.1", - "windows_x86_64_gnu 0.53.1", - "windows_x86_64_gnullvm 0.53.1", - "windows_x86_64_msvc 0.53.1", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] @@ -3886,96 +3643,48 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" - [[package]] name = "windows_i686_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" -[[package]] -name = "windows_i686_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" - [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" - [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_i686_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" - [[package]] name = "winnow" version = "0.7.15" @@ -4006,9 +3715,9 @@ checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" [[package]] name = "wit-component" -version = "0.250.0" +version = "0.251.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d35e69355f29f746a5b5ed3a81b78a69597d13e24798b89f35f3e2691e59e779" +checksum = "83a5e60173c413659c689f0581b0cf5d1a2404077568f9ffdce748a9eb2fc913" dependencies = [ "anyhow", "bitflags 2.13.2", @@ -4017,35 +3726,17 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "wasm-encoder 0.250.0", + "wasm-encoder 0.251.0", "wasm-metadata", - "wasmparser 0.250.0", - "wit-parser 0.250.0", -] - -[[package]] -name = "wit-parser" -version = "0.240.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9875ea3fa272f57cc1fc50f225a7b94021a7878c484b33792bccad0d93223439" -dependencies = [ - "anyhow", - "id-arena", - "indexmap 2.14.2", - "log", - "semver", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser 0.240.0", + "wasmparser 0.251.0", + "wit-parser", ] [[package]] name = "wit-parser" -version = "0.250.0" +version = "0.251.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7be74761ad42af22e13d82d89804369aa7298d4d67ae1523aa694f2b30e6b7a" +checksum = "e960732e824fab95099971a09e638979347c94ca48568d3c854c945729196947" dependencies = [ "anyhow", "hashbrown 0.17.1", @@ -4057,7 +3748,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.250.0", + "wasmparser 0.251.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index a4447ff4..885adc43 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,7 @@ bytes = "^1.2.1" bytesize = "^1.1.0" cfg-if = "^1.0" clap = { workspace = true } -cranelift-entity = "^0.123.0" +cranelift-entity = "^0.133.0" fastly-shared = "^0.13.0" flate2 = "^1.0.24" futures = { workspace = true } @@ -60,7 +60,7 @@ url = { workspace = true } wasmparser = { workspace = true } wasm-encoder = { workspace = true } # Disable the "serde" feature which we don't need. -wasm-metadata = { version = "0.250.0", default-features = false } +wasm-metadata = { version = "0.251.0", default-features = false } wit-component = { workspace = true } wasmtime = { workspace = true } wasmtime-wasi = { workspace = true } @@ -130,7 +130,7 @@ pin-project = "1.0.8" rustls = { version = "0.21.5", features = ["dangerous_configuration"] } rustls-pemfile = "1.0.3" serde_json = "1.0.59" -tokio = { version = "1.49.0", features = ["full"] } +tokio = { version = "1.53.0", features = ["full"] } tokio-rustls = "0.24.1" tracing = "0.1.37" tracing-futures = "0.2.5" @@ -138,12 +138,12 @@ futures = "0.3.24" url = "2.3.1" # Wasmtime dependencies -wasmtime = { version = "39.0.2", features = ["call-hook"] } -wasmtime-wasi = "39.0.2" -wasmtime-wasi-io = "39.0.2" -wasmtime-wasi-nn = "39.0.2" -wiggle = "39.0.2" -wat = "1.250.0" -wasmparser = "0.250.0" -wasm-encoder = { version = "0.250.0", features = ["wasmparser"] } -wit-component = "0.250.0" +wasmtime = { version = "46.0.3", features = ["anyhow", "call-hook"] } +wasmtime-wasi = "46.0.3" +wasmtime-wasi-io = "46.0.3" +wasmtime-wasi-nn = "46.0.3" +wiggle = "46.0.3" +wat = "1.251.0" +wasmparser = "0.251.0" +wasm-encoder = { version = "0.251.0", features = ["wasmparser"] } +wit-component = "0.251.0" diff --git a/cli/tests/trap-test/Cargo.lock b/cli/tests/trap-test/Cargo.lock index 953f8ccb..af05e9f7 100644 --- a/cli/tests/trap-test/Cargo.lock +++ b/cli/tests/trap-test/Cargo.lock @@ -4,11 +4,11 @@ version = 4 [[package]] name = "addr2line" -version = "0.25.1" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b" +checksum = "59317f77929f0e679d39364702289274de2f0f0b22cbf50b2b8cff2169a0b27a" dependencies = [ - "gimli 0.32.3", + "gimli 0.33.0", ] [[package]] @@ -182,15 +182,6 @@ version = "2.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06" -[[package]] -name = "bitmaps" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" -dependencies = [ - "typenum", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -241,7 +232,7 @@ checksum = "150941cefd3df4de2fea24604ba4949371576f62e527410298333f7d431a1bc6" dependencies = [ "cap-primitives", "cap-std", - "rustix 1.1.5", + "rustix", "smallvec", ] @@ -257,22 +248,12 @@ dependencies = [ "io-lifetimes", "ipnet", "maybe-owned", - "rustix 1.1.5", + "rustix", "rustix-linux-procfs", "windows-sys 0.59.0", "winx", ] -[[package]] -name = "cap-rand" -version = "3.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ec6a5b75f54547c579a6b117c6fdd5f04f4ab7598de747b9f440a53592b3a4a" -dependencies = [ - "ambient-authority", - "rand", -] - [[package]] name = "cap-std" version = "3.4.6" @@ -282,7 +263,7 @@ dependencies = [ "cap-primitives", "io-extras", "io-lifetimes", - "rustix 1.1.5", + "rustix", ] [[package]] @@ -295,7 +276,7 @@ dependencies = [ "cap-primitives", "iana-time-zone", "once_cell", - "rustix 1.1.5", + "rustix", "winx", ] @@ -317,6 +298,17 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e7648175b45a9a48536d676f68d918270699102aa8dab5496df06904c914600" +[[package]] +name = "chacha20" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.1", + "rand_core", +] + [[package]] name = "chrono" version = "0.4.45" @@ -356,7 +348,7 @@ version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9c751b79415d4e559e3d1fcf128e09e720eb673a06d26cf6f392d37d75b66e0" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "syn 3.0.6", @@ -423,131 +415,133 @@ dependencies = [ "libc", ] +[[package]] +name = "cpufeatures" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca28b0ae3115b884660db4118d803791fd6756b6e88f39c0f3f7859060d7566" +dependencies = [ + "libc", +] + [[package]] name = "cranelift-assembler-x64" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f28665a3cba7b8fe75d885c2a1c1bbc661b65685df34f7d93a4669ceb2e719" +checksum = "0aadfd45214f09461ba0406f7dacecce5cac39bf0bdb4890eeb468f4ef090e07" dependencies = [ "cranelift-assembler-x64-meta", ] [[package]] name = "cranelift-assembler-x64-meta" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6308845400e41d9d34acf8f2d13454b907012d9de5265c66f731570adf82019e" +checksum = "57069faede9bd1f926364b4cf69ccc9bebc6f4af5ab897083581b7bc991bf20a" dependencies = [ "cranelift-srcgen", ] [[package]] name = "cranelift-bforest" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ed5df9b6cda90f2dd921760925079670ba6c86162efa4de9f6c6efea124384" +checksum = "0b1221450f2f9efaa996d916bf53a0a4d13346a4a75468afb828390209a4fdd4" dependencies = [ - "cranelift-entity 0.126.2", + "cranelift-entity", + "wasmtime-internal-core", ] [[package]] name = "cranelift-bitset" -version = "0.123.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "682c2ef5e13a8f33436e1ce0a3387e459f8446c6f3978dd1f027721d159aed3c" - -[[package]] -name = "cranelift-bitset" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006fe8776f6d81acb83571f52e7737a54c6dec1ba75e2b7b5a68af15451f88ee" +checksum = "97706f2b466d67bdf0f69d1cf5c5c4a5cd31087cf1fa2e8e5fe0450dddc8661d" dependencies = [ "serde", "serde_derive", + "wasmtime-internal-core", ] [[package]] name = "cranelift-codegen" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021b5a45c5ca4d414746a985c7241fea4202fd71aeef5a2891c0be32518e3201" +checksum = "432246ee44b2fc0140b412dca55801d200d6fb25d2d7d18c44bb29e8cd71268b" dependencies = [ "bumpalo", "cranelift-assembler-x64", "cranelift-bforest", - "cranelift-bitset 0.126.2", + "cranelift-bitset", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-control", - "cranelift-entity 0.126.2", + "cranelift-entity", "cranelift-isle", - "gimli 0.32.3", - "hashbrown 0.15.5", + "gimli 0.33.0", + "hashbrown 0.17.1", + "libm", "log", + "postcard", "pulley-interpreter", "regalloc2", "rustc-hash", "serde", + "serde_derive", + "sha2", "smallvec", "target-lexicon", - "wasmtime-internal-math", + "wasmtime-internal-core", ] [[package]] name = "cranelift-codegen-meta" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5350ad78964a8cc301bc83cbc9b5144ccb44e1c2f604b551cc8ec15c99900dcb" +checksum = "b5aa51eff0949f06a5c8f3d5adefef94a12ea99f71cd8985047b91d45f367150" dependencies = [ "cranelift-assembler-x64-meta", "cranelift-codegen-shared", "cranelift-srcgen", - "heck 0.5.0", + "heck", "pulley-interpreter", ] [[package]] name = "cranelift-codegen-shared" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6918b5db84d5a9b09eb8fae05466cd57fb04d97a88ac47c24698830c8714747e" +checksum = "6095e7095930b6169490138b4262fe7ec24290d3f604d7fe62e1e3138e740daa" [[package]] name = "cranelift-control" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec4ea4593cd6ef06573d7a6bc5a4231368f96a5b57f65900b24553cca3284bcd" +checksum = "e61dfa0766c0eadf42b3febd145a35f81f31086e207f534e5fb406fc3d08fc47" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.123.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43fba0e38f2029ee1d524e1a7283a3111e6464282dbe0675c372ca4251f6445" -dependencies = [ - "cranelift-bitset 0.123.15", -] - -[[package]] -name = "cranelift-entity" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcca10e8c33eac67a45be4e09d236e274697831ca6bf4c4a927f7570eb8436a8" +checksum = "e93867a79a06dd5d9ffeb96f7563dc7b6b142b5d89e42ab77e458a408a8aa9d5" dependencies = [ - "cranelift-bitset 0.126.2", + "cranelift-bitset", "serde", "serde_derive", + "wasmtime-internal-core", ] [[package]] name = "cranelift-frontend" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dcc8b7e922ab1a6ec4640be3533698e291a4111b83d96f8d9e3367162e290ef" +checksum = "d1991dc32fefa54f14d2a63570d1e963826257605e478558733f83450b7e7661" dependencies = [ "cranelift-codegen", + "hashbrown 0.17.1", "log", "smallvec", "target-lexicon", @@ -555,15 +549,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9db87d9e6fe9ba89a71434a06c9f19153f3dd273a1c5c9a6365bc4f019213d1b" +checksum = "784546de9988ff6e1df0fd4d2450760469a7607344156c661e69ec28082c5da4" [[package]] name = "cranelift-native" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6aa4002a6569b047ecb846f5a952d21b81963817a0c1dad064b69e5a80f5952" +checksum = "7107a4ae4a2ba48b5df8648365e638b08322fa1da11e86206bf5eddb862b21dd" dependencies = [ "cranelift-codegen", "libc", @@ -572,9 +566,9 @@ dependencies = [ [[package]] name = "cranelift-srcgen" -version = "0.126.2" +version = "0.133.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "289ab02de2733de3a857c98bdaace8f4dfab1cc1d322ba8637280ce2a7d15d8e" +checksum = "4b3f161aa81ee5dd8d7b0eb8828988f57baf2f78d288e62b6b3714b37aa6d6a1" [[package]] name = "crc32fast" @@ -809,12 +803,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 = "fastly-shared" version = "0.13.1" @@ -831,17 +819,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223" -[[package]] -name = "fd-lock" -version = "4.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce92ff622d6dadf7349484f42c93271a0d49b7cc4d466a936405bacbe10aa78" -dependencies = [ - "cfg-if", - "rustix 1.1.5", - "windows-sys 0.59.0", -] - [[package]] name = "find-msvc-tools" version = "0.1.12" @@ -871,12 +848,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foldhash" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" - [[package]] name = "foldhash" version = "0.2.0" @@ -899,7 +870,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94e7099f6313ecacbe1256e8ff9d617b75d1bcb16a6fddef94866d225a01a14a" dependencies = [ "io-lifetimes", - "rustix 1.1.5", + "rustix", "windows-sys 0.59.0", ] @@ -1035,6 +1006,7 @@ dependencies = [ "cfg-if", "libc", "r-efi", + "rand_core", ] [[package]] @@ -1043,18 +1015,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.1", "indexmap 2.14.2", "stable_deref_trait", ] @@ -1096,13 +1069,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.5" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" -dependencies = [ - "foldhash 0.1.5", - "serde", -] +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" [[package]] name = "hashbrown" @@ -1110,17 +1079,11 @@ version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" dependencies = [ - "foldhash 0.2.0", + "foldhash", "serde", "serde_core", ] -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - [[package]] name = "heck" version = "0.5.0" @@ -1329,20 +1292,6 @@ dependencies = [ "icu_properties", ] -[[package]] -name = "im-rc" -version = "15.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1955a75fa080c677d3972822ec4bad316169ab1cfc6c257a942c2265dbe5fe" -dependencies = [ - "bitmaps", - "rand_core", - "rand_xoshiro", - "sized-chunks", - "typenum", - "version_check", -] - [[package]] name = "indexmap" version = "1.9.3" @@ -1544,12 +1493,6 @@ dependencies = [ "libc", ] -[[package]] -name = "linux-raw-sys" -version = "0.4.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" - [[package]] name = "linux-raw-sys" version = "0.12.1" @@ -1579,12 +1522,9 @@ checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" [[package]] name = "mach2" -version = "0.4.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d640282b302c0bb0a2a8e0233ead9035e3bed871f0b7e81fe4a1ec829765db44" -dependencies = [ - "libc", -] +checksum = "dae608c151f68243f2b000364e1f7b186d9c29845f7d2d85bd31b9ad77ad552b" [[package]] name = "matchers" @@ -1613,7 +1553,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57804b2c9b69967f1536a56f86297e367a33b19e98852ed624b84551cdbc0d90" dependencies = [ - "rustix 1.1.5", + "rustix", ] [[package]] @@ -1695,12 +1635,12 @@ dependencies = [ [[package]] name = "object" -version = "0.37.3" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" +checksum = "2e5a6c098c7a3b6547378093f5cc30bc54fd361ce711e05293a5cc589562739b" dependencies = [ "crc32fast", - "hashbrown 0.15.5", + "hashbrown 0.17.1", "indexmap 2.14.2", "memchr", ] @@ -1867,15 +1807,6 @@ dependencies = [ "zerovec", ] -[[package]] -name = "ppv-lite86" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" -dependencies = [ - "zerocopy", -] - [[package]] name = "proc-macro2" version = "1.0.107" @@ -1887,21 +1818,21 @@ dependencies = [ [[package]] name = "pulley-interpreter" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0412168ab18b7d37047011474788846d1be290ea548867789b5a8b45651004a7" +checksum = "3f647f8aefd39efd5e38b484a8b7a926dd035ae366127df75c1d94d196f0a4ba" dependencies = [ - "cranelift-bitset 0.126.2", + "cranelift-bitset", "log", "pulley-macros", - "wasmtime-internal-math", + "wasmtime-internal-core", ] [[package]] name = "pulley-macros" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "752233a382efa1026438aa8409c72489ebaa7ed94148bfabdf5282dc864276ef" +checksum = "3e902032e329008b189b67498b1be7784d5849276f32402eca17441df08a6bcb" dependencies = [ "proc-macro2", "quote", @@ -1925,42 +1856,20 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] name = "rand" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e058c7de0b26af77780c769414d6257830bb240f3c38477dbc2c16e5f54d6d4c" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80" dependencies = [ - "ppv-lite86", + "chacha20", + "getrandom 0.4.3", "rand_core", ] [[package]] name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.17", -] - -[[package]] -name = "rand_xoshiro" -version = "0.6.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" -dependencies = [ - "rand_core", -] +checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" [[package]] name = "rayon" @@ -2004,15 +1913,16 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.13.5" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08effbc1fa53aaebff69521a5c05640523fab037b34a4a2c109506bc938246fa" +checksum = "757712e8e61590d6d4f5d563483755538b5aa13467837a3b41cd9832509a7f85" dependencies = [ "allocator-api2", "bumpalo", - "hashbrown 0.15.5", + "hashbrown 0.17.1", "log", "rustc-hash", + "serde", "smallvec", ] @@ -2086,19 +1996,6 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d" -[[package]] -name = "rustix" -version = "0.38.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" -dependencies = [ - "bitflags 2.13.2", - "errno", - "libc", - "linux-raw-sys 0.4.15", - "windows-sys 0.59.0", -] - [[package]] name = "rustix" version = "1.1.5" @@ -2108,7 +2005,7 @@ dependencies = [ "bitflags 2.13.2", "errno", "libc", - "linux-raw-sys 0.12.1", + "linux-raw-sys", "windows-sys 0.61.2", ] @@ -2119,7 +2016,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fc84bf7e9aa16c4f2c758f27412dc9841341e16aa682d9c7ac308fe3ee12056" dependencies = [ "once_cell", - "rustix 1.1.5", + "rustix", ] [[package]] @@ -2171,12 +2068,6 @@ version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f" -[[package]] -name = "ryu" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" - [[package]] name = "same-file" version = "1.0.6" @@ -2296,19 +2187,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "serde_yaml" -version = "0.9.34+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" -dependencies = [ - "indexmap 2.14.2", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - [[package]] name = "sha2" version = "0.10.9" @@ -2316,7 +2194,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "digest", ] @@ -2357,16 +2235,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" -[[package]] -name = "sized-chunks" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" -dependencies = [ - "bitmaps", - "typenum", -] - [[package]] name = "slab" version = "0.4.12" @@ -2447,22 +2315,6 @@ dependencies = [ "syn 3.0.6", ] -[[package]] -name = "system-interface" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4592f674ce18521c2a81483873a49596655b179f71c5e05d10c1fe66c78745" -dependencies = [ - "bitflags 2.13.2", - "cap-fs-ext", - "cap-std", - "fd-lock", - "io-lifetimes", - "rustix 0.38.44", - "windows-sys 0.59.0", - "winx", -] - [[package]] name = "tagptr" version = "0.2.0" @@ -2484,7 +2336,7 @@ dependencies = [ "fastrand", "getrandom 0.4.3", "once_cell", - "rustix 1.1.5", + "rustix", "windows-sys 0.61.2", ] @@ -2790,12 +2642,6 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" -[[package]] -name = "unsafe-libyaml" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" - [[package]] name = "untrusted" version = "0.9.0" @@ -2860,7 +2706,7 @@ dependencies = [ "bytesize", "cfg-if", "clap", - "cranelift-entity 0.123.15", + "cranelift-entity", "fastly-shared", "flate2", "futures", @@ -2886,9 +2732,9 @@ dependencies = [ "tracing-futures", "url", "walrus", - "wasm-encoder 0.250.0", + "wasm-encoder 0.251.0", "wasm-metadata", - "wasmparser 0.250.0", + "wasmparser 0.251.0", "wasmtime", "wasmtime-wasi", "wasmtime-wasi-io", @@ -2930,7 +2776,7 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439ad39ff894c43c9649fa724cdde9a6fc50b855d517ef071a93e5df82fe51d3" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "syn 2.0.119", @@ -2998,22 +2844,18 @@ dependencies = [ [[package]] name = "wasm-compose" -version = "0.240.0" +version = "0.251.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feeb9a231e63bd5d5dfe07e9f8daa53d5c85e4f7de5ef756d3b4e6a5f501c578" +checksum = "b089037d7eb453ed57b560fe7833de0707411c8b9fdc429745ced77e2a1bacb9" dependencies = [ "anyhow", - "heck 0.4.1", - "im-rc", + "heck", "indexmap 2.14.2", "log", "petgraph", - "serde", - "serde_derive", - "serde_yaml", "smallvec", - "wasm-encoder 0.240.0", - "wasmparser 0.240.0", + "wasm-encoder 0.251.0", + "wasmparser 0.251.0", "wat", ] @@ -3028,22 +2870,12 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.240.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06d642d8c5ecc083aafe9ceb32809276a304547a3a6eeecceb5d8152598bc71f" -dependencies = [ - "leb128fmt", - "wasmparser 0.240.0", -] - -[[package]] -name = "wasm-encoder" -version = "0.250.0" +version = "0.251.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2271adb766023046af314460f1fae02cc34ea16d736d93404d3b65be44270923" +checksum = "5a879a421bd17c528b74721b2abf4c62e8f1d1889c2ba8c3c50d02deaf2ce395" dependencies = [ "leb128fmt", - "wasmparser 0.250.0", + "wasmparser 0.251.0", ] [[package]] @@ -3058,14 +2890,14 @@ dependencies = [ [[package]] name = "wasm-metadata" -version = "0.250.0" +version = "0.251.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d2fe7edf8b5c8870da3f6796f8ebe1898af1276f18490c861fcb1a11436556" +checksum = "5f998ccc6e012f7b86865eb2a106c8a0422017a1a88977ce01a69f2244be2e57" dependencies = [ "anyhow", "indexmap 2.14.2", - "wasm-encoder 0.250.0", - "wasmparser 0.250.0", + "wasm-encoder 0.251.0", + "wasmparser 0.251.0", ] [[package]] @@ -3084,22 +2916,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.240.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b722dcf61e0ea47440b53ff83ccb5df8efec57a69d150e4f24882e4eba7e24a4" -dependencies = [ - "bitflags 2.13.2", - "hashbrown 0.15.5", - "indexmap 2.14.2", - "semver", - "serde", -] - -[[package]] -name = "wasmparser" -version = "0.250.0" +version = "0.251.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071d99cdfb8111603ed05500506c3298a940b58d609dd0259d3981785dd33556" +checksum = "437970b35b1a85cfde9c74b2398352d8d653f3bd8e3a3db0c063ea8f5b4b36ff" dependencies = [ "bitflags 2.13.2", "hashbrown 0.17.1", @@ -3121,23 +2940,22 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.240.0" +version = "0.251.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a84d6e25c198da67d0150ee7c2c62d33d784f0a565d1e670bdf1eeccca8158bc" +checksum = "8798c1a699bd25648b6708eefe94d97c6f9891febb94b42cca1f7a4b086ea64e" dependencies = [ "anyhow", "termcolor", - "wasmparser 0.240.0", + "wasmparser 0.251.0", ] [[package]] name = "wasmtime" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a667153732c6cfba625cf5adc5db60ea2849f9a027b012a48cdd81e691e7b70a" +checksum = "d39226663bd765601279a79b88645a7c4a4d3c2fe73040afdc27bead02ee6659" dependencies = [ "addr2line", - "anyhow", "async-trait", "bitflags 2.13.2", "bumpalo", @@ -3146,9 +2964,7 @@ dependencies = [ "encoding_rs", "futures", "fxprof-processed-profile", - "gimli 0.32.3", - "hashbrown 0.15.5", - "indexmap 2.14.2", + "gimli 0.33.0", "ittapi", "libc", "log", @@ -3159,7 +2975,7 @@ dependencies = [ "postcard", "pulley-interpreter", "rayon", - "rustix 1.1.5", + "rustix", "semver", "serde", "serde_derive", @@ -3168,36 +2984,37 @@ dependencies = [ "target-lexicon", "tempfile", "wasm-compose", - "wasm-encoder 0.240.0", - "wasmparser 0.240.0", + "wasm-encoder 0.251.0", + "wasmparser 0.251.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", "wat", - "windows-sys 0.60.2", + "windows-sys 0.61.2", + "wit-parser", ] [[package]] name = "wasmtime-environ" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd342272a338b98ca2b5d82c0bd687f76e0214beeafbed107666bb16ff654a1e" +checksum = "2595a168541e8a7faeacf21e3d59da93628ee71468cd69fee9fc2a92c9b1c7d8" dependencies = [ "anyhow", "cpp_demangle", - "cranelift-bitset 0.126.2", - "cranelift-entity 0.126.2", - "gimli 0.32.3", + "cranelift-bforest", + "cranelift-bitset", + "cranelift-entity", + "gimli 0.33.0", + "hashbrown 0.17.1", "indexmap 2.14.2", "log", "object", @@ -3206,39 +3023,41 @@ dependencies = [ "semver", "serde", "serde_derive", + "sha2", "smallvec", "target-lexicon", - "wasm-encoder 0.240.0", - "wasmparser 0.240.0", + "wasm-encoder 0.251.0", + "wasmparser 0.251.0", "wasmprinter", "wasmtime-internal-component-util", + "wasmtime-internal-core", ] [[package]] name = "wasmtime-internal-cache" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4184b4dba5f5ba95eb219c745ff3b80c86eba479b54804e81ca7f9db91869567" +checksum = "a37d629957320219db11336663e0947e19afe77150403509cac21c47ead60c69" dependencies = [ - "anyhow", "base64 0.22.1", "directories-next", "log", "postcard", - "rustix 1.1.5", + "rustix", "serde", "serde_derive", "sha2", "toml 0.9.12+spec-1.1.0", - "windows-sys 0.60.2", + "wasmtime-environ", + "windows-sys 0.61.2", "zstd", ] [[package]] name = "wasmtime-internal-component-macro" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0903eaf417c3f8250f5fd7e4f94ad195041d3d8d3d84fddcfcf778453c3e5c8" +checksum = "9abf0fb4ce458eb6edbfaf6cbf13fcbf4216eac5a85febfe90224a1f6064c990" dependencies = [ "anyhow", "proc-macro2", @@ -3246,29 +3065,40 @@ dependencies = [ "syn 2.0.119", "wasmtime-internal-component-util", "wasmtime-internal-wit-bindgen", - "wit-parser 0.240.0", + "wit-parser", ] [[package]] name = "wasmtime-internal-component-util" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a336ff2954a447d4698b85ba1e9d6138076fa6b668e48fd9bf5da54712649a" +checksum = "0e50df18c9a8e0deec353ad1e6364ef50538231719a12d80fa5dcb300be8d36b" [[package]] -name = "wasmtime-internal-cranelift" -version = "39.0.2" +name = "wasmtime-internal-core" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e114a5f504df7784101a8fc15a25206d594ec5496c44ec9b925fd2193d03be0a" +checksum = "93b097389e5fad89c8ff8ee0aeafd16447b5a288d52aa1131f17ab4c19fd5be3" dependencies = [ "anyhow", + "hashbrown 0.17.1", + "libm", + "serde", +] + +[[package]] +name = "wasmtime-internal-cranelift" +version = "46.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08b3e909115836655b83c8bdef7c2e20a34293e785218d9f71a4e5382a09c6b0" +dependencies = [ "cfg-if", "cranelift-codegen", "cranelift-control", - "cranelift-entity 0.126.2", + "cranelift-entity", "cranelift-frontend", "cranelift-native", - "gimli 0.32.3", + "gimli 0.33.0", "itertools 0.14.0", "log", "object", @@ -3276,143 +3106,108 @@ dependencies = [ "smallvec", "target-lexicon", "thiserror 2.0.20", - "wasmparser 0.240.0", + "wasmparser 0.251.0", "wasmtime-environ", - "wasmtime-internal-math", + "wasmtime-internal-core", "wasmtime-internal-unwinder", "wasmtime-internal-versioned-export-macros", ] [[package]] name = "wasmtime-internal-fiber" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c78d4e39c954198de2f9bd9937eb61408ed4419a6c75b5472fcce926d859cbe5" +checksum = "a000d1124dd40417ce8433d07de1063ecc9be7cac21745c8de7f9cf7684c3ead" dependencies = [ - "anyhow", "cc", "cfg-if", "libc", - "rustix 1.1.5", + "rustix", + "wasmtime-environ", "wasmtime-internal-versioned-export-macros", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] name = "wasmtime-internal-jit-debug" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2add04119fa43ce6e57f2638ab978a17adafbba738a2aa66f29c5bb528bd030b" +checksum = "a7439956e78ba68e2cd766f34c3f056d625fad9a055eafb0c4569ac91c09e6b4" dependencies = [ "cc", "object", - "rustix 1.1.5", + "rustix", "wasmtime-internal-versioned-export-macros", ] [[package]] name = "wasmtime-internal-jit-icache-coherence" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "967b84e1a766a59955450473fd39a90c77529a0d4928b3bbae81b9c9cbccdc67" +checksum = "ee3a381a9dd1ffe3893507733300b420605f465655d78c7a75a965a09d7b43d5" dependencies = [ - "anyhow", "cfg-if", "libc", - "windows-sys 0.60.2", -] - -[[package]] -name = "wasmtime-internal-math" -version = "39.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d51480b15d802e7203630ea338da956f5e96b6ae6308db265d14d92a3c29870" -dependencies = [ - "libm", + "wasmtime-internal-core", + "windows-sys 0.61.2", ] -[[package]] -name = "wasmtime-internal-slab" -version = "39.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7227392fed8096183a33ae25fade1b040f4abcf7a3943366467cbc3801d7ec20" - [[package]] name = "wasmtime-internal-unwinder" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d60c5615cf820bef46f78652d22dc45c9727af363406f78185d1661e78e3e00d" +checksum = "22f951f78a1a09001547838fa557522d56655385db97e47307d0f582ca866974" dependencies = [ - "anyhow", "cfg-if", "cranelift-codegen", "log", "object", + "wasmtime-environ", ] [[package]] name = "wasmtime-internal-versioned-export-macros" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47f6bf5957ba823cb170996073edf4596b26d5f44c53f9e96b586c64fa04f7e9" +checksum = "51e06f9fabbe647e5c2ed186e6920ab1fb48174688d7d3fdadbda537b8499b51" dependencies = [ "proc-macro2", "quote", "syn 2.0.119", ] -[[package]] -name = "wasmtime-internal-winch" -version = "39.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b399a054107359137bbeba8a7795ca30b222d59df634d3d7db5a42408f9be7b5" -dependencies = [ - "anyhow", - "cranelift-codegen", - "gimli 0.32.3", - "log", - "object", - "target-lexicon", - "wasmparser 0.240.0", - "wasmtime-environ", - "wasmtime-internal-cranelift", - "winch-codegen", -] - [[package]] name = "wasmtime-internal-wit-bindgen" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62798d4fed29a560bbb2360669481f7419c704e6bf85b6c25b52f23c11bb0909" +checksum = "f49ac5121036c2255bdc203b1b75a1c04544744cd5f51c93240b58bddca9f0f1" dependencies = [ "anyhow", "bitflags 2.13.2", - "heck 0.5.0", + "heck", "indexmap 2.14.2", - "wit-parser 0.240.0", + "wit-parser", ] [[package]] name = "wasmtime-wasi" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e10672929acc96e8492d8e1e2fb02b69e1f22002aaea08dd366f790dfe11f5e9" +checksum = "16d23668f18d6fd0a932c1fc58600bbb8a2e4f9b217f08bb61841e2c275d4ce3" dependencies = [ - "anyhow", "async-trait", "bitflags 2.13.2", "bytes", "cap-fs-ext", "cap-net-ext", - "cap-rand", "cap-std", "cap-time-ext", - "fs-set-times", + "cfg-if", "futures", "io-extras", "io-lifetimes", - "rustix 1.1.5", - "system-interface", + "rand", + "rustix", "thiserror 2.0.20", "tokio", "tracing", @@ -3420,29 +3215,28 @@ dependencies = [ "wasmtime", "wasmtime-wasi-io", "wiggle", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] name = "wasmtime-wasi-io" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145a2ae59e73be4a802524946250807bb9aada5e7932de071cba6ee24346b835" +checksum = "0df5ffcd5aca96285be7745d4677ca5e2851245ca7c066a98c0fbee5bc6375f1" dependencies = [ - "anyhow", "async-trait", "bytes", "futures", + "tracing", "wasmtime", ] [[package]] name = "wasmtime-wasi-nn" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f958f4e00a57efaa3879e98842aad61a3528cc1f76bb05166aac576b9a8fd61" +checksum = "2ade4e806eb50062e4257999221e9941d4938545928e2de64464a6d28633709a" dependencies = [ - "anyhow", "openvino", "thiserror 2.0.20", "tracing", @@ -3485,38 +3279,38 @@ dependencies = [ [[package]] name = "wiggle" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd8188b23eea8625cc96b29b26ffea7ae82fd50cd2b3394c49f30109933cb25" +checksum = "a77deefc2b0fe8c258316372ec322da627ce8c5b5ea9eec3b001190e9f8f2f69" dependencies = [ - "anyhow", "bitflags 2.13.2", "thiserror 2.0.20", "tracing", "wasmtime", + "wasmtime-environ", "wiggle-macro", "witx", ] [[package]] name = "wiggle-generate" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a019ec6a7531645e43786805c11c2e7920a2390aa23e067a16485b9bd16720c" +checksum = "0a52145d29793eb1e0c5be9b6be5a74552b9236f01866c769ec1c3270584085f" dependencies = [ - "anyhow", - "heck 0.5.0", + "heck", "proc-macro2", "quote", "syn 2.0.119", + "wasmtime-environ", "witx", ] [[package]] name = "wiggle-macro" -version = "39.0.2" +version = "46.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "885e44efc8547387700b4bdf9caa66a9d04364f394e31bd3aa240cbce2d47296" +checksum = "c26242c5c54d0f2837e1fecc933e1581e45d39cde1b1f6b3ad72955e0851ec20" dependencies = [ "proc-macro2", "quote", @@ -3555,26 +3349,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "winch-codegen" -version = "39.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac192a0d21224c027d56e69b91578f0f758dce26a1641e166312518c18e948a" -dependencies = [ - "anyhow", - "cranelift-assembler-x64", - "cranelift-codegen", - "gimli 0.32.3", - "regalloc2", - "smallvec", - "target-lexicon", - "thiserror 2.0.20", - "wasmparser 0.240.0", - "wasmtime-environ", - "wasmtime-internal-cranelift", - "wasmtime-internal-math", -] - [[package]] name = "windows" version = "0.52.0" @@ -3584,7 +3358,7 @@ dependencies = [ "windows-core 0.52.0", "windows-implement 0.52.0", "windows-interface 0.52.0", - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -3593,7 +3367,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -3683,7 +3457,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -3692,16 +3466,7 @@ version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets 0.53.5", + "windows-targets", ] [[package]] @@ -3719,31 +3484,14 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.53.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" -dependencies = [ - "windows-link", - "windows_aarch64_gnullvm 0.53.1", - "windows_aarch64_msvc 0.53.1", - "windows_i686_gnu 0.53.1", - "windows_i686_gnullvm 0.53.1", - "windows_i686_msvc 0.53.1", - "windows_x86_64_gnu 0.53.1", - "windows_x86_64_gnullvm 0.53.1", - "windows_x86_64_msvc 0.53.1", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] @@ -3752,96 +3500,48 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" - [[package]] name = "windows_i686_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" -[[package]] -name = "windows_i686_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" - [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" - [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_i686_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" - [[package]] name = "winnow" version = "0.7.15" @@ -3866,9 +3566,9 @@ dependencies = [ [[package]] name = "wit-component" -version = "0.250.0" +version = "0.251.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d35e69355f29f746a5b5ed3a81b78a69597d13e24798b89f35f3e2691e59e779" +checksum = "83a5e60173c413659c689f0581b0cf5d1a2404077568f9ffdce748a9eb2fc913" dependencies = [ "anyhow", "bitflags 2.13.2", @@ -3877,35 +3577,17 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "wasm-encoder 0.250.0", + "wasm-encoder 0.251.0", "wasm-metadata", - "wasmparser 0.250.0", - "wit-parser 0.250.0", -] - -[[package]] -name = "wit-parser" -version = "0.240.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9875ea3fa272f57cc1fc50f225a7b94021a7878c484b33792bccad0d93223439" -dependencies = [ - "anyhow", - "id-arena", - "indexmap 2.14.2", - "log", - "semver", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser 0.240.0", + "wasmparser 0.251.0", + "wit-parser", ] [[package]] name = "wit-parser" -version = "0.250.0" +version = "0.251.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7be74761ad42af22e13d82d89804369aa7298d4d67ae1523aa694f2b30e6b7a" +checksum = "e960732e824fab95099971a09e638979347c94ca48568d3c854c945729196947" dependencies = [ "anyhow", "hashbrown 0.17.1", @@ -3917,7 +3599,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.250.0", + "wasmparser 0.251.0", ] [[package]] diff --git a/cli/tests/trap-test/Cargo.toml b/cli/tests/trap-test/Cargo.toml index 4183bf07..3c4d308e 100644 --- a/cli/tests/trap-test/Cargo.toml +++ b/cli/tests/trap-test/Cargo.toml @@ -12,7 +12,7 @@ anyhow = "1.0.31" futures = "0.3.0" http = "0.2.1" hyper = "=0.14.26" -tokio = { version = "1.49.0", features = ["full"] } +tokio = { version = "1.53.0", features = ["full"] } tracing-subscriber = "0.2.19" viceroy-lib = { path = "../../..", features = ["test-fatalerror-config"] } diff --git a/src/component/compute/async_io.rs b/src/component/compute/async_io.rs index 57ae4b02..d769417a 100644 --- a/src/component/compute/async_io.rs +++ b/src/component/compute/async_io.rs @@ -4,9 +4,9 @@ use { linking::{ComponentCtx, SandboxView}, wiggle_abi, }, - anyhow::bail, futures::FutureExt, std::time::Duration, + wasmtime::bail, wasmtime::component::Resource, }; diff --git a/src/component/compute/shielding.rs b/src/component/compute/shielding.rs index 502d2820..443e1d80 100644 --- a/src/component/compute/shielding.rs +++ b/src/component/compute/shielding.rs @@ -76,7 +76,7 @@ impl shielding::HostShieldBackendOptions for ComponentCtx { &mut self, resource: Resource, timeout_ms: u32, - ) -> Result<(), anyhow::Error> { + ) -> Result<(), wasmtime::Error> { let current = self.wasi_table.get_mut(&resource)?; current.first_byte_timeout_ms = Some(timeout_ms); Ok(()) @@ -86,7 +86,7 @@ impl shielding::HostShieldBackendOptions for ComponentCtx { &mut self, resource: Resource, timeout_ms: u32, - ) -> Result<(), anyhow::Error> { + ) -> Result<(), wasmtime::Error> { let current = self.wasi_table.get_mut(&resource)?; current.between_bytes_timeout_ms = Some(timeout_ms); Ok(()) @@ -94,7 +94,7 @@ impl shielding::HostShieldBackendOptions for ComponentCtx { fn set_cache_key(&mut self, _resource: Resource, _cache_key: String) {} - fn new(&mut self) -> Result, anyhow::Error> { + fn new(&mut self) -> Result, wasmtime::Error> { Ok(self.wasi_table.push(ShieldBackendOptions::default())?) } diff --git a/src/error.rs b/src/error.rs index a8e26234..0cb2861b 100644 --- a/src/error.rs +++ b/src/error.rs @@ -194,6 +194,12 @@ pub enum Error { BetweenBytesTimeout, } +impl From for Error { + fn from(err: wasmtime::Error) -> Self { + Self::Other(err.into()) + } +} + impl Error { /// Map this error onto an appropriate 5XX response code during proxying. pub fn as_status_code(&self) -> StatusCode { @@ -439,19 +445,19 @@ pub(crate) enum ExecutionError { /// /// [call]: https://docs.rs/wasmtime/latest/wasmtime/struct.Func.html#method.call #[error("WebAssembly execution trapped: {0}")] - WasmTrap(anyhow::Error), + WasmTrap(wasmtime::Error), /// Errors thrown when trying to instantiate a guest context. #[error("Error creating context: {0}")] - Context(anyhow::Error), + Context(wasmtime::Error), /// Errors thrown when type-checking WebAssembly before instantiation #[error("Error type-checking WebAssembly instantiation: {0}")] - Typechecking(anyhow::Error), + Typechecking(wasmtime::Error), /// Errors thrown when trying to instantiate a guest module. #[error("Error instantiating WebAssembly: {0}")] - Instantiation(anyhow::Error), + Instantiation(wasmtime::Error), } /// Errors that can occur while parsing a `fastly.toml` file. diff --git a/src/execute.rs b/src/execute.rs index cfa35653..2806227e 100644 --- a/src/execute.rs +++ b/src/execute.rs @@ -349,7 +349,7 @@ impl ExecuteCtx { async fn maybe_receive_response( mut receiver: mpsc::Receiver, - ) -> Option<(Response, Option)> { + ) -> Option<(Response, Option)> { loop { match receiver.recv().await? { DownstreamResponse::Http(mut resp) => { @@ -376,8 +376,8 @@ impl ExecuteCtx { let mut resp = pending .recv_or_else(|e| { let status = e.as_status_code(); - let err = anyhow::Error::from(e); - anyhow_response_with_status(&err, status) + let err = wasmtime::Error::from(e); + err_response_with_status(&err, status) }) .await; @@ -441,7 +441,7 @@ impl ExecuteCtx { mut incoming_req: Request, local: SocketAddr, remote: SocketAddr, - ) -> Result<(Response, Option), Error> { + ) -> Result<(Response, Option), Error> { let orig_req_on_upgrade = hyper::upgrade::on(&mut incoming_req); let (incoming_req_parts, incoming_req_body) = incoming_req.into_parts(); let local_pushpin_proxy_port = self.settings.local_pushpin_proxy_port; @@ -634,7 +634,7 @@ impl ExecuteCtx { incoming_req: Request, local: SocketAddr, remote: SocketAddr, - ) -> Result, Error> { + ) -> Result, wasmtime::Error> { let result = self.handle_request(incoming_req, local, remote).await?; let resp = guest_result_to_response(result.0, result.1); @@ -645,7 +645,7 @@ impl ExecuteCtx { self: Arc, req: Request, metadata: DownstreamMetadata, - ) -> (Response, Option) { + ) -> (Response, Option) { let (downstream, receiver) = DownstreamRequest::new(req, metadata); let mut next_req = NextRequest(Some((Box::new(downstream), self.clone()))); @@ -678,7 +678,7 @@ impl ExecuteCtx { self: Arc, downstream: DownstreamRequest, receiver: mpsc::Receiver, - ) -> (Response, Option) { + ) -> (Response, Option) { let active_cpu_time_us = Arc::new(AtomicU64::new(0)); // Spawn a separate task to run the guest code. That allows _this_ method to return a response early @@ -705,7 +705,7 @@ impl ExecuteCtx { "There was an error handling the request {}", e.to_string() ); - (anyhow_response(&e), Some(e)) + (err_response(&e), Some(e)) } Err(e) => panic!("failed to run guest: {}", e), } @@ -735,15 +735,21 @@ impl ExecuteCtx { match self.instance_pre.as_ref() { Instance::Component(component, instance_pre) => { - let profiler = self.guest_profile_config.as_deref().map(|pcfg| { - let program_name = "main"; - GuestProfiler::new_component( - program_name, - pcfg.sample_period, - component.clone(), - std::iter::empty(), - ) - }); + let profiler = self + .guest_profile_config + .as_deref() + .map(|pcfg| { + let program_name = "main"; + GuestProfiler::new_component( + &self.engine, + program_name, + pcfg.sample_period, + component.clone(), + std::iter::empty(), + ) + }) + .transpose() + .map_err(ExecutionError::Context)?; let req = sandbox.downstream_request(); let body = sandbox.downstream_request_body(); @@ -768,7 +774,7 @@ impl ExecuteCtx { Ok(Err(())) => { event!(Level::ERROR, "WebAssembly exited with an error"); - Err(ExecutionError::WasmTrap(anyhow::Error::msg("failed"))) + Err(ExecutionError::WasmTrap(wasmtime::format_err!("failed"))) } Err(e) => { @@ -814,14 +820,20 @@ impl ExecuteCtx { } Instance::Module(module, instance_pre) => { - let profiler = self.guest_profile_config.as_deref().map(|pcfg| { - let program_name = "main"; - GuestProfiler::new( - program_name, - pcfg.sample_period, - vec![(program_name.to_string(), module.clone())], - ) - }); + let profiler = self + .guest_profile_config + .as_deref() + .map(|pcfg| { + let program_name = "main"; + GuestProfiler::new( + &self.engine, + program_name, + pcfg.sample_period, + vec![(program_name.to_string(), module.clone())], + ) + }) + .transpose() + .map_err(ExecutionError::Context)?; // We currently have to postpone linking and instantiation to the guest task // due to wasmtime limitations, in particular the fact that `Instance` is not `Send`. @@ -912,13 +924,19 @@ impl ExecuteCtx { let (module, instance_pre) = self.instance_pre.unwrap_module(); - let profiler = self.guest_profile_config.as_deref().map(|pcfg| { - GuestProfiler::new( - program_name, - pcfg.sample_period, - vec![(program_name.to_string(), module.clone())], - ) - }); + let profiler = self + .guest_profile_config + .as_deref() + .map(|pcfg| { + GuestProfiler::new( + &self.engine, + program_name, + pcfg.sample_period, + vec![(program_name.to_string(), module.clone())], + ) + }) + .transpose() + .map_err(ExecutionError::Context)?; let mut store = create_store(&self, sandbox, profiler, |builder| { builder.arg(program_name); @@ -960,7 +978,7 @@ impl ExecuteCtx { // finished. drop(receiver); - result + Ok(result?) } pub fn cache(&self) -> &Arc { @@ -1260,7 +1278,7 @@ impl ExecuteCtxBuilder { fn write_profile_to_file(profile: Box, path: &PathBuf) { match std::fs::File::create(path) - .map_err(anyhow::Error::new) + .map_err(wasmtime::Error::new) .and_then(|output| profile.finish(std::io::BufWriter::new(output))) { Err(e) => { @@ -1299,23 +1317,23 @@ fn write_profile_component( } } -fn guest_result_to_response(resp: Response, err: Option) -> Response { - err.as_ref().map(anyhow_response).unwrap_or(resp) +fn guest_result_to_response(resp: Response, err: Option) -> Response { + err.as_ref().map(err_response).unwrap_or(resp) } fn exec_err_to_response(err: &ExecutionError) -> Response { if let ExecutionError::WasmTrap(e) = err { - anyhow_response(e) + err_response(e) } else { panic!("failed to run guest: {err}") } } -fn anyhow_response(err: &anyhow::Error) -> Response { - anyhow_response_with_status(err, hyper::StatusCode::INTERNAL_SERVER_ERROR) +fn err_response(err: &wasmtime::Error) -> Response { + err_response_with_status(err, hyper::StatusCode::INTERNAL_SERVER_ERROR) } -fn anyhow_response_with_status(err: &anyhow::Error, status: hyper::StatusCode) -> Response { +fn err_response_with_status(err: &wasmtime::Error, status: hyper::StatusCode) -> Response { Response::builder() .status(status) .body(Body::from(format!("{err:?}").into_bytes())) @@ -1343,7 +1361,6 @@ fn configure_wasmtime( // and is only useful when the guest was built with debug info to begin with. config.debug_info(debug_info); config.wasm_backtrace_details(WasmBacktraceDetails::Enable); - config.async_support(true); config.epoch_interruption(true); config.profiler(profiling_strategy); diff --git a/src/linking.rs b/src/linking.rs index 3f4b0e7f..c7d82f08 100644 --- a/src/linking.rs +++ b/src/linking.rs @@ -48,7 +48,7 @@ impl wasmtime::ResourceLimiter for Limiter { current: usize, desired: usize, maximum: Option, - ) -> anyhow::Result { + ) -> wasmtime::Result { // limit the amount of memory that an instance can use to (roughly) 128MB, erring on // the side of letting things run that might get killed on Compute, because we are not // tracking some runtime factors in this count. @@ -69,15 +69,15 @@ impl wasmtime::ResourceLimiter for Limiter { current: usize, desired: usize, maximum: Option, - ) -> anyhow::Result { + ) -> wasmtime::Result { self.internal.table_growing(current, desired, maximum) } - fn memory_grow_failed(&mut self, error: anyhow::Error) -> anyhow::Result<()> { + fn memory_grow_failed(&mut self, error: wasmtime::Error) -> wasmtime::Result<()> { self.internal.memory_grow_failed(error) } - fn table_grow_failed(&mut self, error: anyhow::Error) -> anyhow::Result<()> { + fn table_grow_failed(&mut self, error: wasmtime::Error) -> wasmtime::Result<()> { self.internal.table_grow_failed(error) } @@ -149,7 +149,7 @@ impl ComponentCtx { sandbox: Sandbox, guest_profiler: Option, extra_init: impl FnOnce(&mut wasmtime_wasi::WasiCtxBuilder), - ) -> Result, anyhow::Error> { + ) -> Result, wasmtime::Error> { let mut builder = make_wasi_ctx(ctx, &sandbox); extra_init(&mut builder); @@ -246,7 +246,7 @@ pub(crate) fn create_store( sandbox: Sandbox, guest_profiler: Option, extra_init: impl FnOnce(&mut wasmtime_wasi::WasiCtxBuilder), -) -> Result, anyhow::Error> { +) -> Result, wasmtime::Error> { let mut builder = make_wasi_ctx(ctx, &sandbox); extra_init(&mut builder); diff --git a/src/logging.rs b/src/logging.rs index d53e3146..ba5621cb 100644 --- a/src/logging.rs +++ b/src/logging.rs @@ -95,13 +95,15 @@ impl wasmtime_wasi::cli::IsTerminal for LogEndpoint { impl wasmtime_wasi::p2::OutputStream for LogEndpoint { fn write(&mut self, bytes: bytes::Bytes) -> wasmtime_wasi::p2::StreamResult<()> { - self.write_entry(&bytes) - .map_err(|e| wasmtime_wasi::p2::StreamError::LastOperationFailed(anyhow::anyhow!(e))) + self.write_entry(&bytes).map_err(|e| { + wasmtime_wasi::p2::StreamError::LastOperationFailed(wasmtime::format_err!(e)) + }) } fn flush(&mut self) -> wasmtime_wasi::p2::StreamResult<()> { - ::flush(self) - .map_err(|e| wasmtime_wasi::p2::StreamError::LastOperationFailed(anyhow::anyhow!(e))) + ::flush(self).map_err(|e| { + wasmtime_wasi::p2::StreamError::LastOperationFailed(wasmtime::format_err!(e)) + }) } fn check_write(&mut self) -> wasmtime_wasi::p2::StreamResult { diff --git a/src/wiggle_abi.rs b/src/wiggle_abi.rs index 6f0483d6..afba5578 100644 --- a/src/wiggle_abi.rs +++ b/src/wiggle_abi.rs @@ -207,7 +207,7 @@ impl FastlyAbi for Sandbox { } impl UserErrorConversion for Sandbox { - fn fastly_status_from_error(&mut self, e: Error) -> Result { + fn fastly_status_from_error(&mut self, e: Error) -> Result { match e { Error::UnknownBackend(ref backend) => { let config_path = self.config_path(); @@ -250,7 +250,7 @@ impl UserErrorConversion for Sandbox { match e { // If a Fatal Error was encountered, propagate the error message out. - Error::FatalError(msg) => Err(anyhow::Error::new(Error::FatalError(msg))), + Error::FatalError(msg) => Err(wasmtime::Error::new(Error::FatalError(msg))), // Propagate the actionable error to the guest. _ => Ok(e.to_fastly_status()), } diff --git a/wasm_abi/adapter/Cargo.lock b/wasm_abi/adapter/Cargo.lock index a05dd8c4..37a77c92 100644 --- a/wasm_abi/adapter/Cargo.lock +++ b/wasm_abi/adapter/Cargo.lock @@ -67,6 +67,12 @@ dependencies = [ "foldhash", ] +[[package]] +name = "hashbrown" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" + [[package]] name = "heck" version = "0.5.0" @@ -92,13 +98,14 @@ checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" [[package]] name = "indexmap" -version = "2.11.0" +version = "2.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9" +checksum = "cc4e190f5d26ca7051642629da2c52fc03bde85a03197c99408dcd291734c855" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.17.1", "serde", + "serde_core", ] [[package]] @@ -141,7 +148,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", - "syn", + "syn 2.0.106", ] [[package]] @@ -176,22 +183,31 @@ checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.229" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba" +dependencies = [ + "serde_core", +] + +[[package]] +name = "serde_core" +version = "1.0.229" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.229" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.6", ] [[package]] @@ -217,6 +233,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "3.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8593e8e72159ed2257d083c7a454a85cbf854f37a0966d8d483aff8c8a3ebcee" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "unicode-ident" version = "1.0.18" @@ -238,7 +265,7 @@ dependencies = [ "fastly-shared", "object", "wasi", - "wasm-encoder", + "wasm-encoder 0.251.0", "wit-bindgen-rust-macro", ] @@ -255,7 +282,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5be00faa2b4950c76fe618c409d2c3ea5a3c9422013e079482d78544bb2d184c" dependencies = [ "leb128fmt", - "wasmparser", + "wasmparser 0.239.0", +] + +[[package]] +name = "wasm-encoder" +version = "0.251.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a879a421bd17c528b74721b2abf4c62e8f1d1889c2ba8c3c50d02deaf2ce395" +dependencies = [ + "leb128fmt", + "wasmparser 0.251.0", ] [[package]] @@ -266,8 +303,8 @@ checksum = "20b3ec880a9ac69ccd92fbdbcf46ee833071cf09f82bb005b2327c7ae6025ae2" dependencies = [ "anyhow", "indexmap", - "wasm-encoder", - "wasmparser", + "wasm-encoder 0.239.0", + "wasmparser 0.239.0", ] [[package]] @@ -277,7 +314,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c9d90bb93e764f6beabf1d02028c70a2156a6583e63ac4218dd07ef733368b0" dependencies = [ "bitflags 2.9.4", - "hashbrown", + "hashbrown 0.15.5", + "indexmap", + "semver", +] + +[[package]] +name = "wasmparser" +version = "0.251.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "437970b35b1a85cfde9c74b2398352d8d653f3bd8e3a3db0c063ea8f5b4b36ff" +dependencies = [ + "bitflags 2.9.4", "indexmap", "semver", ] @@ -303,7 +351,7 @@ dependencies = [ "heck", "indexmap", "prettyplease", - "syn", + "syn 2.0.106", "wasm-metadata", "wit-bindgen-core", "wit-component", @@ -319,7 +367,7 @@ dependencies = [ "prettyplease", "proc-macro2", "quote", - "syn", + "syn 2.0.106", "wit-bindgen-core", "wit-bindgen-rust", ] @@ -337,9 +385,9 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "wasm-encoder", + "wasm-encoder 0.239.0", "wasm-metadata", - "wasmparser", + "wasmparser 0.239.0", "wit-parser", ] @@ -358,5 +406,5 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser", + "wasmparser 0.239.0", ] diff --git a/wasm_abi/adapter/Cargo.toml b/wasm_abi/adapter/Cargo.toml index f7ca12f6..b9668b8a 100644 --- a/wasm_abi/adapter/Cargo.toml +++ b/wasm_abi/adapter/Cargo.toml @@ -27,9 +27,9 @@ bitflags = { version = "2.5.0", default-features = false } byte-array-literals = { path = "./byte-array-literals" } object = { version = "0.33", default-features = false, features = ["archive"] } wasi = { version = "0.11.0", default-features = false } -wasm-encoder = { version = "0.239.0", features = ["wasmparser"] } +wasm-encoder = { version = "0.251.0", features = ["wasmparser"] } wit-bindgen-rust-macro = { version = "0.46.0", default-features = false } -wit-component = "0.239.0" +wit-component = "0.251.0" fastly-shared = "0.13.0" [profile.release.package.viceroy-component-adapter] diff --git a/wasm_abi/data/viceroy-component-adapter.library.noshift.wasm b/wasm_abi/data/viceroy-component-adapter.library.noshift.wasm index 93747821..f0178484 100755 Binary files a/wasm_abi/data/viceroy-component-adapter.library.noshift.wasm and b/wasm_abi/data/viceroy-component-adapter.library.noshift.wasm differ diff --git a/wasm_abi/data/viceroy-component-adapter.library.wasm b/wasm_abi/data/viceroy-component-adapter.library.wasm index e91cb484..ffc320cd 100755 Binary files a/wasm_abi/data/viceroy-component-adapter.library.wasm and b/wasm_abi/data/viceroy-component-adapter.library.wasm differ diff --git a/wasm_abi/data/viceroy-component-adapter.noshift.wasm b/wasm_abi/data/viceroy-component-adapter.noshift.wasm index b761de10..c49b9361 100755 Binary files a/wasm_abi/data/viceroy-component-adapter.noshift.wasm and b/wasm_abi/data/viceroy-component-adapter.noshift.wasm differ diff --git a/wasm_abi/data/viceroy-component-adapter.wasm b/wasm_abi/data/viceroy-component-adapter.wasm index a961224f..66a34dba 100755 Binary files a/wasm_abi/data/viceroy-component-adapter.wasm and b/wasm_abi/data/viceroy-component-adapter.wasm differ