diff --git a/Cargo.lock b/Cargo.lock index 15d59334025..907be2b7b53 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,9 +14,9 @@ dependencies = [ [[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", ] @@ -945,7 +945,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.61.1", + "windows-sys 0.60.2", ] [[package]] @@ -1567,9 +1567,9 @@ dependencies = [ "futures-lite", "parking", "polling", - "rustix 1.0.7", + "rustix 1.1.4", "slab", - "windows-sys 0.61.1", + "windows-sys 0.61.2", ] [[package]] @@ -1618,9 +1618,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", @@ -2016,9 +2016,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" dependencies = [ "allocator-api2", ] @@ -2118,7 +2118,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-link 0.2.0", + "windows-link 0.2.1", ] [[package]] @@ -2193,9 +2193,12 @@ dependencies = [ [[package]] name = "cobs" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" +checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1" +dependencies = [ + "thiserror 2.0.18", +] [[package]] name = "colorchoice" @@ -2248,7 +2251,7 @@ dependencies = [ "encode_unicode", "libc", "unicode-width", - "windows-sys 0.61.1", + "windows-sys 0.61.2", ] [[package]] @@ -2371,46 +2374,48 @@ dependencies = [ [[package]] name = "cranelift-assembler-x64" -version = "0.125.4" +version = "0.131.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c088d3406f0c0252efa7445adfd2d05736bfb5218838f64eaf79d567077aed14" +checksum = "f8628cc4ba7f88a9205a7ee42327697abc61195a1e3d92cfae172d6a946e722e" dependencies = [ "cranelift-assembler-x64-meta", ] [[package]] name = "cranelift-assembler-x64-meta" -version = "0.125.4" +version = "0.131.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c03f887a763abb9c1dc08f722aa82b69067fda623b6f0273050f45f8b1a6776" +checksum = "d582754487e6c9a065a91c42ccf1bdd8d5977af33468dac5ae9bec0ce88acb3e" dependencies = [ "cranelift-srcgen", ] [[package]] name = "cranelift-bforest" -version = "0.125.4" +version = "0.131.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206887a11a43f507fee320a218dc365980bfc42ec2696792079a9f8c9369e90" +checksum = "fb59c81ace12ee7c33074db7903d4d75d1f40b28cd3e8e6f491de57b29129eb9" dependencies = [ "cranelift-entity", + "wasmtime-internal-core", ] [[package]] name = "cranelift-bitset" -version = "0.125.4" +version = "0.131.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac0790c83cfdab95709c5d0105fd888221e3af9049a7d7ec376ec901ab4e4dba" +checksum = "f25c06993a681be9cf3140798a3d4ac5bec955e7444416a2fdc87fda8567285d" dependencies = [ "serde", "serde_derive", + "wasmtime-internal-core", ] [[package]] name = "cranelift-codegen" -version = "0.125.4" +version = "0.131.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a98aed2d262eda69310e84bae8e053ee4f17dbdd3347b8d9156aa618ba2de0a" +checksum = "27b61f95c5a211918f5d336254a61a488b36a5818de47a868e8c4658dce9cccc" dependencies = [ "bumpalo", "cranelift-assembler-x64", @@ -2422,7 +2427,8 @@ dependencies = [ "cranelift-entity", "cranelift-isle", "gimli", - "hashbrown 0.15.2", + "hashbrown 0.16.1", + "libm", "log", "pulley-interpreter", "regalloc2", @@ -2430,14 +2436,14 @@ dependencies = [ "serde", "smallvec", "target-lexicon", - "wasmtime-internal-math", + "wasmtime-internal-core", ] [[package]] name = "cranelift-codegen-meta" -version = "0.125.4" +version = "0.131.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6906852826988563e9b0a9232ad951f53a47aa41ffd02f8ac852d3f41aae836a" +checksum = "0b85aa822fce72080d041d7c2cf7c3f5c6ecdea7afae68379ba4ef85269c4fa5" dependencies = [ "cranelift-assembler-x64-meta", "cranelift-codegen-shared", @@ -2448,35 +2454,36 @@ dependencies = [ [[package]] name = "cranelift-codegen-shared" -version = "0.125.4" +version = "0.131.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a50105aab667b5cc845f2be37c78475d7cc127cd8ec0a31f7b2b71d526099a7" +checksum = "833eb9fc89326cd072cc19e96892f09b5692c0dfe17cd4da2858ba30c2cd85c0" [[package]] name = "cranelift-control" -version = "0.125.4" +version = "0.131.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6adcc7aa7c0bc1727176a6f2d99c28a9e79a541ccd5ca911a0cb352da8befa36" +checksum = "9d005320f487e6e8a3edcc7f2fd4f43fcc9946d1013bf206ea649789ac1617fc" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.125.4" +version = "0.131.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "981b56af777f9a34ea6dcce93255125776d391410c2a68b75bed5941b714fa15" +checksum = "5e62ef34c6e720f347a79ece043e8584e242d168911da640bac654a33a6aaaf5" dependencies = [ "cranelift-bitset", "serde", "serde_derive", + "wasmtime-internal-core", ] [[package]] name = "cranelift-frontend" -version = "0.125.4" +version = "0.131.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea982589684dfb71afecb9fc09555c3a266300a1162a60d7fa39d41a5705b1c" +checksum = "dfa2ad00399dd47e7e7e33cb1dc23b0e39ed9dcd01e8f026fc37af91655031b8" dependencies = [ "cranelift-codegen", "log", @@ -2486,15 +2493,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.125.4" +version = "0.131.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0422686b22ed6a1f33cc40e3c43eb84b67155788568d1a5cac8439d3dca1783" +checksum = "02c51975ed217b4e8e5a7fd11e9ec83a96104bdff311dddcb505d1d8a9fd7fc6" [[package]] name = "cranelift-native" -version = "0.125.4" +version = "0.131.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f697bbbe135c655ea1deb7af0bae4a5c4fae2c88fdfc0fa57b34ae58c91040" +checksum = "f9b1889e00da9729d8f8525f3c12998ded86ea709058ff844ebe00b97548de0e" dependencies = [ "cranelift-codegen", "libc", @@ -2503,9 +2510,9 @@ dependencies = [ [[package]] name = "cranelift-srcgen" -version = "0.125.4" +version = "0.131.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718efe674f3df645462677e22a3128e890d88ba55821bb091083d257707be76c" +checksum = "d5a8f82fd5124f009f72167e60139245cd3b56cfd4b53050f22110c48c5f4da1" [[package]] name = "crc" @@ -2599,7 +2606,7 @@ dependencies = [ "document-features", "mio", "parking_lot", - "rustix 1.0.7", + "rustix 1.1.4", "signal-hook", "signal-hook-mio", "winapi", @@ -3435,9 +3442,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" [[package]] name = "fastrlp" @@ -3501,6 +3508,12 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + [[package]] name = "fixedbitset" version = "0.5.7" @@ -3780,11 +3793,12 @@ dependencies = [ [[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.0", "stable_deref_trait", ] @@ -3925,7 +3939,7 @@ dependencies = [ "num-traits", "object_store", "parking_lot", - "petgraph", + "petgraph 0.8.3", "portable-atomic", "priority-queue", "prometheus", @@ -4412,7 +4426,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" dependencies = [ "foldhash 0.1.5", - "serde", ] [[package]] @@ -4424,6 +4437,8 @@ dependencies = [ "allocator-api2", "equivalent", "foldhash 0.2.0", + "serde", + "serde_core", ] [[package]] @@ -4831,9 +4846,9 @@ dependencies = [ [[package]] name = "id-arena" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" +checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" [[package]] name = "ident_case" @@ -5346,15 +5361,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.175" +version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" +checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] name = "libm" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" +checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libredox" @@ -5374,9 +5389,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "linux-raw-sys" -version = "0.9.4" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" +checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "litemap" @@ -5485,11 +5500,11 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memfd" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" +checksum = "ad38eb12aea514a0466ea40a80fd8cc83637065948eb4a426e4aa46261175227" dependencies = [ - "rustix 0.38.34", + "rustix 1.1.4", ] [[package]] @@ -5760,12 +5775,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.2", + "hashbrown 0.17.0", "indexmap 2.14.0", "memchr", ] @@ -5957,7 +5972,7 @@ dependencies = [ "libc", "redox_syscall 0.5.2", "smallvec", - "windows-link 0.2.0", + "windows-link 0.2.1", ] [[package]] @@ -6056,13 +6071,23 @@ dependencies = [ "sha2 0.10.9", ] +[[package]] +name = "petgraph" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset 0.4.2", + "indexmap 2.14.0", +] + [[package]] name = "petgraph" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455" dependencies = [ - "fixedbitset", + "fixedbitset 0.5.7", "hashbrown 0.15.2", "indexmap 2.14.0", "serde", @@ -6166,8 +6191,8 @@ dependencies = [ "concurrent-queue", "hermit-abi 0.5.2", "pin-project-lite", - "rustix 1.0.7", - "windows-sys 0.61.1", + "rustix 1.1.4", + "windows-sys 0.61.2", ] [[package]] @@ -6187,9 +6212,9 @@ dependencies = [ [[package]] name = "postcard" -version = "1.1.1" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "170a2601f67cc9dba8edd8c4870b15f71a6a2dc196daec8c83f72b59dff628a8" +checksum = "6764c3b5dd454e283a30e6dfe78e9b31096d9e32036b5d1eaac7a6119ccb9a24" dependencies = [ "cobs", "embedded-io 0.4.0", @@ -6334,7 +6359,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "toml_edit 0.21.1", + "toml_edit", ] [[package]] @@ -6457,7 +6482,7 @@ dependencies = [ "itertools 0.14.0", "log", "multimap", - "petgraph", + "petgraph 0.8.3", "prettyplease", "prost", "prost-types", @@ -6557,21 +6582,21 @@ dependencies = [ [[package]] name = "pulley-interpreter" -version = "38.0.4" +version = "44.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beafc309a2d35e16cc390644d88d14dfa45e45e15075ec6a9e37f6dfb43e926f" +checksum = "b9326e3a0093d170582cf64ed9e4cf253b8aac155ec4a294ff62330450bbf094" dependencies = [ "cranelift-bitset", "log", "pulley-macros", - "wasmtime-internal-math", + "wasmtime-internal-core", ] [[package]] name = "pulley-macros" -version = "38.0.4" +version = "44.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885fbb6c07454cfc8725a18a1da3cfc328ee8c53fb8d0671ea313edc8567947" +checksum = "00c6433917e3789605b1f4cd2a589f637ff17212344e7fa5ba99544625ba52c7" dependencies = [ "proc-macro2", "quote", @@ -6884,13 +6909,13 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.13.5" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08effbc1fa53aaebff69521a5c05640523fab037b34a4a2c109506bc938246fa" +checksum = "de2c52737737f8609e94f975dee22854a2d5c125772d4b1cf292120f4d45c186" dependencies = [ "allocator-api2", "bumpalo", - "hashbrown 0.15.2", + "hashbrown 0.17.0", "log", "rustc-hash", "smallvec", @@ -7132,15 +7157,15 @@ dependencies = [ [[package]] name = "rustix" -version = "1.0.7" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" +checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ "bitflags 2.11.1", "errno", "libc", - "linux-raw-sys 0.9.4", - "windows-sys 0.59.0", + "linux-raw-sys 0.12.1", + "windows-sys 0.60.2", ] [[package]] @@ -7221,7 +7246,7 @@ dependencies = [ "security-framework 3.7.0", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.1", + "windows-sys 0.60.2", ] [[package]] @@ -7501,15 +7526,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_spanned" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" -dependencies = [ - "serde", -] - [[package]] name = "serde_spanned" version = "1.1.1" @@ -7821,9 +7837,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.2" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" dependencies = [ "arbitrary", "serde", @@ -8124,15 +8140,15 @@ checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a" [[package]] name = "tempfile" -version = "3.12.0" +version = "3.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ - "cfg-if 1.0.0", "fastrand", + "getrandom 0.4.2", "once_cell", - "rustix 0.38.34", - "windows-sys 0.59.0", + "rustix 1.1.4", + "windows-sys 0.60.2", ] [[package]] @@ -8335,7 +8351,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.61.1", + "windows-sys 0.61.2", ] [[package]] @@ -8485,28 +8501,18 @@ dependencies = [ "tokio", ] -[[package]] -name = "toml" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" -dependencies = [ - "serde", - "serde_spanned 0.6.6", - "toml_datetime 0.6.6", - "toml_edit 0.22.16", -] - [[package]] name = "toml" version = "0.9.12+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863" dependencies = [ + "indexmap 2.14.0", "serde_core", - "serde_spanned 1.1.1", + "serde_spanned", "toml_datetime 0.7.5+spec-1.1.0", "toml_parser", + "toml_writer", "winnow 0.7.13", ] @@ -8518,7 +8524,7 @@ checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee" dependencies = [ "indexmap 2.14.0", "serde_core", - "serde_spanned 1.1.1", + "serde_spanned", "toml_datetime 1.1.1+spec-1.1.0", "toml_parser", "toml_writer", @@ -8530,9 +8536,6 @@ name = "toml_datetime" version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" -dependencies = [ - "serde", -] [[package]] name = "toml_datetime" @@ -8563,19 +8566,6 @@ dependencies = [ "winnow 0.5.40", ] -[[package]] -name = "toml_edit" -version = "0.22.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" -dependencies = [ - "indexmap 2.14.0", - "serde", - "serde_spanned 0.6.6", - "toml_datetime 0.6.6", - "winnow 0.6.13", -] - [[package]] name = "toml_parser" version = "1.1.2+spec-1.1.0" @@ -9151,13 +9141,20 @@ dependencies = [ ] [[package]] -name = "wasm-encoder" -version = "0.239.0" +name = "wasm-compose" +version = "0.246.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be00faa2b4950c76fe618c409d2c3ea5a3c9422013e079482d78544bb2d184c" +checksum = "f05a2b3bad87cc1ce45b63425ec09a854cc4cb369231c9fed1fee31538103efb" dependencies = [ - "leb128fmt", - "wasmparser 0.239.0", + "anyhow", + "heck 0.5.0", + "indexmap 2.14.0", + "log", + "petgraph 0.6.5", + "smallvec", + "wasm-encoder 0.246.2", + "wasmparser 0.246.2", + "wat", ] [[package]] @@ -9170,6 +9167,26 @@ dependencies = [ "wasmparser 0.244.0", ] +[[package]] +name = "wasm-encoder" +version = "0.246.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61fb705ce81adde29d2a8e99d87995e39a6e927358c91398f374474746070ef7" +dependencies = [ + "leb128fmt", + "wasmparser 0.246.2", +] + +[[package]] +name = "wasm-encoder" +version = "0.249.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69830ccbbf41c55eb585991659fb70867ef628193af3a495f09a6956f7615e59" +dependencies = [ + "leb128fmt", + "wasmparser 0.249.0", +] + [[package]] name = "wasm-instrument" version = "0.4.0" @@ -9216,58 +9233,67 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.239.0" +version = "0.244.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9d90bb93e764f6beabf1d02028c70a2156a6583e63ac4218dd07ef733368b0" +checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" dependencies = [ "bitflags 2.11.1", "hashbrown 0.15.2", "indexmap 2.14.0", "semver 1.0.28", +] + +[[package]] +name = "wasmparser" +version = "0.246.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71cde4757396defafd25417cfb36aa3161027d06d865b0c24baaae229aac005d" +dependencies = [ + "bitflags 2.11.1", + "hashbrown 0.16.1", + "indexmap 2.14.0", + "semver 1.0.28", "serde", ] [[package]] name = "wasmparser" -version = "0.244.0" +version = "0.249.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" +checksum = "30538cae9a794215f490b532df01c557e2e2bfac92569482554acd0992a102ea" dependencies = [ "bitflags 2.11.1", - "hashbrown 0.15.2", "indexmap 2.14.0", "semver 1.0.28", ] [[package]] name = "wasmprinter" -version = "0.239.0" +version = "0.246.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3981f3d51f39f24f5fc90f93049a90f08dbbca8deba602cd46bb8ca67a94718" +checksum = "6e41f7493ba994b8a779430a4c25ff550fd5a40d291693af43a6ef48688f00e3" dependencies = [ "anyhow", "termcolor", - "wasmparser 0.239.0", + "wasmparser 0.246.2", ] [[package]] name = "wasmtime" -version = "38.0.4" +version = "44.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81eafc07c867be94c47e0dc66355d9785e09107a18901f76a20701ba0663ad7" +checksum = "372db8bbad8ec962038101f75ab2c3ffcd18797d7d3ae877a58ab9873cd0c4bd" dependencies = [ "addr2line", - "anyhow", "async-trait", "bitflags 2.11.1", "bumpalo", "cc", "cfg-if 1.0.0", "encoding_rs", + "futures 0.3.31", "fxprof-processed-profile", "gimli", - "hashbrown 0.15.2", - "indexmap 2.14.0", "ittapi", "libc", "log", @@ -9278,43 +9304,46 @@ dependencies = [ "postcard", "pulley-interpreter", "rayon", - "rustix 1.0.7", + "rustix 1.1.4", "semver 1.0.28", "serde", "serde_derive", "serde_json", "smallvec", "target-lexicon", - "wasm-encoder 0.239.0", - "wasmparser 0.239.0", + "tempfile", + "wasm-compose", + "wasm-encoder 0.246.2", + "wasmparser 0.246.2", "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", ] [[package]] name = "wasmtime-environ" -version = "38.0.4" +version = "44.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78587abe085a44a13c90fa16fea6db014e9883e627a7044d7f0cb397ad08d1da" +checksum = "1e15aa0d1545e48d9b25ca604e9e27b4cd6d5886d30ac5787b57b3a2daf85b57" dependencies = [ "anyhow", "cpp_demangle", + "cranelift-bforest", "cranelift-bitset", "cranelift-entity", "gimli", + "hashbrown 0.16.1", "indexmap 2.14.0", "log", "object", @@ -9323,39 +9352,41 @@ dependencies = [ "semver 1.0.28", "serde", "serde_derive", + "sha2 0.10.9", "smallvec", "target-lexicon", - "wasm-encoder 0.239.0", - "wasmparser 0.239.0", + "wasm-encoder 0.246.2", + "wasmparser 0.246.2", "wasmprinter", "wasmtime-internal-component-util", + "wasmtime-internal-core", ] [[package]] name = "wasmtime-internal-cache" -version = "38.0.4" +version = "44.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78fb9299e318b0af3efb75d88321515a20a5ccb040bcde1f0f7d46d656fa8fef" +checksum = "5441170843ac2ab28a1d7646b04a93a46d63bd4083274fd246c6a80189b37767" dependencies = [ - "anyhow", "base64 0.22.1", "directories-next", "log", "postcard", - "rustix 1.0.7", + "rustix 1.1.4", "serde", "serde_derive", "sha2 0.10.9", - "toml 0.8.15", - "windows-sys 0.60.2", + "toml 0.9.12+spec-1.1.0", + "wasmtime-environ", + "windows-sys 0.61.2", "zstd", ] [[package]] name = "wasmtime-internal-component-macro" -version = "38.0.4" +version = "44.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d843bb444f2d1509ea9304ad749242d1fa5de95cde67665bfcdcafa0f360925c" +checksum = "c136cb0d2d47850d6d04a58157130ac98b0df4c17626cd30b083d26b607b7027" dependencies = [ "anyhow", "proc-macro2", @@ -9363,22 +9394,33 @@ dependencies = [ "syn 2.0.117", "wasmtime-internal-component-util", "wasmtime-internal-wit-bindgen", - "wit-parser 0.239.0", + "wit-parser 0.246.2", ] [[package]] name = "wasmtime-internal-component-util" -version = "38.0.4" +version = "44.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "801ee1a80ab66f065a88c6a62f2d495d5540d027b366757c6a53e9c42f153aef" +checksum = "49df3d3b4fa2119c6fd161e475b4e21aaefb51d082353b922b433bea37facc65" [[package]] -name = "wasmtime-internal-cranelift" -version = "38.0.4" +name = "wasmtime-internal-core" +version = "44.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb50f1c50365c32e557266ca85acdf77696c44a3f98797ba6af58cebc6d6d1e" +checksum = "8f2c7fa6523647262bfb4095dbdf4087accefe525813e783f81a0c682f418ce4" dependencies = [ "anyhow", + "hashbrown 0.16.1", + "libm", + "serde", +] + +[[package]] +name = "wasmtime-internal-cranelift" +version = "44.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98c032f422e39061dfc43f32190c0a3526b04161ec4867f362958f3fe9d1fe29" +dependencies = [ "cfg-if 1.0.0", "cranelift-codegen", "cranelift-control", @@ -9393,85 +9435,70 @@ dependencies = [ "smallvec", "target-lexicon", "thiserror 2.0.18", - "wasmparser 0.239.0", + "wasmparser 0.246.2", "wasmtime-environ", - "wasmtime-internal-math", + "wasmtime-internal-core", "wasmtime-internal-unwinder", "wasmtime-internal-versioned-export-macros", ] [[package]] name = "wasmtime-internal-fiber" -version = "38.0.4" +version = "44.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9308cdb17f8d51e3164185616d809e28c29a6515c03b9dd95c89436b71f6d154" +checksum = "d8dd76d80adf450cc260ba58f23c28030401930b19149695b1d121f7d621e791" dependencies = [ - "anyhow", "cc", "cfg-if 1.0.0", "libc", - "rustix 1.0.7", + "rustix 1.1.4", + "wasmtime-environ", "wasmtime-internal-versioned-export-macros", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] name = "wasmtime-internal-jit-debug" -version = "38.0.4" +version = "44.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c9b63a22bf2a8b6a149a41c6768bc17a8b2e3288a249cb8216987fbd7128e81" +checksum = "ab453cc600b28ee5d3f9495aa6d4cb2c81eda40903e9287296b548fba8b2391d" dependencies = [ "cc", "object", - "rustix 1.0.7", + "rustix 1.1.4", "wasmtime-internal-versioned-export-macros", ] [[package]] name = "wasmtime-internal-jit-icache-coherence" -version = "38.0.4" +version = "44.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb8e042b6e3de2f3d708279f89f50b4b9aa1b9bab177300cdffb0ffcd2816df5" +checksum = "6a1859e920871515d324fb9757c3e448d6ed1512ca6ccdff14b6e016505d6ada" dependencies = [ - "anyhow", "cfg-if 1.0.0", "libc", - "windows-sys 0.60.2", + "wasmtime-internal-core", + "windows-sys 0.61.2", ] -[[package]] -name = "wasmtime-internal-math" -version = "38.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c1f0674f38cd7d014eb1a49ea1d1766cca1a64459e8856ee118a10005302e16" -dependencies = [ - "libm", -] - -[[package]] -name = "wasmtime-internal-slab" -version = "38.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb24b7535306713e7a250f8b71e35f05b6a5031bf9c3ed7330c308e899cbe7d3" - [[package]] name = "wasmtime-internal-unwinder" -version = "38.0.4" +version = "44.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21d5a80e2623a49cb8e8c419542337b8fe0260b162c40dcc201080a84cbe9b7c" +checksum = "f1dfe405bd6adb1386d935a30f16a236bd4ef0d3c383e7cbbab98d063c9d9b73" dependencies = [ - "anyhow", "cfg-if 1.0.0", "cranelift-codegen", "log", "object", + "wasmtime-environ", ] [[package]] name = "wasmtime-internal-versioned-export-macros" -version = "38.0.4" +version = "44.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e277f734b9256359b21517c3b0c26a2a9de6c53a51b670ae55cdcde548bf4e" +checksum = "2a9b9165fc45d42c81edfe3e9cb458e58720594ad5db6553c4079ea041a4a581" dependencies = [ "proc-macro2", "quote", @@ -9480,17 +9507,16 @@ dependencies = [ [[package]] name = "wasmtime-internal-winch" -version = "38.0.4" +version = "44.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4dc9333737142f6ece4369c8bcdda03a11edbd43d8fbd3e15004c194b9b743" +checksum = "95f439b70ba3855a8c808d2cd798eef79bcd389f78aa48a8a694ea8e2904410c" dependencies = [ - "anyhow", "cranelift-codegen", "gimli", "log", "object", "target-lexicon", - "wasmparser 0.239.0", + "wasmparser 0.246.2", "wasmtime-environ", "wasmtime-internal-cranelift", "winch-codegen", @@ -9498,15 +9524,15 @@ dependencies = [ [[package]] name = "wasmtime-internal-wit-bindgen" -version = "38.0.4" +version = "44.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f758625553fe33fdce0713f63bb7784c4f5fecb7f7cd4813414519ec24b6a4c" +checksum = "17c7ced16dc16d2027f9f8d3a503e191dcce0f53fe9218e7990135b31f8f6fdb" dependencies = [ "anyhow", "bitflags 2.11.1", "heck 0.5.0", "indexmap 2.14.0", - "wit-parser 0.239.0", + "wit-parser 0.246.2", ] [[package]] @@ -9525,22 +9551,22 @@ dependencies = [ [[package]] name = "wast" -version = "244.0.0" +version = "249.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e7b9f9e23311275920e3d6b56d64137c160cf8af4f84a7283b36cfecbf4acb" +checksum = "2474a321bf9ae2808e9fa23ac4ec2b27300e70985e30bcb5a38d43b76bfc901a" dependencies = [ "bumpalo", "leb128fmt", "memchr", "unicode-width", - "wasm-encoder 0.244.0", + "wasm-encoder 0.249.0", ] [[package]] name = "wat" -version = "1.244.0" +version = "1.249.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf35b87ed352f9ab6cd0732abde5a67dd6153dfd02c493e61459218b19456fa" +checksum = "28af699d0a9c7e4e250b7b8e36167ae5215fbb4b7ae526bb4ce7b234ba0afc90" dependencies = [ "wast", ] @@ -9654,11 +9680,10 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "38.0.4" +version = "44.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c0bb17ae9bf89ebc74512150e6ee0a27b1eac5ff3b54d8cec264f4b4255022d" +checksum = "6da7c536f3cfe5ff63537f795902fed56b8b5adcc7a87843a86dd8d4e57a7946" dependencies = [ - "anyhow", "cranelift-assembler-x64", "cranelift-codegen", "gimli", @@ -9666,10 +9691,10 @@ dependencies = [ "smallvec", "target-lexicon", "thiserror 2.0.18", - "wasmparser 0.239.0", + "wasmparser 0.246.2", "wasmtime-environ", + "wasmtime-internal-core", "wasmtime-internal-cranelift", - "wasmtime-internal-math", ] [[package]] @@ -9689,9 +9714,9 @@ checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" [[package]] name = "windows-link" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "windows-registry" @@ -9769,11 +9794,11 @@ dependencies = [ [[package]] name = "windows-sys" -version = "0.61.1" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f109e41dd4a3c848907eb83d5a42ea98b3769495597450cf6d153507b166f0f" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-link 0.2.0", + "windows-link 0.2.1", ] [[package]] @@ -10028,15 +10053,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "winnow" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" -dependencies = [ - "memchr", -] - [[package]] name = "winnow" version = "0.7.13" @@ -10156,9 +10172,9 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.239.0" +version = "0.244.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55c92c939d667b7bf0c6bf2d1f67196529758f99a2a45a3355cc56964fd5315d" +checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" dependencies = [ "anyhow", "id-arena", @@ -10169,16 +10185,17 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.239.0", + "wasmparser 0.244.0", ] [[package]] name = "wit-parser" -version = "0.244.0" +version = "0.246.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" +checksum = "fd979042b5ff288607ccf3b314145435453f20fc67173195f91062d2289b204d" dependencies = [ "anyhow", + "hashbrown 0.16.1", "id-arena", "indexmap 2.14.0", "log", @@ -10187,7 +10204,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.244.0", + "wasmparser 0.246.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 01cd9c9edef..6391822d4c7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -114,7 +114,7 @@ tonic-prost-build = "0.14" tower-http = { version = "0.6.11", features = ["cors"] } tower = { version = "0.5.1", features = ["full"] } wasmparser = "0.118.1" -wasmtime = { version = "38.0.4", features = ["async"] } +wasmtime = { version = "44.0.1", features = ["async"] } rand = { version = "0.9.2", features = ["os_rng"] } prometheus = "0.14.0" url = "2.5.8" diff --git a/runtime/test/src/test.rs b/runtime/test/src/test.rs index 28f42ad53c5..14af4d0f8e3 100644 --- a/runtime/test/src/test.rs +++ b/runtime/test/src/test.rs @@ -195,7 +195,9 @@ impl WasmInstanceExt for WasmInstance { .typed(self.store.as_context()) .unwrap() .clone(); - func.call_async(&mut self.store.as_context_mut(), ()).await + func.call_async(&mut self.store.as_context_mut(), ()) + .await + .map_err(anyhow::Error::from) } async fn invoke_export0(&mut self, f: &str) -> AscPtr { @@ -309,6 +311,7 @@ impl WasmInstanceExt for WasmInstance { (arg0.wasm_ptr(), arg1.wasm_ptr()), ) .await + .map_err(anyhow::Error::from) } async fn invoke_export0_val(&mut self, func: &str) -> V { diff --git a/runtime/wasm/src/mapping.rs b/runtime/wasm/src/mapping.rs index c0d4bce52d7..c185148bff0 100644 --- a/runtime/wasm/src/mapping.rs +++ b/runtime/wasm/src/mapping.rs @@ -322,7 +322,6 @@ impl ValidModule { graph::env::WasmOptLevel::SpeedAndSize => wasmtime::OptLevel::SpeedAndSize, }); config.max_wasm_stack(ENV_VARS.mappings.max_stack_size); - config.async_support(true); let engine = &wasmtime::Engine::new(&config)?; let module = wasmtime::Module::from_binary(engine, &raw_module)?; diff --git a/runtime/wasm/src/module/instance.rs b/runtime/wasm/src/module/instance.rs index 68472b0eae9..3a5f016502d 100644 --- a/runtime/wasm/src/module/instance.rs +++ b/runtime/wasm/src/module/instance.rs @@ -93,12 +93,14 @@ impl WasmInstance { self.instance .get_func(self.store.as_context_mut(), handler_name) .with_context(|| format!("function {} not found", handler_name))? - .typed::<(u32, u32), ()>(self.store.as_context_mut())? + .typed::<(u32, u32), ()>(self.store.as_context_mut()) + .map_err(anyhow::Error::from)? .call_async( self.store.as_context_mut(), (value?.wasm_ptr(), user_data?.wasm_ptr()), ) .await + .map_err(anyhow::Error::from) .with_context(|| format!("Failed to handle callback '{}'", handler_name))?; let mut wasm_ctx = self.store.into_data(); @@ -159,6 +161,7 @@ impl WasmInstance { let func = func .typed(self.store.as_context_mut()) + .map_err(anyhow::Error::from) .context("wasm function has incorrect signature")?; // Caution: Make sure all exit paths from this function call `exit_handler`. @@ -168,6 +171,7 @@ impl WasmInstance { let deterministic_error: Option = match func .call_async(self.store.as_context_mut(), arg.wasm_ptr()) .await + .map_err(anyhow::Error::from) { Ok(()) => { assert!(!self.instance_ctx().as_ref().possible_reorg); @@ -281,10 +285,10 @@ fn link_chain_host_fn( .iter() .find(|hf| hf.name == name) .ok_or_else(|| { - anyhow::anyhow!( + wasmtime::Error::msg(format!( "chain host function '{}' is not available for this chain", name - ) + )) })? .cheap_clone(); @@ -302,17 +306,20 @@ fn link_chain_host_fn( metrics: host_metrics.cheap_clone(), heap: &mut WasmInstanceContext::new(&mut caller), }; - let ret = (host_fn.func)(ctx, call_ptr).await.map_err(|e| match e { - HostExportError::Deterministic(e) => { - caller.data_mut().deterministic_host_trap = true; - e - } - HostExportError::PossibleReorg(e) => { - caller.data_mut().possible_reorg = true; - e - } - HostExportError::Unknown(e) => e, - })?; + let ret = (host_fn.func)(ctx, call_ptr) + .await + .map_err(|e| match e { + HostExportError::Deterministic(e) => { + caller.data_mut().deterministic_host_trap = true; + e + } + HostExportError::PossibleReorg(e) => { + caller.data_mut().possible_reorg = true; + e + } + HostExportError::Unknown(e) => e, + }) + .map_err(wasmtime::Error::from_anyhow)?; host_metrics.observe_host_fn_execution_time( start.elapsed().as_secs_f64(), &name_for_metrics, @@ -576,7 +583,9 @@ pub(crate) fn build_linker( linker.func_wrap( "gas", "gas", - |mut caller: wasmtime::Caller<'_, WasmInstanceData>, gas_used: u64| -> anyhow::Result<()> { + |mut caller: wasmtime::Caller<'_, WasmInstanceData>, + gas_used: u64| + -> wasmtime::Result<()> { // Gas metering has a relevant execution cost cost, being called tens of thousands // of times per handler, but it's not worth having a stopwatch section here because // the cost of measuring would be greater than the cost of `consume_host_fn`. Last @@ -587,7 +596,7 @@ pub(crate) fn build_linker( .consume_host_fn_with_metrics(Gas::new(gas_used), "gas") { caller.data_mut().deterministic_host_trap = true; - return Err(e.into()); + return Err(wasmtime::Error::from_anyhow(e.into())); } Ok(()) diff --git a/runtime/wasm/src/module/into_wasm_ret.rs b/runtime/wasm/src/module/into_wasm_ret.rs index 8bb9e544981..07d5abf4312 100644 --- a/runtime/wasm/src/module/into_wasm_ret.rs +++ b/runtime/wasm/src/module/into_wasm_ret.rs @@ -71,8 +71,9 @@ where T: IntoWasmRet, T::Ret: wasmtime::WasmTy, { - type Ret = Result; + type Ret = Result; fn into_wasm_ret(self) -> Self::Ret { self.map(|x| x.into_wasm_ret()) + .map_err(wasmtime::Error::from_anyhow) } } diff --git a/runtime/wasm/src/module/mod.rs b/runtime/wasm/src/module/mod.rs index 5c84155836f..fc9b5e0ca09 100644 --- a/runtime/wasm/src/module/mod.rs +++ b/runtime/wasm/src/module/mod.rs @@ -381,7 +381,7 @@ impl AscHeap for WasmInstanceContext<'_> { .await .map_err(|trap| { host_export_error_from_trap( - trap, + trap.into(), format!("Failed to call 'asc_type_id' with '{:?}'", type_id_index), ) })?; diff --git a/server/http/src/service.rs b/server/http/src/service.rs index 2a17abf29ca..66a799caed3 100644 --- a/server/http/src/service.rs +++ b/server/http/src/service.rs @@ -492,9 +492,10 @@ mod tests { } async fn run_query(self: Arc, _query: Query, _target: QueryTarget) -> QueryResults { - QueryResults::from(Object::from_iter( - vec![(Word::from("name"), r::Value::String(String::from("Jordi")))].into_iter(), - )) + QueryResults::from(Object::from_iter(vec![( + Word::from("name"), + r::Value::String(String::from("Jordi")), + )])) } fn metrics(&self) -> Arc { diff --git a/server/http/tests/server.rs b/server/http/tests/server.rs index 74e7cd13c0e..a7d43360cf5 100644 --- a/server/http/tests/server.rs +++ b/server/http/tests/server.rs @@ -56,13 +56,15 @@ impl GraphQlRunner for TestGraphQlRunner { .unwrap() == &r::Value::String(String::from("John")) { - Object::from_iter( - vec![(Word::from("name"), r::Value::String(String::from("John")))].into_iter(), - ) + Object::from_iter(vec![( + Word::from("name"), + r::Value::String(String::from("John")), + )]) } else { - Object::from_iter( - vec![(Word::from("name"), r::Value::String(String::from("Jordi")))].into_iter(), - ) + Object::from_iter(vec![( + Word::from("name"), + r::Value::String(String::from("Jordi")), + )]) } .into() }