From 5cf977818e1392c8496cb906fa1318b8b3f994bd Mon Sep 17 00:00:00 2001 From: Trevor Elliott Date: Tue, 7 May 2024 09:30:33 -0700 Subject: [PATCH 1/6] Update to wasmtime-20 --- Cargo.lock | 737 +++++++++++++++++++++------------ Cargo.toml | 8 +- cli/tests/trap-test/Cargo.lock | 575 +++++++++++-------------- 3 files changed, 727 insertions(+), 593 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2a6ce035..11794fd9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -124,17 +124,6 @@ dependencies = [ "syn", ] -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.2.0" @@ -152,7 +141,7 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object", + "object 0.32.2", "rustc-demangle", ] @@ -218,24 +207,24 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "cap-fs-ext" -version = "2.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88e341d15ac1029aadce600be764a1a1edafe40e03cde23285bc1d261b3a4866" +checksum = "769f8cd02eb04d57f14e2e371ebb533f96817f9b2525d73a5c72b61ca7973747" dependencies = [ - "cap-primitives", - "cap-std", + "cap-primitives 3.0.0", + "cap-std 3.0.0", "io-lifetimes", "windows-sys 0.52.0", ] [[package]] name = "cap-net-ext" -version = "2.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "434168fe6533055f0f4204039abe3ff6d7db338ef46872a5fa39e9d5ad5ab7a9" +checksum = "59ff6d3fb274292a9af283417e383afe6ded1fe66f6472d2c781216d3d80c218" dependencies = [ - "cap-primitives", - "cap-std", + "cap-primitives 3.0.0", + "cap-std 3.0.0", "rustix", "smallvec", ] @@ -257,6 +246,23 @@ dependencies = [ "winx", ] +[[package]] +name = "cap-primitives" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90a0b44fc796b1a84535a63753d50ba3972c4db55c7255c186f79140e63d56d0" +dependencies = [ + "ambient-authority", + "fs-set-times", + "io-extras", + "io-lifetimes", + "ipnet", + "maybe-owned", + "rustix", + "windows-sys 0.52.0", + "winx", +] + [[package]] name = "cap-rand" version = "2.0.1" @@ -267,13 +273,35 @@ dependencies = [ "rand", ] +[[package]] +name = "cap-rand" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4327f08daac33a99bb03c54ae18c8f32c3ba31c728a33ddf683c6c6a5043de68" +dependencies = [ + "ambient-authority", + "rand", +] + [[package]] name = "cap-std" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "593db20e4c51f62d3284bae7ee718849c3214f93a3b94ea1899ad85ba119d330" dependencies = [ - "cap-primitives", + "cap-primitives 2.0.1", + "io-extras", + "io-lifetimes", + "rustix", +] + +[[package]] +name = "cap-std" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266626ce180cf9709f317d0bf9754e3a5006359d87f4bf792f06c9c5f1b63c0f" +dependencies = [ + "cap-primitives 3.0.0", "io-extras", "io-lifetimes", "rustix", @@ -281,12 +309,12 @@ dependencies = [ [[package]] name = "cap-time-ext" -version = "2.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03261630f291f425430a36f38c847828265bc928f517cdd2004c56f4b02f002b" +checksum = "e1353421ba83c19da60726e35db0a89abef984b3be183ff6f58c5b8084fcd0c5" dependencies = [ "ambient-authority", - "cap-primitives", + "cap-primitives 3.0.0", "iana-time-zone", "once_cell", "rustix", @@ -380,6 +408,15 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "cpp_demangle" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119" +dependencies = [ + "cfg-if", +] + [[package]] name = "cpufeatures" version = "0.2.12" @@ -391,25 +428,25 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.100.1" +version = "0.107.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "751cbf89e513f283c0641eb7f95dc72fda5051dd95ca203d1dc45e26bc89dba8" +checksum = "3c7a700bc3e2e834c81c7e9e57c6b27049172fc6156a6a406dd2265d64c30409" dependencies = [ - "cranelift-entity 0.100.1", + "cranelift-entity 0.107.1", ] [[package]] name = "cranelift-codegen" -version = "0.100.1" +version = "0.107.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "210730edc05121e915201cc36595e1f00062094669fa07ac362340e3627b3dc5" +checksum = "35bb55da792dc46a35e6e283b02b9d6aa7f21349691f41176d8ecf4a1494b6ad" dependencies = [ "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-control", - "cranelift-entity 0.100.1", + "cranelift-entity 0.107.1", "cranelift-isle", "gimli", "hashbrown 0.14.3", @@ -421,24 +458,24 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.100.1" +version = "0.107.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5dc7fdf210c53db047f3eaf49b3a89efee0cc3d9a2ce0c0f0236933273d0c53" +checksum = "bf590672e1a7580158968898ade9c82801d6ebeaa4649d6f99f9cbb411512a8b" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.100.1" +version = "0.107.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46875cc87d963119d78fe5c19852757dc6eea3cb9622c0df69c26b242cd44b4" +checksum = "3ab16a95d8b10b72eaa8bb9f0ce0fdd013e5f225bea92f69d2dbd2424aae5381" [[package]] name = "cranelift-control" -version = "0.100.1" +version = "0.107.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375dca8f58d8a801a85e11730c1529c5c4a9c3593dfb12118391ac437b037155" +checksum = "60448a5af01f5716877e616ec1613424fb65f427320c6e6447315966507f12da" dependencies = [ "arbitrary", ] @@ -459,11 +496,21 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "cranelift-entity" +version = "0.107.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78689d6588f53981bf005b82d94125cc40cf9856b667bc276d1acdede400b633" +dependencies = [ + "serde", + "serde_derive", +] + [[package]] name = "cranelift-frontend" -version = "0.100.1" +version = "0.107.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb607fd19ae264da18f9f2532e7302b826f7fbf77bf88365fc075f2e3419436" +checksum = "c86da6e45adc39e8d66a73d6fb782b0d7961df9e44b724246e01e515f86b1f0d" dependencies = [ "cranelift-codegen", "log", @@ -473,15 +520,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.100.1" +version = "0.107.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fe806a6470dddfdf79e878af6a96afb1235a09fe3e21f9e0c2f18d402820432" +checksum = "dcb6f70d94826074699bc350c33dab82eb6f06022a3518bb466f501569d7379e" [[package]] name = "cranelift-native" -version = "0.100.1" +version = "0.107.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fac7f1722660b10af1f7229c0048f716bfd8bd344549b0e06e3eb6417ec3fe5b" +checksum = "e27ec0ef4115eb9cc15be9c841085db17233403f8ed325e02bd6a9d78d6c939c" dependencies = [ "cranelift-codegen", "libc", @@ -490,18 +537,18 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.100.1" +version = "0.107.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1b65810be56b619c3c55debade92798d999f34bf0670370c578afab5d905f06" +checksum = "fce009efc27c598ac0c019c7f3dc582403835547128aeb497edf76cb77d75250" dependencies = [ "cranelift-codegen", - "cranelift-entity 0.100.1", + "cranelift-entity 0.107.1", "cranelift-frontend", - "itertools", + "itertools 0.12.1", "log", "smallvec", - "wasmparser 0.112.0", - "wasmtime-types", + "wasmparser 0.202.0", + "wasmtime-types 20.0.1", ] [[package]] @@ -638,12 +685,12 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.7.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ - "atty", "humantime", + "is-terminal", "log", "regex", "termcolor", @@ -926,15 +973,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.3.9" @@ -977,12 +1015,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" -version = "1.3.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" @@ -1086,7 +1121,7 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi", "libc", "windows-sys 0.52.0", ] @@ -1100,6 +1135,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -1108,9 +1152,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "ittapi" -version = "0.3.5" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a5c0b993601cad796222ea076565c5d9f337d35592f8622c753724f06d7271" +checksum = "6b996fe614c41395cdaedf3cf408a9534851090959d90d54a535f675550b64b1" dependencies = [ "anyhow", "ittapi-sys", @@ -1119,9 +1163,9 @@ dependencies = [ [[package]] name = "ittapi-sys" -version = "0.3.5" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7b5e473765060536a660eed127f758cf1a810c73e49063264959c60d1727d9" +checksum = "52f5385394064fa2c886205dba02598013ce83d3e92d33dbdc0c52fe0e7bf4fc" dependencies = [ "cc", ] @@ -1164,12 +1208,12 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "winapi", + "windows-targets 0.52.4", ] [[package]] @@ -1213,6 +1257,15 @@ dependencies = [ "libc", ] +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +dependencies = [ + "libc", +] + [[package]] name = "matchers" version = "0.1.0" @@ -1288,7 +1341,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi", "libc", ] @@ -1304,6 +1357,18 @@ dependencies = [ "memchr", ] +[[package]] +name = "object" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8dd6c0cdf9429bce006e1362bfce61fa1bfd8c898a643ed8d2b471934701d3d" +dependencies = [ + "crc32fast", + "hashbrown 0.14.3", + "indexmap", + "memchr", +] + [[package]] name = "once_cell" version = "1.19.0" @@ -1318,9 +1383,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openvino" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc731d9a7805dd533b69de3ee33062d5ea1dfa9fca1c19f8fd165b62e2cdde7" +checksum = "24bd3a7ef39968e6a4f1b1206c1c876f9bd50cf739ccbcd69f8539bbac5dcc7a" dependencies = [ "openvino-finder", "openvino-sys", @@ -1329,9 +1394,9 @@ dependencies = [ [[package]] name = "openvino-finder" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bbd80eea06c2b9ec3dce85900ff3ae596c01105b759b38a005af69bbeb4d07" +checksum = "05d234d1394a413ea8adaf0c40806b9ad1946be6310b441f688840654a331973" dependencies = [ "cfg-if", "log", @@ -1339,14 +1404,14 @@ dependencies = [ [[package]] name = "openvino-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "318ed662bdf05a3f86486408159e806d53363171621a8000b81366fab5158713" +checksum = "44c98acf37fc84ad9d7da4dc6c18f0f60ad209b43a6f555be01f9003d0a2a43d" dependencies = [ + "env_logger", "libloading", "once_cell", "openvino-finder", - "pretty_env_logger", ] [[package]] @@ -1434,16 +1499,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "pretty_env_logger" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d" -dependencies = [ - "env_logger", - "log", -] - [[package]] name = "proc-macro2" version = "1.0.79" @@ -1462,23 +1517,6 @@ dependencies = [ "cc", ] -[[package]] -name = "pulldown-cmark" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" -dependencies = [ - "bitflags 2.5.0", - "memchr", - "unicase", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quote" version = "1.0.35" @@ -1815,6 +1853,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + [[package]] name = "serial_test" version = "2.0.0" @@ -1956,13 +2003,13 @@ dependencies = [ [[package]] name = "system-interface" -version = "0.26.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0682e006dd35771e392a6623ac180999a9a854b1d4a6c12fb2e804941c2b1f58" +checksum = "b858526d22750088a9b3cf2e3c2aacebd5377f13adeec02860c30d09113010a6" dependencies = [ "bitflags 2.5.0", "cap-fs-ext", - "cap-std", + "cap-std 3.0.0", "fd-lock", "io-lifetimes", "rustix", @@ -2119,6 +2166,40 @@ dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tower-service" version = "0.3.2" @@ -2209,15 +2290,6 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" -[[package]] -name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - [[package]] name = "unicode-bidi" version = "0.3.15" @@ -2301,7 +2373,7 @@ dependencies = [ "clap", "futures", "hyper", - "itertools", + "itertools 0.10.5", "libc", "rustls", "rustls-pemfile", @@ -2316,7 +2388,7 @@ dependencies = [ "url", "viceroy-lib", "wasi-common", - "wasmtime", + "wasmtime 20.0.1", "wat", ] @@ -2336,7 +2408,7 @@ dependencies = [ "http", "http-body", "hyper", - "itertools", + "itertools 0.10.5", "lazy_static", "regex", "rustls", @@ -2350,15 +2422,15 @@ dependencies = [ "thiserror", "tokio", "tokio-rustls", - "toml", + "toml 0.5.11", "tracing", "tracing-futures", "url", "wasi-common", - "wasmtime", + "wasmtime 20.0.1", "wasmtime-wasi", "wasmtime-wasi-nn", - "wiggle", + "wiggle 20.0.1", ] [[package]] @@ -2386,30 +2458,6 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -[[package]] -name = "wasi-cap-std-sync" -version = "13.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c4db6155e71cfae4ed732d87c2583faf4bbdcb77372697eb77d636f46108ba" -dependencies = [ - "anyhow", - "async-trait", - "cap-fs-ext", - "cap-rand", - "cap-std", - "cap-time-ext", - "fs-set-times", - "io-extras", - "io-lifetimes", - "is-terminal", - "once_cell", - "rustix", - "system-interface", - "tracing", - "wasi-common", - "windows-sys 0.48.0", -] - [[package]] name = "wasi-common" version = "13.0.1" @@ -2418,15 +2466,15 @@ checksum = "bf3f291b2a567f266ac488715f1742f62b2ca633524708c62ead9c0f71b7d72c" dependencies = [ "anyhow", "bitflags 2.5.0", - "cap-rand", - "cap-std", + "cap-rand 2.0.1", + "cap-std 2.0.1", "io-extras", "log", "rustix", "thiserror", "tracing", - "wasmtime", - "wiggle", + "wasmtime 13.0.1", + "wiggle 13.0.1", "windows-sys 0.48.0", ] @@ -2514,9 +2562,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.121.2" +version = "0.202.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" +checksum = "d6998515d3cf3f8b980ef7c11b29a9b1017d4cf86b99ae93b546992df9931413" dependencies = [ "bitflags 2.5.0", "indexmap", @@ -2525,12 +2573,12 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.2.80" +version = "0.202.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60e73986a6b7fdfedb7c5bf9e7eb71135486507c8fbc4c0c42cffcb6532988b7" +checksum = "ab1cc9508685eef9502e787f4d4123745f5651a1e29aec047645d3cac1e2da7a" dependencies = [ "anyhow", - "wasmparser 0.121.2", + "wasmparser 0.202.0", ] [[package]] @@ -2540,37 +2588,73 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b0263693caa1486bd4d26a5f18511948a706c9290689386b81b851ce088063ce" dependencies = [ "anyhow", - "async-trait", "bincode", "bumpalo", "cfg-if", - "encoding_rs", "fxprof-processed-profile", "indexmap", "libc", "log", - "object", + "object 0.32.2", "once_cell", "paste", "psm", - "rayon", "serde", "serde_derive", "serde_json", "target-lexicon", "wasm-encoder 0.32.0", "wasmparser 0.112.0", + "wasmtime-environ 13.0.1", + "wasmtime-jit", + "wasmtime-runtime 13.0.1", + "windows-sys 0.48.0", +] + +[[package]] +name = "wasmtime" +version = "20.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2364a810370f08ece49d013255058c3c88ca6c0a080de66549233b7d2ca078b8" +dependencies = [ + "addr2line", + "anyhow", + "async-trait", + "bincode", + "bumpalo", + "cfg-if", + "encoding_rs", + "fxprof-processed-profile", + "gimli", + "indexmap", + "ittapi", + "libc", + "log", + "object 0.33.0", + "once_cell", + "paste", + "rayon", + "rustix", + "semver 1.0.22", + "serde", + "serde_derive", + "serde_json", + "target-lexicon", + "wasm-encoder 0.202.0", + "wasmparser 0.202.0", "wasmtime-cache", "wasmtime-component-macro", "wasmtime-component-util", "wasmtime-cranelift", - "wasmtime-environ", + "wasmtime-environ 20.0.1", "wasmtime-fiber", - "wasmtime-jit", - "wasmtime-runtime", + "wasmtime-jit-debug 20.0.1", + "wasmtime-jit-icache-coherence 20.0.1", + "wasmtime-runtime 20.0.1", + "wasmtime-slab", "wasmtime-winch", "wat", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2582,11 +2666,20 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "wasmtime-asm-macros" +version = "20.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c52cceae147514e279460ac3c43c1ea440c51c39202842611623b3f9734f73a8" +dependencies = [ + "cfg-if", +] + [[package]] name = "wasmtime-cache" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b79f9f79188e5a26b6911b79d3171c06699d9a17ae07f6a265c51635b8d80c2" +checksum = "b34056847ca9bde1d97cbc829a95d634f54d2879faa17200e55f3cddac159aea" dependencies = [ "anyhow", "base64", @@ -2597,16 +2690,16 @@ dependencies = [ "serde", "serde_derive", "sha2", - "toml", - "windows-sys 0.48.0", + "toml 0.8.12", + "windows-sys 0.52.0", "zstd", ] [[package]] name = "wasmtime-component-macro" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed724d0f41c21bcf8754651a59d0423c530069ddca4cf3822768489ad313a812" +checksum = "c8fd43a734bf424e3983363f1b7532a997edb206f52104568058e412e18db9ba" dependencies = [ "anyhow", "proc-macro2", @@ -2619,86 +2712,93 @@ dependencies = [ [[package]] name = "wasmtime-component-util" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e7d69464b94bd312a27d93d0b482cd74bedf01f030199ef0740d6300ebca1d3" +checksum = "44d65e6a21c3e3482240ff03cc26f5c7ae7ee5df524c2283f39cf492ab711a15" [[package]] name = "wasmtime-cranelift" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e63f53c61ba05eb815f905c1738ad82c95333dd42ef5a8cc2aa3d7dfb2b08d7" +checksum = "e2a6ed70499769b4d51f6f656204b0806b3d783f6ec5a8517c68e8b75ecaad19" dependencies = [ "anyhow", "cfg-if", "cranelift-codegen", "cranelift-control", - "cranelift-entity 0.100.1", + "cranelift-entity 0.107.1", "cranelift-frontend", "cranelift-native", "cranelift-wasm", "gimli", "log", - "object", + "object 0.33.0", "target-lexicon", "thiserror", - "wasmparser 0.112.0", - "wasmtime-cranelift-shared", - "wasmtime-environ", - "wasmtime-versioned-export-macros", + "wasmparser 0.202.0", + "wasmtime-environ 20.0.1", + "wasmtime-versioned-export-macros 20.0.1", ] [[package]] -name = "wasmtime-cranelift-shared" +name = "wasmtime-environ" version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f6b197d68612f7dc3a17aa9f9587533715ecb8b4755609ce9baf7fb92b74ddc" +checksum = "18e2558c8b04fd27764d8601d46b8dc39555b79720a41e626bce210a80758932" dependencies = [ "anyhow", - "cranelift-codegen", - "cranelift-control", - "cranelift-native", + "cranelift-entity 0.100.1", "gimli", - "object", + "indexmap", + "log", + "object 0.32.2", + "serde", + "serde_derive", "target-lexicon", - "wasmtime-environ", + "thiserror", + "wasmparser 0.112.0", + "wasmtime-types 13.0.1", ] [[package]] name = "wasmtime-environ" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e2558c8b04fd27764d8601d46b8dc39555b79720a41e626bce210a80758932" +checksum = "90f7b5dbae8c3c6586e22f063ddb9e5cbf02c09629df75e5d8710f7bf880b117" dependencies = [ "anyhow", - "cranelift-entity 0.100.1", + "bincode", + "cpp_demangle 0.4.3", + "cranelift-entity 0.107.1", "gimli", "indexmap", "log", - "object", + "object 0.33.0", + "rustc-demangle", "serde", "serde_derive", "target-lexicon", "thiserror", - "wasm-encoder 0.32.0", - "wasmparser 0.112.0", + "wasm-encoder 0.202.0", + "wasmparser 0.202.0", "wasmprinter", "wasmtime-component-util", - "wasmtime-types", + "wasmtime-types 20.0.1", ] [[package]] name = "wasmtime-fiber" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a615a2cf64a49c0dc659c7d850c6cd377b975e0abfdcf0888b282d274a82e730" +checksum = "582e7ef625be814c57b1f8c3924c8899560d315f2285436c9184a09985dc3756" dependencies = [ + "anyhow", "cc", "cfg-if", "rustix", - "wasmtime-asm-macros", - "wasmtime-versioned-export-macros", - "windows-sys 0.48.0", + "wasmtime-asm-macros 20.0.1", + "wasmtime-versioned-export-macros 20.0.1", + "windows-sys 0.52.0", ] [[package]] @@ -2711,20 +2811,18 @@ dependencies = [ "anyhow", "bincode", "cfg-if", - "cpp_demangle", + "cpp_demangle 0.3.5", "gimli", - "ittapi", "log", - "object", + "object 0.32.2", "rustc-demangle", "rustix", "serde", "serde_derive", "target-lexicon", - "wasmtime-environ", - "wasmtime-jit-debug", - "wasmtime-jit-icache-coherence", - "wasmtime-runtime", + "wasmtime-environ 13.0.1", + "wasmtime-jit-icache-coherence 13.0.1", + "wasmtime-runtime 13.0.1", "windows-sys 0.48.0", ] @@ -2734,10 +2832,20 @@ version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c054e27c6ce2a6191edabe89e646da013044dd5369e1d203c89f977f9bd32937" dependencies = [ - "object", + "once_cell", + "wasmtime-versioned-export-macros 13.0.1", +] + +[[package]] +name = "wasmtime-jit-debug" +version = "20.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bf1b989e3f648340253b76c6c58b2ade89bdf0e23edc4e911deb801fa915b18" +dependencies = [ + "object 0.33.0", "once_cell", "rustix", - "wasmtime-versioned-export-macros", + "wasmtime-versioned-export-macros 20.0.1", ] [[package]] @@ -2751,6 +2859,17 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "20.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b55b43e693c0beeca494d522f4850afca53cb46acf309483aef32a125276ee78" +dependencies = [ + "cfg-if", + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "wasmtime-runtime" version = "13.0.1" @@ -2760,7 +2879,6 @@ dependencies = [ "anyhow", "cc", "cfg-if", - "encoding_rs", "indexmap", "libc", "log", @@ -2772,15 +2890,50 @@ dependencies = [ "rustix", "sptr", "wasm-encoder 0.32.0", - "wasmtime-asm-macros", - "wasmtime-environ", - "wasmtime-fiber", - "wasmtime-jit-debug", - "wasmtime-versioned-export-macros", + "wasmtime-asm-macros 13.0.1", + "wasmtime-environ 13.0.1", + "wasmtime-jit-debug 13.0.1", + "wasmtime-versioned-export-macros 13.0.1", "wasmtime-wmemcheck", "windows-sys 0.48.0", ] +[[package]] +name = "wasmtime-runtime" +version = "20.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2b876c09b7863d8a01bf87eb45f3b121fab245f8afbff7c38c38c1c9059aee" +dependencies = [ + "anyhow", + "cc", + "cfg-if", + "encoding_rs", + "indexmap", + "libc", + "log", + "mach2", + "memfd", + "memoffset", + "paste", + "psm", + "rustix", + "sptr", + "wasm-encoder 0.202.0", + "wasmtime-asm-macros 20.0.1", + "wasmtime-environ 20.0.1", + "wasmtime-fiber", + "wasmtime-jit-debug 20.0.1", + "wasmtime-slab", + "wasmtime-versioned-export-macros 20.0.1", + "windows-sys 0.52.0", +] + +[[package]] +name = "wasmtime-slab" +version = "20.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05c8ddfb8ebbab6ac186bc1f8c02ed988bc9ea455fea10f72bc3a07503309b4b" + [[package]] name = "wasmtime-types" version = "13.0.1" @@ -2794,6 +2947,19 @@ dependencies = [ "wasmparser 0.112.0", ] +[[package]] +name = "wasmtime-types" +version = "20.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fa3a1f3c0deb3034d76e7dcf340c5df670a6603019ee5b58adb70870649c769" +dependencies = [ + "cranelift-entity 0.107.1", + "serde", + "serde_derive", + "thiserror", + "wasmparser 0.202.0", +] + [[package]] name = "wasmtime-versioned-export-macros" version = "13.0.1" @@ -2805,11 +2971,22 @@ dependencies = [ "syn", ] +[[package]] +name = "wasmtime-versioned-export-macros" +version = "20.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b85321f0a1cd3c859b94e728533ba00074d3eca62362acf6998be0eab6f4001c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "wasmtime-wasi" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c9e79f73320d96cd7644b021502dffee09dd92300b073f3541ae44e9ae377c" +checksum = "0c5966b1aa330f07ef58f83b074908ea210ee864948ae3697f8892c91104e6e3" dependencies = [ "anyhow", "async-trait", @@ -2817,65 +2994,62 @@ dependencies = [ "bytes", "cap-fs-ext", "cap-net-ext", - "cap-rand", - "cap-std", + "cap-rand 3.0.0", + "cap-std 3.0.0", "cap-time-ext", "fs-set-times", "futures", "io-extras", "io-lifetimes", - "is-terminal", - "libc", "once_cell", "rustix", "system-interface", "thiserror", "tokio", "tracing", - "wasi-cap-std-sync", - "wasi-common", - "wasmtime", - "wiggle", - "windows-sys 0.48.0", + "url", + "wasmtime 20.0.1", + "wiggle 20.0.1", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-wasi-nn" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3277a01fb69332a899b39751bc40e34f31835426938788bed60bdfafc73f2dd3" +checksum = "fdd089bfb0e05396023ad2dced6273cd39863f5e35021d186fc7e3950497ec18" dependencies = [ "anyhow", "openvino", "thiserror", "tracing", "walkdir", - "wasmtime", - "wiggle", + "wasmtime 20.0.1", + "wiggle 20.0.1", ] [[package]] name = "wasmtime-winch" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa5fc7212424c04c01a20bfa66c4c518e8749dde6546f5e05815dcacbec80723" +checksum = "e0d446696aa83f680d85e188670631cb7958957f63d027d6c36b945c2baa3e1e" dependencies = [ "anyhow", "cranelift-codegen", "gimli", - "object", + "object 0.33.0", "target-lexicon", - "wasmparser 0.112.0", - "wasmtime-cranelift-shared", - "wasmtime-environ", + "wasmparser 0.202.0", + "wasmtime-cranelift", + "wasmtime-environ 20.0.1", "winch-codegen", ] [[package]] name = "wasmtime-wit-bindgen" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc03bd58f77a68dc6a0b2ba2f8e64b1f902b50389d21bbcc690ef2f3bb87198" +checksum = "4d1d0c83af38eb6918af9c7cbc07d39f741a7baa9ddd152e19d9f93ff627dc05" dependencies = [ "anyhow", "heck 0.4.1", @@ -2931,8 +3105,23 @@ dependencies = [ "bitflags 2.5.0", "thiserror", "tracing", - "wasmtime", - "wiggle-macro", + "wasmtime 13.0.1", + "wiggle-macro 13.0.1", +] + +[[package]] +name = "wiggle" +version = "20.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "909dcda9e41ab1f8280cf7d774fa16d240792d6fe086a88ef69a9dd97827d289" +dependencies = [ + "anyhow", + "async-trait", + "bitflags 2.5.0", + "thiserror", + "tracing", + "wasmtime 20.0.1", + "wiggle-macro 20.0.1", "witx", ] @@ -2951,6 +3140,21 @@ dependencies = [ "witx", ] +[[package]] +name = "wiggle-generate" +version = "20.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce431612cd480dbf925fb7c3c513dec176a57ea977bf3685726e4b0ab41a6408" +dependencies = [ + "anyhow", + "heck 0.4.1", + "proc-macro2", + "quote", + "shellexpand", + "syn", + "witx", +] + [[package]] name = "wiggle-macro" version = "13.0.1" @@ -2960,7 +3164,19 @@ dependencies = [ "proc-macro2", "quote", "syn", - "wiggle-generate", + "wiggle-generate 13.0.1", +] + +[[package]] +name = "wiggle-macro" +version = "20.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9815f5f4b6c6e01449569469416783992ac703c8fbf83d3724dfb16a02fe2e5c" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wiggle-generate 20.0.1", ] [[package]] @@ -2996,9 +3212,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "0.11.1" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9b01ca6722f7421c9cdbe4c9b62342ce864d0a9e8736d56dac717a86b1a65ae" +checksum = "720aabcf6838b31b42c7adc04d847696b066ddc5877efd6071ed5f08ae75bf20" dependencies = [ "anyhow", "cranelift-codegen", @@ -3006,8 +3222,9 @@ dependencies = [ "regalloc2", "smallvec", "target-lexicon", - "wasmparser 0.112.0", - "wasmtime-environ", + "wasmparser 0.202.0", + "wasmtime-cranelift", + "wasmtime-environ 20.0.1", ] [[package]] @@ -3151,6 +3368,15 @@ version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +[[package]] +name = "winnow" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +dependencies = [ + "memchr", +] + [[package]] name = "winx" version = "0.36.3" @@ -3163,20 +3389,20 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.11.3" +version = "0.202.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a39edca9abb16309def3843af73b58d47d243fe33a9ceee572446bcc57556b9a" +checksum = "744237b488352f4f27bca05a10acb79474415951c450e52ebd0da784c1df2bcc" dependencies = [ "anyhow", "id-arena", "indexmap", "log", - "pulldown-cmark", "semver 1.0.22", "serde", + "serde_derive", "serde_json", "unicode-xid", - "url", + "wasmparser 0.202.0", ] [[package]] @@ -3213,20 +3439,19 @@ dependencies = [ [[package]] name = "zstd" -version = "0.11.2+zstd.1.5.2" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" dependencies = [ - "libc", "zstd-sys", ] diff --git a/Cargo.toml b/Cargo.toml index e5b15096..50f45b76 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,7 +39,7 @@ url = "2.3.1" # Wasmtime dependencies wasi-common = "13.0.0" -wasmtime = "13.0.0" -wasmtime-wasi = "13.0.0" -wasmtime-wasi-nn = "13.0.0" -wiggle = "13.0.0" +wasmtime = "20.0.0" +wasmtime-wasi = "20.0.0" +wasmtime-wasi-nn = "20.0.0" +wiggle = "20.0.0" diff --git a/cli/tests/trap-test/Cargo.lock b/cli/tests/trap-test/Cargo.lock index ce863341..7ff3512e 100644 --- a/cli/tests/trap-test/Cargo.lock +++ b/cli/tests/trap-test/Cargo.lock @@ -139,17 +139,6 @@ dependencies = [ "syn", ] -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.2.0" @@ -167,7 +156,7 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object", + "object 0.32.2", "rustc-demangle", ] @@ -233,9 +222,9 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "cap-fs-ext" -version = "2.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88e341d15ac1029aadce600be764a1a1edafe40e03cde23285bc1d261b3a4866" +checksum = "769f8cd02eb04d57f14e2e371ebb533f96817f9b2525d73a5c72b61ca7973747" dependencies = [ "cap-primitives", "cap-std", @@ -245,9 +234,9 @@ dependencies = [ [[package]] name = "cap-net-ext" -version = "2.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "434168fe6533055f0f4204039abe3ff6d7db338ef46872a5fa39e9d5ad5ab7a9" +checksum = "59ff6d3fb274292a9af283417e383afe6ded1fe66f6472d2c781216d3d80c218" dependencies = [ "cap-primitives", "cap-std", @@ -257,9 +246,9 @@ dependencies = [ [[package]] name = "cap-primitives" -version = "2.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe16767ed8eee6d3f1f00d6a7576b81c226ab917eb54b96e5f77a5216ef67abb" +checksum = "90a0b44fc796b1a84535a63753d50ba3972c4db55c7255c186f79140e63d56d0" dependencies = [ "ambient-authority", "fs-set-times", @@ -274,9 +263,9 @@ dependencies = [ [[package]] name = "cap-rand" -version = "2.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20e5695565f0cd7106bc3c7170323597540e772bb73e0be2cd2c662a0f8fa4ca" +checksum = "4327f08daac33a99bb03c54ae18c8f32c3ba31c728a33ddf683c6c6a5043de68" dependencies = [ "ambient-authority", "rand", @@ -284,9 +273,9 @@ dependencies = [ [[package]] name = "cap-std" -version = "2.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "593db20e4c51f62d3284bae7ee718849c3214f93a3b94ea1899ad85ba119d330" +checksum = "266626ce180cf9709f317d0bf9754e3a5006359d87f4bf792f06c9c5f1b63c0f" dependencies = [ "cap-primitives", "io-extras", @@ -296,9 +285,9 @@ dependencies = [ [[package]] name = "cap-time-ext" -version = "2.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03261630f291f425430a36f38c847828265bc928f517cdd2004c56f4b02f002b" +checksum = "e1353421ba83c19da60726e35db0a89abef984b3be183ff6f58c5b8084fcd0c5" dependencies = [ "ambient-authority", "cap-primitives", @@ -400,9 +389,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpp_demangle" -version = "0.3.5" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" +checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119" dependencies = [ "cfg-if", ] @@ -418,25 +407,25 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.100.1" +version = "0.107.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "751cbf89e513f283c0641eb7f95dc72fda5051dd95ca203d1dc45e26bc89dba8" +checksum = "3c7a700bc3e2e834c81c7e9e57c6b27049172fc6156a6a406dd2265d64c30409" dependencies = [ - "cranelift-entity 0.100.1", + "cranelift-entity 0.107.1", ] [[package]] name = "cranelift-codegen" -version = "0.100.1" +version = "0.107.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "210730edc05121e915201cc36595e1f00062094669fa07ac362340e3627b3dc5" +checksum = "35bb55da792dc46a35e6e283b02b9d6aa7f21349691f41176d8ecf4a1494b6ad" dependencies = [ "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-control", - "cranelift-entity 0.100.1", + "cranelift-entity 0.107.1", "cranelift-isle", "gimli", "hashbrown 0.14.3", @@ -448,24 +437,24 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.100.1" +version = "0.107.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5dc7fdf210c53db047f3eaf49b3a89efee0cc3d9a2ce0c0f0236933273d0c53" +checksum = "bf590672e1a7580158968898ade9c82801d6ebeaa4649d6f99f9cbb411512a8b" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.100.1" +version = "0.107.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46875cc87d963119d78fe5c19852757dc6eea3cb9622c0df69c26b242cd44b4" +checksum = "3ab16a95d8b10b72eaa8bb9f0ce0fdd013e5f225bea92f69d2dbd2424aae5381" [[package]] name = "cranelift-control" -version = "0.100.1" +version = "0.107.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375dca8f58d8a801a85e11730c1529c5c4a9c3593dfb12118391ac437b037155" +checksum = "60448a5af01f5716877e616ec1613424fb65f427320c6e6447315966507f12da" dependencies = [ "arbitrary", ] @@ -478,9 +467,9 @@ checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352" [[package]] name = "cranelift-entity" -version = "0.100.1" +version = "0.107.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc619b86fe3c72f43fc417c9fd67a04ec0c98296e5940922d9fd9e6eedf72521" +checksum = "78689d6588f53981bf005b82d94125cc40cf9856b667bc276d1acdede400b633" dependencies = [ "serde", "serde_derive", @@ -488,9 +477,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.100.1" +version = "0.107.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb607fd19ae264da18f9f2532e7302b826f7fbf77bf88365fc075f2e3419436" +checksum = "c86da6e45adc39e8d66a73d6fb782b0d7961df9e44b724246e01e515f86b1f0d" dependencies = [ "cranelift-codegen", "log", @@ -500,15 +489,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.100.1" +version = "0.107.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fe806a6470dddfdf79e878af6a96afb1235a09fe3e21f9e0c2f18d402820432" +checksum = "dcb6f70d94826074699bc350c33dab82eb6f06022a3518bb466f501569d7379e" [[package]] name = "cranelift-native" -version = "0.100.1" +version = "0.107.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fac7f1722660b10af1f7229c0048f716bfd8bd344549b0e06e3eb6417ec3fe5b" +checksum = "e27ec0ef4115eb9cc15be9c841085db17233403f8ed325e02bd6a9d78d6c939c" dependencies = [ "cranelift-codegen", "libc", @@ -517,17 +506,17 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.100.1" +version = "0.107.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1b65810be56b619c3c55debade92798d999f34bf0670370c578afab5d905f06" +checksum = "fce009efc27c598ac0c019c7f3dc582403835547128aeb497edf76cb77d75250" dependencies = [ "cranelift-codegen", - "cranelift-entity 0.100.1", + "cranelift-entity 0.107.1", "cranelift-frontend", - "itertools", + "itertools 0.12.1", "log", "smallvec", - "wasmparser 0.112.0", + "wasmparser", "wasmtime-types", ] @@ -652,12 +641,12 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.7.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ - "atty", "humantime", + "is-terminal", "log", "regex", "termcolor", @@ -934,15 +923,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.3.9" @@ -985,12 +965,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" -version = "1.3.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" @@ -1094,7 +1071,7 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi", "libc", "windows-sys 0.52.0", ] @@ -1108,6 +1085,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -1116,9 +1102,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "ittapi" -version = "0.3.5" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a5c0b993601cad796222ea076565c5d9f337d35592f8622c753724f06d7271" +checksum = "6b996fe614c41395cdaedf3cf408a9534851090959d90d54a535f675550b64b1" dependencies = [ "anyhow", "ittapi-sys", @@ -1127,9 +1113,9 @@ dependencies = [ [[package]] name = "ittapi-sys" -version = "0.3.5" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7b5e473765060536a660eed127f758cf1a810c73e49063264959c60d1727d9" +checksum = "52f5385394064fa2c886205dba02598013ce83d3e92d33dbdc0c52fe0e7bf4fc" dependencies = [ "cc", ] @@ -1172,12 +1158,12 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "winapi", + "windows-targets 0.52.4", ] [[package]] @@ -1213,10 +1199,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] -name = "mach" -version = "0.3.2" +name = "mach2" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" dependencies = [ "libc", ] @@ -1295,7 +1281,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi", "libc", ] @@ -1304,6 +1290,15 @@ name = "object" version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "object" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8dd6c0cdf9429bce006e1362bfce61fa1bfd8c898a643ed8d2b471934701d3d" dependencies = [ "crc32fast", "hashbrown 0.14.3", @@ -1325,9 +1320,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openvino" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc731d9a7805dd533b69de3ee33062d5ea1dfa9fca1c19f8fd165b62e2cdde7" +checksum = "24bd3a7ef39968e6a4f1b1206c1c876f9bd50cf739ccbcd69f8539bbac5dcc7a" dependencies = [ "openvino-finder", "openvino-sys", @@ -1336,9 +1331,9 @@ dependencies = [ [[package]] name = "openvino-finder" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bbd80eea06c2b9ec3dce85900ff3ae596c01105b759b38a005af69bbeb4d07" +checksum = "05d234d1394a413ea8adaf0c40806b9ad1946be6310b441f688840654a331973" dependencies = [ "cfg-if", "log", @@ -1346,14 +1341,14 @@ dependencies = [ [[package]] name = "openvino-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "318ed662bdf05a3f86486408159e806d53363171621a8000b81366fab5158713" +checksum = "44c98acf37fc84ad9d7da4dc6c18f0f60ad209b43a6f555be01f9003d0a2a43d" dependencies = [ + "env_logger", "libloading", "once_cell", "openvino-finder", - "pretty_env_logger", ] [[package]] @@ -1435,16 +1430,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "pretty_env_logger" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d" -dependencies = [ - "env_logger", - "log", -] - [[package]] name = "proc-macro2" version = "1.0.79" @@ -1463,23 +1448,6 @@ dependencies = [ "cc", ] -[[package]] -name = "pulldown-cmark" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" -dependencies = [ - "bitflags 2.5.0", - "memchr", - "unicase", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quote" version = "1.0.35" @@ -1816,6 +1784,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + [[package]] name = "sha2" version = "0.10.8" @@ -1932,9 +1909,9 @@ dependencies = [ [[package]] name = "system-interface" -version = "0.26.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0682e006dd35771e392a6623ac180999a9a854b1d4a6c12fb2e804941c2b1f58" +checksum = "b858526d22750088a9b3cf2e3c2aacebd5377f13adeec02860c30d09113010a6" dependencies = [ "bitflags 2.5.0", "cap-fs-ext", @@ -2069,6 +2046,40 @@ dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tower-service" version = "0.3.2" @@ -2081,7 +2092,6 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -2186,15 +2196,6 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" -[[package]] -name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - [[package]] name = "unicode-bidi" version = "0.3.15" @@ -2285,7 +2286,7 @@ dependencies = [ "http", "http-body", "hyper", - "itertools", + "itertools 0.10.5", "lazy_static", "regex", "rustls", @@ -2298,11 +2299,10 @@ dependencies = [ "thiserror", "tokio", "tokio-rustls", - "toml", + "toml 0.5.11", "tracing", "tracing-futures", "url", - "wasi-common", "wasmtime", "wasmtime-wasi", "wasmtime-wasi-nn", @@ -2334,50 +2334,6 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -[[package]] -name = "wasi-cap-std-sync" -version = "13.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c4db6155e71cfae4ed732d87c2583faf4bbdcb77372697eb77d636f46108ba" -dependencies = [ - "anyhow", - "async-trait", - "cap-fs-ext", - "cap-rand", - "cap-std", - "cap-time-ext", - "fs-set-times", - "io-extras", - "io-lifetimes", - "is-terminal", - "once_cell", - "rustix", - "system-interface", - "tracing", - "wasi-common", - "windows-sys 0.48.0", -] - -[[package]] -name = "wasi-common" -version = "13.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf3f291b2a567f266ac488715f1742f62b2ca633524708c62ead9c0f71b7d72c" -dependencies = [ - "anyhow", - "bitflags 2.5.0", - "cap-rand", - "cap-std", - "io-extras", - "log", - "rustix", - "thiserror", - "tracing", - "wasmtime", - "wiggle", - "windows-sys 0.48.0", -] - [[package]] name = "wasm-bindgen" version = "0.2.92" @@ -2432,15 +2388,6 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" -[[package]] -name = "wasm-encoder" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba64e81215916eaeb48fee292f29401d69235d62d8b8fd92a7b2844ec5ae5f7" -dependencies = [ - "leb128", -] - [[package]] name = "wasm-encoder" version = "0.202.0" @@ -2452,19 +2399,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.112.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e986b010f47fcce49cf8ea5d5f9e5d2737832f12b53ae8ae785bbe895d0877bf" -dependencies = [ - "indexmap", - "semver 1.0.22", -] - -[[package]] -name = "wasmparser" -version = "0.121.2" +version = "0.202.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" +checksum = "d6998515d3cf3f8b980ef7c11b29a9b1017d4cf86b99ae93b546992df9931413" dependencies = [ "bitflags 2.5.0", "indexmap", @@ -2473,20 +2410,21 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.2.80" +version = "0.202.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60e73986a6b7fdfedb7c5bf9e7eb71135486507c8fbc4c0c42cffcb6532988b7" +checksum = "ab1cc9508685eef9502e787f4d4123745f5651a1e29aec047645d3cac1e2da7a" dependencies = [ "anyhow", - "wasmparser 0.121.2", + "wasmparser", ] [[package]] name = "wasmtime" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0263693caa1486bd4d26a5f18511948a706c9290689386b81b851ce088063ce" +checksum = "2364a810370f08ece49d013255058c3c88ca6c0a080de66549233b7d2ca078b8" dependencies = [ + "addr2line", "anyhow", "async-trait", "bincode", @@ -2494,47 +2432,52 @@ dependencies = [ "cfg-if", "encoding_rs", "fxprof-processed-profile", + "gimli", "indexmap", + "ittapi", "libc", "log", - "object", + "object 0.33.0", "once_cell", "paste", - "psm", "rayon", + "rustix", + "semver 1.0.22", "serde", "serde_derive", "serde_json", "target-lexicon", - "wasm-encoder 0.32.0", - "wasmparser 0.112.0", + "wasm-encoder", + "wasmparser", "wasmtime-cache", "wasmtime-component-macro", "wasmtime-component-util", "wasmtime-cranelift", "wasmtime-environ", "wasmtime-fiber", - "wasmtime-jit", + "wasmtime-jit-debug", + "wasmtime-jit-icache-coherence", "wasmtime-runtime", + "wasmtime-slab", "wasmtime-winch", "wat", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-asm-macros" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4711e5969236ecfbe70c807804ff9ffb5206c1dbb5c55c5e8200d9f7e8e76adf" +checksum = "c52cceae147514e279460ac3c43c1ea440c51c39202842611623b3f9734f73a8" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b79f9f79188e5a26b6911b79d3171c06699d9a17ae07f6a265c51635b8d80c2" +checksum = "b34056847ca9bde1d97cbc829a95d634f54d2879faa17200e55f3cddac159aea" dependencies = [ "anyhow", "base64", @@ -2545,16 +2488,16 @@ dependencies = [ "serde", "serde_derive", "sha2", - "toml", - "windows-sys 0.48.0", + "toml 0.8.12", + "windows-sys 0.52.0", "zstd", ] [[package]] name = "wasmtime-component-macro" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed724d0f41c21bcf8754651a59d0423c530069ddca4cf3822768489ad313a812" +checksum = "c8fd43a734bf424e3983363f1b7532a997edb206f52104568058e412e18db9ba" dependencies = [ "anyhow", "proc-macro2", @@ -2567,69 +2510,55 @@ dependencies = [ [[package]] name = "wasmtime-component-util" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e7d69464b94bd312a27d93d0b482cd74bedf01f030199ef0740d6300ebca1d3" +checksum = "44d65e6a21c3e3482240ff03cc26f5c7ae7ee5df524c2283f39cf492ab711a15" [[package]] name = "wasmtime-cranelift" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e63f53c61ba05eb815f905c1738ad82c95333dd42ef5a8cc2aa3d7dfb2b08d7" +checksum = "e2a6ed70499769b4d51f6f656204b0806b3d783f6ec5a8517c68e8b75ecaad19" dependencies = [ "anyhow", "cfg-if", "cranelift-codegen", "cranelift-control", - "cranelift-entity 0.100.1", + "cranelift-entity 0.107.1", "cranelift-frontend", "cranelift-native", "cranelift-wasm", "gimli", "log", - "object", + "object 0.33.0", "target-lexicon", "thiserror", - "wasmparser 0.112.0", - "wasmtime-cranelift-shared", + "wasmparser", "wasmtime-environ", "wasmtime-versioned-export-macros", ] -[[package]] -name = "wasmtime-cranelift-shared" -version = "13.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f6b197d68612f7dc3a17aa9f9587533715ecb8b4755609ce9baf7fb92b74ddc" -dependencies = [ - "anyhow", - "cranelift-codegen", - "cranelift-control", - "cranelift-native", - "gimli", - "object", - "target-lexicon", - "wasmtime-environ", -] - [[package]] name = "wasmtime-environ" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e2558c8b04fd27764d8601d46b8dc39555b79720a41e626bce210a80758932" +checksum = "90f7b5dbae8c3c6586e22f063ddb9e5cbf02c09629df75e5d8710f7bf880b117" dependencies = [ "anyhow", - "cranelift-entity 0.100.1", + "bincode", + "cpp_demangle", + "cranelift-entity 0.107.1", "gimli", "indexmap", "log", - "object", + "object 0.33.0", + "rustc-demangle", "serde", "serde_derive", "target-lexicon", "thiserror", - "wasm-encoder 0.32.0", - "wasmparser 0.112.0", + "wasm-encoder", + "wasmparser", "wasmprinter", "wasmtime-component-util", "wasmtime-types", @@ -2637,52 +2566,26 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a615a2cf64a49c0dc659c7d850c6cd377b975e0abfdcf0888b282d274a82e730" +checksum = "582e7ef625be814c57b1f8c3924c8899560d315f2285436c9184a09985dc3756" dependencies = [ + "anyhow", "cc", "cfg-if", "rustix", "wasmtime-asm-macros", "wasmtime-versioned-export-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "wasmtime-jit" -version = "13.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd775514b8034b85b0323bfdc60abb1c28d27dbf6e22aad083ed57dac95cf72e" -dependencies = [ - "addr2line", - "anyhow", - "bincode", - "cfg-if", - "cpp_demangle", - "gimli", - "ittapi", - "log", - "object", - "rustc-demangle", - "rustix", - "serde", - "serde_derive", - "target-lexicon", - "wasmtime-environ", - "wasmtime-jit-debug", - "wasmtime-jit-icache-coherence", - "wasmtime-runtime", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-jit-debug" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c054e27c6ce2a6191edabe89e646da013044dd5369e1d203c89f977f9bd32937" +checksum = "1bf1b989e3f648340253b76c6c58b2ade89bdf0e23edc4e911deb801fa915b18" dependencies = [ - "object", + "object 0.33.0", "once_cell", "rustix", "wasmtime-versioned-export-macros", @@ -2690,20 +2593,20 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f323977cddf4a262d1b856366b665c5b4d01793c57b79fb42505b9fd9e61e5b" +checksum = "b55b43e693c0beeca494d522f4850afca53cb46acf309483aef32a125276ee78" dependencies = [ "cfg-if", "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-runtime" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e26461bba043f73cb4183f4ce0d606c0eaac112475867b11e5ea36fe1cac8e" +checksum = "1d2b876c09b7863d8a01bf87eb45f3b121fab245f8afbff7c38c38c1c9059aee" dependencies = [ "anyhow", "cc", @@ -2712,41 +2615,47 @@ dependencies = [ "indexmap", "libc", "log", - "mach", + "mach2", "memfd", "memoffset", "paste", - "rand", + "psm", "rustix", "sptr", - "wasm-encoder 0.32.0", + "wasm-encoder", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-fiber", "wasmtime-jit-debug", + "wasmtime-slab", "wasmtime-versioned-export-macros", - "wasmtime-wmemcheck", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] +[[package]] +name = "wasmtime-slab" +version = "20.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05c8ddfb8ebbab6ac186bc1f8c02ed988bc9ea455fea10f72bc3a07503309b4b" + [[package]] name = "wasmtime-types" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd7e9b29fee64eea5058cb5e7cb3480b52c2f1312d431d16ea8617ceebeb421" +checksum = "3fa3a1f3c0deb3034d76e7dcf340c5df670a6603019ee5b58adb70870649c769" dependencies = [ - "cranelift-entity 0.100.1", + "cranelift-entity 0.107.1", "serde", "serde_derive", "thiserror", - "wasmparser 0.112.0", + "wasmparser", ] [[package]] name = "wasmtime-versioned-export-macros" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6362c557c36d8ad4aaab735f14ed9e4f78d6b40ec85a02a88fd859af87682e52" +checksum = "b85321f0a1cd3c859b94e728533ba00074d3eca62362acf6998be0eab6f4001c" dependencies = [ "proc-macro2", "quote", @@ -2755,9 +2664,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c9e79f73320d96cd7644b021502dffee09dd92300b073f3541ae44e9ae377c" +checksum = "0c5966b1aa330f07ef58f83b074908ea210ee864948ae3697f8892c91104e6e3" dependencies = [ "anyhow", "async-trait", @@ -2772,26 +2681,23 @@ dependencies = [ "futures", "io-extras", "io-lifetimes", - "is-terminal", - "libc", "once_cell", "rustix", "system-interface", "thiserror", "tokio", "tracing", - "wasi-cap-std-sync", - "wasi-common", + "url", "wasmtime", "wiggle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-wasi-nn" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3277a01fb69332a899b39751bc40e34f31835426938788bed60bdfafc73f2dd3" +checksum = "fdd089bfb0e05396023ad2dced6273cd39863f5e35021d186fc7e3950497ec18" dependencies = [ "anyhow", "openvino", @@ -2804,26 +2710,26 @@ dependencies = [ [[package]] name = "wasmtime-winch" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa5fc7212424c04c01a20bfa66c4c518e8749dde6546f5e05815dcacbec80723" +checksum = "e0d446696aa83f680d85e188670631cb7958957f63d027d6c36b945c2baa3e1e" dependencies = [ "anyhow", "cranelift-codegen", "gimli", - "object", + "object 0.33.0", "target-lexicon", - "wasmparser 0.112.0", - "wasmtime-cranelift-shared", + "wasmparser", + "wasmtime-cranelift", "wasmtime-environ", "winch-codegen", ] [[package]] name = "wasmtime-wit-bindgen" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc03bd58f77a68dc6a0b2ba2f8e64b1f902b50389d21bbcc690ef2f3bb87198" +checksum = "4d1d0c83af38eb6918af9c7cbc07d39f741a7baa9ddd152e19d9f93ff627dc05" dependencies = [ "anyhow", "heck 0.4.1", @@ -2831,12 +2737,6 @@ dependencies = [ "wit-parser", ] -[[package]] -name = "wasmtime-wmemcheck" -version = "13.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e485bf54eba675ca615f8f55788d3a8cd44e7bd09b8b4011edc22c2c41d859e" - [[package]] name = "wast" version = "35.0.2" @@ -2856,7 +2756,7 @@ dependencies = [ "leb128", "memchr", "unicode-width", - "wasm-encoder 0.202.0", + "wasm-encoder", ] [[package]] @@ -2870,9 +2770,9 @@ dependencies = [ [[package]] name = "wiggle" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e81ddbdc400b38d04241d740d0406ef343bd242c460f252fe59f29ad964ad24c" +checksum = "909dcda9e41ab1f8280cf7d774fa16d240792d6fe086a88ef69a9dd97827d289" dependencies = [ "anyhow", "async-trait", @@ -2886,9 +2786,9 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c993123d6db1a1908ef8352aabdf2e681a3dcdedc3656beb747e4db16d3cf08" +checksum = "ce431612cd480dbf925fb7c3c513dec176a57ea977bf3685726e4b0ab41a6408" dependencies = [ "anyhow", "heck 0.4.1", @@ -2901,9 +2801,9 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "13.0.1" +version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "476e3e09bc68e82624b70a322265515523754cb9e05fcacceabd216e276bc2ed" +checksum = "9815f5f4b6c6e01449569469416783992ac703c8fbf83d3724dfb16a02fe2e5c" dependencies = [ "proc-macro2", "quote", @@ -2944,9 +2844,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "0.11.1" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9b01ca6722f7421c9cdbe4c9b62342ce864d0a9e8736d56dac717a86b1a65ae" +checksum = "720aabcf6838b31b42c7adc04d847696b066ddc5877efd6071ed5f08ae75bf20" dependencies = [ "anyhow", "cranelift-codegen", @@ -2954,7 +2854,8 @@ dependencies = [ "regalloc2", "smallvec", "target-lexicon", - "wasmparser 0.112.0", + "wasmparser", + "wasmtime-cranelift", "wasmtime-environ", ] @@ -3099,6 +3000,15 @@ version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +[[package]] +name = "winnow" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +dependencies = [ + "memchr", +] + [[package]] name = "winx" version = "0.36.3" @@ -3111,20 +3021,20 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.11.3" +version = "0.202.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a39edca9abb16309def3843af73b58d47d243fe33a9ceee572446bcc57556b9a" +checksum = "744237b488352f4f27bca05a10acb79474415951c450e52ebd0da784c1df2bcc" dependencies = [ "anyhow", "id-arena", "indexmap", "log", - "pulldown-cmark", "semver 1.0.22", "serde", + "serde_derive", "serde_json", "unicode-xid", - "url", + "wasmparser", ] [[package]] @@ -3161,20 +3071,19 @@ dependencies = [ [[package]] name = "zstd" -version = "0.11.2+zstd.1.5.2" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" dependencies = [ - "libc", "zstd-sys", ] From 8039de534f0b3c1baf614ff9c1354044bba74154 Mon Sep 17 00:00:00 2001 From: Trevor Elliott Date: Tue, 7 May 2024 09:54:34 -0700 Subject: [PATCH 2/6] Switch from wasi-common to wasmtime-wasi --- Cargo.lock | 418 ++++++--------------------------------------- Cargo.toml | 1 - cli/Cargo.toml | 2 +- cli/src/main.rs | 2 +- lib/Cargo.toml | 1 - lib/src/execute.rs | 17 +- lib/src/linking.rs | 46 ++--- lib/src/logging.rs | 36 +++- 8 files changed, 123 insertions(+), 400 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 11794fd9..b84f31d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -211,8 +211,8 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "769f8cd02eb04d57f14e2e371ebb533f96817f9b2525d73a5c72b61ca7973747" dependencies = [ - "cap-primitives 3.0.0", - "cap-std 3.0.0", + "cap-primitives", + "cap-std", "io-lifetimes", "windows-sys 0.52.0", ] @@ -223,29 +223,12 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59ff6d3fb274292a9af283417e383afe6ded1fe66f6472d2c781216d3d80c218" dependencies = [ - "cap-primitives 3.0.0", - "cap-std 3.0.0", + "cap-primitives", + "cap-std", "rustix", "smallvec", ] -[[package]] -name = "cap-primitives" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe16767ed8eee6d3f1f00d6a7576b81c226ab917eb54b96e5f77a5216ef67abb" -dependencies = [ - "ambient-authority", - "fs-set-times", - "io-extras", - "io-lifetimes", - "ipnet", - "maybe-owned", - "rustix", - "windows-sys 0.52.0", - "winx", -] - [[package]] name = "cap-primitives" version = "3.0.0" @@ -263,16 +246,6 @@ dependencies = [ "winx", ] -[[package]] -name = "cap-rand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20e5695565f0cd7106bc3c7170323597540e772bb73e0be2cd2c662a0f8fa4ca" -dependencies = [ - "ambient-authority", - "rand", -] - [[package]] name = "cap-rand" version = "3.0.0" @@ -283,25 +256,13 @@ dependencies = [ "rand", ] -[[package]] -name = "cap-std" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "593db20e4c51f62d3284bae7ee718849c3214f93a3b94ea1899ad85ba119d330" -dependencies = [ - "cap-primitives 2.0.1", - "io-extras", - "io-lifetimes", - "rustix", -] - [[package]] name = "cap-std" version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "266626ce180cf9709f317d0bf9754e3a5006359d87f4bf792f06c9c5f1b63c0f" dependencies = [ - "cap-primitives 3.0.0", + "cap-primitives", "io-extras", "io-lifetimes", "rustix", @@ -314,7 +275,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1353421ba83c19da60726e35db0a89abef984b3be183ff6f58c5b8084fcd0c5" dependencies = [ "ambient-authority", - "cap-primitives 3.0.0", + "cap-primitives", "iana-time-zone", "once_cell", "rustix", @@ -399,15 +360,6 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" -[[package]] -name = "cpp_demangle" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" -dependencies = [ - "cfg-if", -] - [[package]] name = "cpp_demangle" version = "0.4.3" @@ -486,16 +438,6 @@ version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352" -[[package]] -name = "cranelift-entity" -version = "0.100.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc619b86fe3c72f43fc417c9fd67a04ec0c98296e5940922d9fd9e6eedf72521" -dependencies = [ - "serde", - "serde_derive", -] - [[package]] name = "cranelift-entity" version = "0.107.1" @@ -547,8 +489,8 @@ dependencies = [ "itertools 0.12.1", "log", "smallvec", - "wasmparser 0.202.0", - "wasmtime-types 20.0.1", + "wasmparser", + "wasmtime-types", ] [[package]] @@ -1248,15 +1190,6 @@ version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" -[[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", -] - [[package]] name = "mach2" version = "0.4.2" @@ -1351,9 +1284,6 @@ version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ - "crc32fast", - "hashbrown 0.14.3", - "indexmap", "memchr", ] @@ -2009,7 +1939,7 @@ checksum = "b858526d22750088a9b3cf2e3c2aacebd5377f13adeec02860c30d09113010a6" dependencies = [ "bitflags 2.5.0", "cap-fs-ext", - "cap-std 3.0.0", + "cap-std", "fd-lock", "io-lifetimes", "rustix", @@ -2212,7 +2142,6 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -2387,8 +2316,8 @@ dependencies = [ "tracing-subscriber", "url", "viceroy-lib", - "wasi-common", - "wasmtime 20.0.1", + "wasmtime", + "wasmtime-wasi", "wat", ] @@ -2426,11 +2355,10 @@ dependencies = [ "tracing", "tracing-futures", "url", - "wasi-common", - "wasmtime 20.0.1", + "wasmtime", "wasmtime-wasi", "wasmtime-wasi-nn", - "wiggle 20.0.1", + "wiggle", ] [[package]] @@ -2458,26 +2386,6 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -[[package]] -name = "wasi-common" -version = "13.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf3f291b2a567f266ac488715f1742f62b2ca633524708c62ead9c0f71b7d72c" -dependencies = [ - "anyhow", - "bitflags 2.5.0", - "cap-rand 2.0.1", - "cap-std 2.0.1", - "io-extras", - "log", - "rustix", - "thiserror", - "tracing", - "wasmtime 13.0.1", - "wiggle 13.0.1", - "windows-sys 0.48.0", -] - [[package]] name = "wasm-bindgen" version = "0.2.92" @@ -2532,15 +2440,6 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" -[[package]] -name = "wasm-encoder" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba64e81215916eaeb48fee292f29401d69235d62d8b8fd92a7b2844ec5ae5f7" -dependencies = [ - "leb128", -] - [[package]] name = "wasm-encoder" version = "0.202.0" @@ -2550,16 +2449,6 @@ dependencies = [ "leb128", ] -[[package]] -name = "wasmparser" -version = "0.112.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e986b010f47fcce49cf8ea5d5f9e5d2737832f12b53ae8ae785bbe895d0877bf" -dependencies = [ - "indexmap", - "semver 1.0.22", -] - [[package]] name = "wasmparser" version = "0.202.0" @@ -2578,37 +2467,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab1cc9508685eef9502e787f4d4123745f5651a1e29aec047645d3cac1e2da7a" dependencies = [ "anyhow", - "wasmparser 0.202.0", -] - -[[package]] -name = "wasmtime" -version = "13.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0263693caa1486bd4d26a5f18511948a706c9290689386b81b851ce088063ce" -dependencies = [ - "anyhow", - "bincode", - "bumpalo", - "cfg-if", - "fxprof-processed-profile", - "indexmap", - "libc", - "log", - "object 0.32.2", - "once_cell", - "paste", - "psm", - "serde", - "serde_derive", - "serde_json", - "target-lexicon", - "wasm-encoder 0.32.0", - "wasmparser 0.112.0", - "wasmtime-environ 13.0.1", - "wasmtime-jit", - "wasmtime-runtime 13.0.1", - "windows-sys 0.48.0", + "wasmparser", ] [[package]] @@ -2640,32 +2499,23 @@ dependencies = [ "serde_derive", "serde_json", "target-lexicon", - "wasm-encoder 0.202.0", - "wasmparser 0.202.0", + "wasm-encoder", + "wasmparser", "wasmtime-cache", "wasmtime-component-macro", "wasmtime-component-util", "wasmtime-cranelift", - "wasmtime-environ 20.0.1", + "wasmtime-environ", "wasmtime-fiber", - "wasmtime-jit-debug 20.0.1", - "wasmtime-jit-icache-coherence 20.0.1", - "wasmtime-runtime 20.0.1", + "wasmtime-jit-debug", + "wasmtime-jit-icache-coherence", + "wasmtime-runtime", "wasmtime-slab", "wasmtime-winch", "wat", "windows-sys 0.52.0", ] -[[package]] -name = "wasmtime-asm-macros" -version = "13.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4711e5969236ecfbe70c807804ff9ffb5206c1dbb5c55c5e8200d9f7e8e76adf" -dependencies = [ - "cfg-if", -] - [[package]] name = "wasmtime-asm-macros" version = "20.0.1" @@ -2735,29 +2585,9 @@ dependencies = [ "object 0.33.0", "target-lexicon", "thiserror", - "wasmparser 0.202.0", - "wasmtime-environ 20.0.1", - "wasmtime-versioned-export-macros 20.0.1", -] - -[[package]] -name = "wasmtime-environ" -version = "13.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e2558c8b04fd27764d8601d46b8dc39555b79720a41e626bce210a80758932" -dependencies = [ - "anyhow", - "cranelift-entity 0.100.1", - "gimli", - "indexmap", - "log", - "object 0.32.2", - "serde", - "serde_derive", - "target-lexicon", - "thiserror", - "wasmparser 0.112.0", - "wasmtime-types 13.0.1", + "wasmparser", + "wasmtime-environ", + "wasmtime-versioned-export-macros", ] [[package]] @@ -2768,7 +2598,7 @@ checksum = "90f7b5dbae8c3c6586e22f063ddb9e5cbf02c09629df75e5d8710f7bf880b117" dependencies = [ "anyhow", "bincode", - "cpp_demangle 0.4.3", + "cpp_demangle", "cranelift-entity 0.107.1", "gimli", "indexmap", @@ -2779,11 +2609,11 @@ dependencies = [ "serde_derive", "target-lexicon", "thiserror", - "wasm-encoder 0.202.0", - "wasmparser 0.202.0", + "wasm-encoder", + "wasmparser", "wasmprinter", "wasmtime-component-util", - "wasmtime-types 20.0.1", + "wasmtime-types", ] [[package]] @@ -2796,46 +2626,11 @@ dependencies = [ "cc", "cfg-if", "rustix", - "wasmtime-asm-macros 20.0.1", - "wasmtime-versioned-export-macros 20.0.1", + "wasmtime-asm-macros", + "wasmtime-versioned-export-macros", "windows-sys 0.52.0", ] -[[package]] -name = "wasmtime-jit" -version = "13.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd775514b8034b85b0323bfdc60abb1c28d27dbf6e22aad083ed57dac95cf72e" -dependencies = [ - "addr2line", - "anyhow", - "bincode", - "cfg-if", - "cpp_demangle 0.3.5", - "gimli", - "log", - "object 0.32.2", - "rustc-demangle", - "rustix", - "serde", - "serde_derive", - "target-lexicon", - "wasmtime-environ 13.0.1", - "wasmtime-jit-icache-coherence 13.0.1", - "wasmtime-runtime 13.0.1", - "windows-sys 0.48.0", -] - -[[package]] -name = "wasmtime-jit-debug" -version = "13.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c054e27c6ce2a6191edabe89e646da013044dd5369e1d203c89f977f9bd32937" -dependencies = [ - "once_cell", - "wasmtime-versioned-export-macros 13.0.1", -] - [[package]] name = "wasmtime-jit-debug" version = "20.0.1" @@ -2845,18 +2640,7 @@ dependencies = [ "object 0.33.0", "once_cell", "rustix", - "wasmtime-versioned-export-macros 20.0.1", -] - -[[package]] -name = "wasmtime-jit-icache-coherence" -version = "13.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f323977cddf4a262d1b856366b665c5b4d01793c57b79fb42505b9fd9e61e5b" -dependencies = [ - "cfg-if", - "libc", - "windows-sys 0.48.0", + "wasmtime-versioned-export-macros", ] [[package]] @@ -2870,34 +2654,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "wasmtime-runtime" -version = "13.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e26461bba043f73cb4183f4ce0d606c0eaac112475867b11e5ea36fe1cac8e" -dependencies = [ - "anyhow", - "cc", - "cfg-if", - "indexmap", - "libc", - "log", - "mach", - "memfd", - "memoffset", - "paste", - "rand", - "rustix", - "sptr", - "wasm-encoder 0.32.0", - "wasmtime-asm-macros 13.0.1", - "wasmtime-environ 13.0.1", - "wasmtime-jit-debug 13.0.1", - "wasmtime-versioned-export-macros 13.0.1", - "wasmtime-wmemcheck", - "windows-sys 0.48.0", -] - [[package]] name = "wasmtime-runtime" version = "20.0.1" @@ -2918,13 +2674,13 @@ dependencies = [ "psm", "rustix", "sptr", - "wasm-encoder 0.202.0", - "wasmtime-asm-macros 20.0.1", - "wasmtime-environ 20.0.1", + "wasm-encoder", + "wasmtime-asm-macros", + "wasmtime-environ", "wasmtime-fiber", - "wasmtime-jit-debug 20.0.1", + "wasmtime-jit-debug", "wasmtime-slab", - "wasmtime-versioned-export-macros 20.0.1", + "wasmtime-versioned-export-macros", "windows-sys 0.52.0", ] @@ -2934,19 +2690,6 @@ version = "20.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05c8ddfb8ebbab6ac186bc1f8c02ed988bc9ea455fea10f72bc3a07503309b4b" -[[package]] -name = "wasmtime-types" -version = "13.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd7e9b29fee64eea5058cb5e7cb3480b52c2f1312d431d16ea8617ceebeb421" -dependencies = [ - "cranelift-entity 0.100.1", - "serde", - "serde_derive", - "thiserror", - "wasmparser 0.112.0", -] - [[package]] name = "wasmtime-types" version = "20.0.1" @@ -2957,18 +2700,7 @@ dependencies = [ "serde", "serde_derive", "thiserror", - "wasmparser 0.202.0", -] - -[[package]] -name = "wasmtime-versioned-export-macros" -version = "13.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6362c557c36d8ad4aaab735f14ed9e4f78d6b40ec85a02a88fd859af87682e52" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "wasmparser", ] [[package]] @@ -2994,8 +2726,8 @@ dependencies = [ "bytes", "cap-fs-ext", "cap-net-ext", - "cap-rand 3.0.0", - "cap-std 3.0.0", + "cap-rand", + "cap-std", "cap-time-ext", "fs-set-times", "futures", @@ -3008,8 +2740,8 @@ dependencies = [ "tokio", "tracing", "url", - "wasmtime 20.0.1", - "wiggle 20.0.1", + "wasmtime", + "wiggle", "windows-sys 0.52.0", ] @@ -3024,8 +2756,8 @@ dependencies = [ "thiserror", "tracing", "walkdir", - "wasmtime 20.0.1", - "wiggle 20.0.1", + "wasmtime", + "wiggle", ] [[package]] @@ -3039,9 +2771,9 @@ dependencies = [ "gimli", "object 0.33.0", "target-lexicon", - "wasmparser 0.202.0", + "wasmparser", "wasmtime-cranelift", - "wasmtime-environ 20.0.1", + "wasmtime-environ", "winch-codegen", ] @@ -3057,12 +2789,6 @@ dependencies = [ "wit-parser", ] -[[package]] -name = "wasmtime-wmemcheck" -version = "13.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e485bf54eba675ca615f8f55788d3a8cd44e7bd09b8b4011edc22c2c41d859e" - [[package]] name = "wast" version = "35.0.2" @@ -3082,7 +2808,7 @@ dependencies = [ "leb128", "memchr", "unicode-width", - "wasm-encoder 0.202.0", + "wasm-encoder", ] [[package]] @@ -3094,21 +2820,6 @@ dependencies = [ "wast 202.0.0", ] -[[package]] -name = "wiggle" -version = "13.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e81ddbdc400b38d04241d740d0406ef343bd242c460f252fe59f29ad964ad24c" -dependencies = [ - "anyhow", - "async-trait", - "bitflags 2.5.0", - "thiserror", - "tracing", - "wasmtime 13.0.1", - "wiggle-macro 13.0.1", -] - [[package]] name = "wiggle" version = "20.0.1" @@ -3120,23 +2831,8 @@ dependencies = [ "bitflags 2.5.0", "thiserror", "tracing", - "wasmtime 20.0.1", - "wiggle-macro 20.0.1", - "witx", -] - -[[package]] -name = "wiggle-generate" -version = "13.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c993123d6db1a1908ef8352aabdf2e681a3dcdedc3656beb747e4db16d3cf08" -dependencies = [ - "anyhow", - "heck 0.4.1", - "proc-macro2", - "quote", - "shellexpand", - "syn", + "wasmtime", + "wiggle-macro", "witx", ] @@ -3155,18 +2851,6 @@ dependencies = [ "witx", ] -[[package]] -name = "wiggle-macro" -version = "13.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "476e3e09bc68e82624b70a322265515523754cb9e05fcacceabd216e276bc2ed" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wiggle-generate 13.0.1", -] - [[package]] name = "wiggle-macro" version = "20.0.1" @@ -3176,7 +2860,7 @@ dependencies = [ "proc-macro2", "quote", "syn", - "wiggle-generate 20.0.1", + "wiggle-generate", ] [[package]] @@ -3222,9 +2906,9 @@ dependencies = [ "regalloc2", "smallvec", "target-lexicon", - "wasmparser 0.202.0", + "wasmparser", "wasmtime-cranelift", - "wasmtime-environ 20.0.1", + "wasmtime-environ", ] [[package]] @@ -3402,7 +3086,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.202.0", + "wasmparser", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 50f45b76..1256dacc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,7 +38,6 @@ futures = "0.3.24" url = "2.3.1" # Wasmtime dependencies -wasi-common = "13.0.0" wasmtime = "20.0.0" wasmtime-wasi = "20.0.0" wasmtime-wasi-nn = "20.0.0" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index cd8844ef..c5639d9b 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -47,7 +47,7 @@ tracing-futures = { workspace = true } tracing-subscriber = { version = "^0.3.16", features = ["env-filter", "fmt"] } viceroy-lib = { path = "../lib", version = "^0.9.7" } wat = "^1.0.38" -wasi-common = { workspace = true } +wasmtime-wasi = { workspace = true } wasmtime = { workspace = true } libc = "^0.2.139" diff --git a/cli/src/main.rs b/cli/src/main.rs index 071dad8e..5e63336f 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -16,7 +16,7 @@ use std::path::PathBuf; use std::process::ExitCode; -use wasi_common::I32Exit; +use wasmtime_wasi::I32Exit; mod opts; diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 4bc3f2b2..c91c8eca 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -52,7 +52,6 @@ toml = "^0.5.9" tracing = { workspace = true } tracing-futures = { workspace = true } url = { workspace = true } -wasi-common = { workspace = true } wasmtime = { workspace = true } wasmtime-wasi = { workspace = true } wasmtime-wasi-nn = { workspace = true } diff --git a/lib/src/execute.rs b/lib/src/execute.rs index bfbec0fe..0cd56abc 100644 --- a/lib/src/execute.rs +++ b/lib/src/execute.rs @@ -31,8 +31,8 @@ use { }, tokio::sync::oneshot::{self, Sender}, tracing::{event, info, info_span, Instrument, Level}, - wasi_common::I32Exit, wasmtime::{Engine, InstancePre, Linker, Module, ProfilingStrategy}, + wasmtime_wasi::I32Exit, }; pub const EPOCH_INTERRUPTION_PERIOD: Duration = Duration::from_micros(50); @@ -364,7 +364,8 @@ impl ExecuteCtx { // due to wasmtime limitations, in particular the fact that `Instance` is not `Send`. // However, the fact that the module itself is created within `ExecuteCtx::new` // means that the heavy lifting happens only once. - let mut store = create_store(&self, session, profiler).map_err(ExecutionError::Context)?; + let mut store = + create_store(&self, session, profiler, |_| {}).map_err(ExecutionError::Context)?; let instance = self .instance_pre @@ -446,11 +447,13 @@ impl ExecuteCtx { vec![(program_name.to_string(), self.module.clone())], ) }); - let mut store = create_store(&self, session, profiler).map_err(ExecutionError::Context)?; - store.data_mut().wasi().push_arg(program_name)?; - for arg in args { - store.data_mut().wasi().push_arg(arg)?; - } + let mut store = create_store(&self, session, profiler, |builder| { + builder.arg(program_name); + for arg in args { + builder.arg(arg); + } + }) + .map_err(ExecutionError::Context)?; let instance = self .instance_pre diff --git a/lib/src/linking.rs b/lib/src/linking.rs index 24fd90a6..9915d10d 100644 --- a/lib/src/linking.rs +++ b/lib/src/linking.rs @@ -5,11 +5,9 @@ use { config::ExperimentalModule, execute::ExecuteCtx, logging::LogEndpoint, session::Session, wiggle_abi, Error, }, - anyhow::Context, std::collections::HashSet, - wasi_common::{pipe::WritePipe, WasiCtx}, wasmtime::{GuestProfiler, Linker, Store, UpdateDeadline}, - wasmtime_wasi::WasiCtxBuilder, + wasmtime_wasi::{preview1::WasiP1Ctx, WasiCtxBuilder}, wasmtime_wasi_nn::WasiNnCtx, }; @@ -44,7 +42,7 @@ impl wasmtime::ResourceLimiter for Limiter { } pub struct WasmCtx { - wasi: WasiCtx, + wasi: WasiP1Ctx, wasi_nn: WasiNnCtx, session: Session, guest_profiler: Option>, @@ -52,7 +50,7 @@ pub struct WasmCtx { } impl WasmCtx { - pub fn wasi(&mut self) -> &mut WasiCtx { + pub fn wasi(&mut self) -> &mut WasiP1Ctx { &mut self.wasi } @@ -87,8 +85,13 @@ pub(crate) fn create_store( ctx: &ExecuteCtx, session: Session, guest_profiler: Option, + extra_init: impl FnOnce(&mut WasiCtxBuilder), ) -> Result, anyhow::Error> { - let wasi = make_wasi_ctx(ctx, &session).context("creating Wasi context")?; + let mut builder = make_wasi_ctx(ctx, &session); + + extra_init(&mut builder); + + let wasi = builder.build_p1(); let (backends, registry) = wasmtime_wasi_nn::preload(&[])?; let wasi_nn = WasiNnCtx::new(backends, registry); let wasm_ctx = WasmCtx { @@ -102,7 +105,7 @@ pub(crate) fn create_store( store.set_epoch_deadline(1); store.epoch_deadline_callback(|mut store| { if let Some(mut prof) = store.data_mut().guest_profiler.take() { - prof.sample(&store); + prof.sample(&store, std::time::Duration::ZERO); store.data_mut().guest_profiler = Some(prof); } Ok(UpdateDeadline::Yield(1)) @@ -111,8 +114,8 @@ pub(crate) fn create_store( Ok(store) } -/// Constructs a fresh `WasiCtx` for _each_ incoming request. -fn make_wasi_ctx(ctx: &ExecuteCtx, session: &Session) -> Result { +/// Constructs a `WasiCtxBuilder` for _each_ incoming request. +fn make_wasi_ctx(ctx: &ExecuteCtx, session: &Session) -> WasiCtxBuilder { let mut wasi_ctx = WasiCtxBuilder::new(); // Viceroy provides the same `FASTLY_*` environment variables that the production @@ -120,29 +123,30 @@ fn make_wasi_ctx(ctx: &ExecuteCtx, session: &Session) -> Result Box { + Box::new(LogEndpoint(self.0.clone())) + } + + fn isatty(&self) -> bool { + false + } +} + +#[wiggle::async_trait] +impl wasmtime_wasi::Subscribe for LogEndpoint { + async fn ready(&mut self) {} +} + +impl wasmtime_wasi::HostOutputStream for LogEndpoint { + fn write(&mut self, bytes: bytes::Bytes) -> wasmtime_wasi::StreamResult<()> { + self.write_entry(&bytes) + .map_err(|e| wasmtime_wasi::StreamError::LastOperationFailed(anyhow::anyhow!(e))) + } + + fn flush(&mut self) -> wasmtime_wasi::StreamResult<()> { + ::flush(self) + .map_err(|e| wasmtime_wasi::StreamError::LastOperationFailed(anyhow::anyhow!(e))) + } + + fn check_write(&mut self) -> wasmtime_wasi::StreamResult { + Ok(1024 * 1024) + } +} From 0b9c0c707d28dfded0a71eb27b7c435f70baf0d6 Mon Sep 17 00:00:00 2001 From: Trevor Elliott Date: Tue, 7 May 2024 12:42:40 -0700 Subject: [PATCH 3/6] Fix wiggle issues --- lib/src/wiggle_abi.rs | 2 + lib/src/wiggle_abi/device_detection_impl.rs | 30 ++++++------ lib/src/wiggle_abi/dictionary_impl.rs | 17 +++---- lib/src/wiggle_abi/geo_impl.rs | 7 +-- lib/src/wiggle_abi/headers.rs | 6 +-- lib/src/wiggle_abi/req_impl.rs | 53 +++++++++------------ lib/src/wiggle_abi/secret_store_impl.rs | 6 +-- 7 files changed, 50 insertions(+), 71 deletions(-) diff --git a/lib/src/wiggle_abi.rs b/lib/src/wiggle_abi.rs index c42cd7cd..076ad8b9 100644 --- a/lib/src/wiggle_abi.rs +++ b/lib/src/wiggle_abi.rs @@ -224,6 +224,7 @@ where // If there's not enough room to write even a single value, that's an error. // Write out the number of bytes necessary to fit this header value, or zero // on overflow to signal an error condition. + drop(buf); nwritten_out.write(value_len_with_term.try_into().unwrap_or(0))?; return Err(Error::BufferLengthError { buf: "buf", @@ -263,6 +264,7 @@ where types::MultiValueCursorResult::from(cursor as i64) }; + drop(buf); nwritten_out.write(buf_offset.try_into().unwrap_or(0))?; Ok(ending_cursor) diff --git a/lib/src/wiggle_abi/device_detection_impl.rs b/lib/src/wiggle_abi/device_detection_impl.rs index 287f46a5..5222829d 100644 --- a/lib/src/wiggle_abi/device_detection_impl.rs +++ b/lib/src/wiggle_abi/device_detection_impl.rs @@ -30,17 +30,18 @@ impl FastlyDeviceDetection for Session { buf_len: u32, nwritten_out: &GuestPtr, ) -> Result<(), Error> { - let user_agent_slice = user_agent - .as_bytes() - .as_slice()? - .ok_or(Error::SharedMemory)?; - let user_agent_str = std::str::from_utf8(&user_agent_slice)?; - - let result = self - .device_detection_lookup(user_agent_str) - .ok_or_else(|| { - DeviceDetectionError::NoDeviceDetectionData(user_agent_str.to_string()) - })?; + let result = { + let user_agent_slice = user_agent + .as_bytes() + .as_slice()? + .ok_or(Error::SharedMemory)?; + let user_agent_str = std::str::from_utf8(&user_agent_slice)?; + + self.device_detection_lookup(user_agent_str) + .ok_or_else(|| { + DeviceDetectionError::NoDeviceDetectionData(user_agent_str.to_string()) + })? + }; if result.len() > buf_len as usize { return Err(Error::BufferLengthError { @@ -52,12 +53,9 @@ impl FastlyDeviceDetection for Session { let result_len = u32::try_from(result.len()).expect("smaller than buf_len means it must fit"); - let mut buf_ptr = buf - .as_array(result_len) - .as_slice_mut()? - .ok_or(Error::SharedMemory)?; + buf.as_array(result_len) + .copy_from_slice(result.as_bytes())?; - buf_ptr.copy_from_slice(result.as_bytes()); nwritten_out.write(result_len)?; Ok(()) } diff --git a/lib/src/wiggle_abi/dictionary_impl.rs b/lib/src/wiggle_abi/dictionary_impl.rs index 3e101be3..a390c6bb 100644 --- a/lib/src/wiggle_abi/dictionary_impl.rs +++ b/lib/src/wiggle_abi/dictionary_impl.rs @@ -50,11 +50,12 @@ impl FastlyDictionary for Session { .contents() .map_err(|err| Error::Other(err.into()))?; - let key: &str = &key.as_str()?.ok_or(Error::SharedMemory)?; - let item_bytes = dict - .get(key) - .ok_or_else(|| DictionaryError::UnknownDictionaryItem(key.to_owned()))? - .as_bytes(); + let item_bytes = { + let key: &str = &key.as_str()?.ok_or(Error::SharedMemory)?; + dict.get(key) + .ok_or_else(|| DictionaryError::UnknownDictionaryItem(key.to_owned()))? + .as_bytes() + }; if item_bytes.len() > buf_len as usize { return Err(Error::BufferLengthError { @@ -65,11 +66,7 @@ impl FastlyDictionary for Session { let item_len = u32::try_from(item_bytes.len()) .expect("smaller than dictionary_item_max_len means it must fit"); - let mut buf_slice = buf - .as_array(item_len) - .as_slice_mut()? - .ok_or(Error::SharedMemory)?; - buf_slice.copy_from_slice(item_bytes); + buf.as_array(item_len).copy_from_slice(item_bytes)?; Ok(item_len) } } diff --git a/lib/src/wiggle_abi/geo_impl.rs b/lib/src/wiggle_abi/geo_impl.rs index a02cca70..5f2e4b02 100644 --- a/lib/src/wiggle_abi/geo_impl.rs +++ b/lib/src/wiggle_abi/geo_impl.rs @@ -48,11 +48,8 @@ impl FastlyGeo for Session { let result_len = u32::try_from(result.len()).expect("smaller than value_max_len means it must fit"); - let mut buf_ptr = buf - .as_array(result_len) - .as_slice_mut()? - .ok_or(Error::SharedMemory)?; - buf_ptr.copy_from_slice(result.as_bytes()); + buf.as_array(result_len) + .copy_from_slice(result.as_bytes())?; nwritten_out.write(result_len)?; Ok(()) } diff --git a/lib/src/wiggle_abi/headers.rs b/lib/src/wiggle_abi/headers.rs index aface347..5484b5d6 100644 --- a/lib/src/wiggle_abi/headers.rs +++ b/lib/src/wiggle_abi/headers.rs @@ -86,11 +86,7 @@ impl HttpHeaders for HeaderMap { } let value_len = u32::try_from(value_bytes.len()).expect("smaller than value_max_len means it must fit"); - let mut value_out = value_ptr - .as_array(value_len) - .as_slice_mut()? - .ok_or(Error::SharedMemory)?; - value_out.copy_from_slice(value_bytes); + value_ptr.as_array(value_len).copy_from_slice(value_bytes)?; nwritten_out.write(value_len)?; Ok(()) diff --git a/lib/src/wiggle_abi/req_impl.rs b/lib/src/wiggle_abi/req_impl.rs index 7cc4770a..8bd837a4 100644 --- a/lib/src/wiggle_abi/req_impl.rs +++ b/lib/src/wiggle_abi/req_impl.rs @@ -73,22 +73,18 @@ impl FastlyHttpReq for Session { let octets = addr.octets(); let octets_bytes = octets.len() as u32; debug_assert_eq!(octets_bytes, 4); - let mut octets_slice = addr_octets_ptr + addr_octets_ptr .as_array(octets_bytes) - .as_slice_mut()? - .ok_or(Error::SharedMemory)?; - octets_slice.copy_from_slice(&octets); + .copy_from_slice(&octets)?; Ok(octets_bytes) } IpAddr::V6(addr) => { let octets = addr.octets(); let octets_bytes = octets.len() as u32; debug_assert_eq!(octets_bytes, 16); - let mut octets_slice = addr_octets_ptr + addr_octets_ptr .as_array(octets_bytes) - .as_slice_mut()? - .ok_or(Error::SharedMemory)?; - octets_slice.copy_from_slice(&octets); + .copy_from_slice(&octets)?; Ok(octets_bytes) } } @@ -125,11 +121,9 @@ impl FastlyHttpReq for Session { let reqid_len = u32::try_from(reqid_bytes.len()).expect("smaller u32::MAX means it must fit"); - let mut reqid_slice = reqid_out + reqid_out .as_array(reqid_len) - .as_slice_mut()? - .ok_or(Error::SharedMemory)?; - reqid_slice.copy_from_slice(&reqid_bytes); + .copy_from_slice(&reqid_bytes)?; nwritten_out.write(reqid_len)?; Ok(()) } @@ -257,13 +251,17 @@ impl FastlyHttpReq for Session { backend_info_mask: BackendConfigOptions, backend_info: &GuestPtr<'a, DynamicBackendConfig<'a>>, ) -> Result<(), Error> { - let name_slice = name.as_bytes().as_slice()?.ok_or(Error::SharedMemory)?; - let name = std::str::from_utf8(&name_slice)?; - let origin_name_slice = upstream_dynamic - .as_bytes() - .as_slice()? - .ok_or(Error::SharedMemory)?; - let origin_name = std::str::from_utf8(&origin_name_slice)?; + let name = { + let name_slice = name.as_bytes().as_slice()?.ok_or(Error::SharedMemory)?; + std::str::from_utf8(&name_slice)?.to_owned() + }; + let origin_name = { + let origin_name_slice = upstream_dynamic + .as_bytes() + .as_slice()? + .ok_or(Error::SharedMemory)?; + std::str::from_utf8(&origin_name_slice)?.to_owned() + }; let config = backend_info.read()?; // If someone set our reserved bit, error. We might need it, and we don't @@ -427,8 +425,8 @@ impl FastlyHttpReq for Session { ca_certs, }; - if !self.add_backend(name, new_backend) { - return Err(Error::BackendNameRegistryError(name.to_string())); + if !self.add_backend(&name, new_backend) { + return Err(Error::BackendNameRegistryError(name)); } Ok(()) @@ -570,11 +568,8 @@ impl FastlyHttpReq for Session { let req_method_len = u32::try_from(req_method_bytes.len()) .expect("smaller than method_max_len means it must fit"); - let mut buf_slice = buf - .as_array(req_method_len) - .as_slice_mut()? - .ok_or(Error::SharedMemory)?; - buf_slice.copy_from_slice(&req_method_bytes); + buf.as_array(req_method_len) + .copy_from_slice(&req_method_bytes)?; nwritten_out.write(req_method_len)?; Ok(()) @@ -615,11 +610,7 @@ impl FastlyHttpReq for Session { let req_uri_len = u32::try_from(req_uri_bytes.len()).expect("smaller than uri_max_len means it must fit"); - let mut buf_slice = buf - .as_array(req_uri_len) - .as_slice_mut()? - .ok_or(Error::SharedMemory)?; - buf_slice.copy_from_slice(&req_uri_bytes); + buf.as_array(req_uri_len).copy_from_slice(&req_uri_bytes)?; nwritten_out.write(req_uri_len)?; Ok(()) diff --git a/lib/src/wiggle_abi/secret_store_impl.rs b/lib/src/wiggle_abi/secret_store_impl.rs index 0208ed74..0e177809 100644 --- a/lib/src/wiggle_abi/secret_store_impl.rs +++ b/lib/src/wiggle_abi/secret_store_impl.rs @@ -115,11 +115,9 @@ impl FastlySecretStore for Session { let plaintext_len = u32::try_from(plaintext.len()) .expect("smaller than plaintext_max_len means it must fit"); - let mut plaintext_out = plaintext_buf + plaintext_buf .as_array(plaintext_len) - .as_slice_mut()? - .ok_or(Error::SharedMemory)?; - plaintext_out.copy_from_slice(plaintext); + .copy_from_slice(plaintext)?; nwritten_out.write(plaintext_len)?; Ok(()) From 3df158c675573e18f2adada31fbc8b58886f4f20 Mon Sep 17 00:00:00 2001 From: Trevor Elliott Date: Tue, 7 May 2024 14:11:12 -0700 Subject: [PATCH 4/6] Run `generate-lockfile` --- Cargo.lock | 447 ++++++++++++++++---------------- cli/tests/trap-test/Cargo.lock | 451 +++++++++++++++++---------------- test-fixtures/Cargo.lock | 64 ++--- 3 files changed, 504 insertions(+), 458 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b84f31d2..6a380d5a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -55,47 +55,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -103,9 +104,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" [[package]] name = "arbitrary" @@ -115,9 +116,9 @@ checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "async-trait" -version = "0.1.79" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", @@ -126,9 +127,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" @@ -183,9 +184,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" @@ -284,12 +285,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.91" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd97381a8cc6493395a5afc4c691c1084b3768db713b73aa215217aa245d153" +checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -340,9 +342,9 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "core-foundation" @@ -380,28 +382,28 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.107.1" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c7a700bc3e2e834c81c7e9e57c6b27049172fc6156a6a406dd2265d64c30409" +checksum = "ebf72ceaf38f7d41194d0cf6748214d8ef7389167fe09aad80f87646dbfa325b" dependencies = [ - "cranelift-entity 0.107.1", + "cranelift-entity 0.107.2", ] [[package]] name = "cranelift-codegen" -version = "0.107.1" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35bb55da792dc46a35e6e283b02b9d6aa7f21349691f41176d8ecf4a1494b6ad" +checksum = "9ee7fde5cd9173f00ce02c491ee9e306d64740f4b1a697946e0474f389999e13" dependencies = [ "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-control", - "cranelift-entity 0.107.1", + "cranelift-entity 0.107.2", "cranelift-isle", "gimli", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "log", "regalloc2", "smallvec", @@ -410,24 +412,24 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.107.1" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf590672e1a7580158968898ade9c82801d6ebeaa4649d6f99f9cbb411512a8b" +checksum = "b49bec6a517e78d4067500dc16acb558e772491a2bcb37301127448adfb8413c" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.107.1" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab16a95d8b10b72eaa8bb9f0ce0fdd013e5f225bea92f69d2dbd2424aae5381" +checksum = "ead4ea497b2dc2ac31fcabd6d5d0d5dc25b3964814122e343724bdf65a53c843" [[package]] name = "cranelift-control" -version = "0.107.1" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60448a5af01f5716877e616ec1613424fb65f427320c6e6447315966507f12da" +checksum = "f81e8028c8d711ea7592648e70221f2e54acb8665f7ecd49545f021ec14c3341" dependencies = [ "arbitrary", ] @@ -440,9 +442,9 @@ checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352" [[package]] name = "cranelift-entity" -version = "0.107.1" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78689d6588f53981bf005b82d94125cc40cf9856b667bc276d1acdede400b633" +checksum = "32acd0632ba65c2566e75f64af9ef094bb8d90e58a9fbd33d920977a9d85c054" dependencies = [ "serde", "serde_derive", @@ -450,9 +452,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.107.1" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c86da6e45adc39e8d66a73d6fb782b0d7961df9e44b724246e01e515f86b1f0d" +checksum = "a395a704934aa944ba8939cac9001174b9ae5236f48bc091f89e33bb968336f6" dependencies = [ "cranelift-codegen", "log", @@ -462,15 +464,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.107.1" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb6f70d94826074699bc350c33dab82eb6f06022a3518bb466f501569d7379e" +checksum = "b325ce81c4ee7082dc894537eb342c37898e14230fe7c02ea945691db3e2dd01" [[package]] name = "cranelift-native" -version = "0.107.1" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27ec0ef4115eb9cc15be9c841085db17233403f8ed325e02bd6a9d78d6c939c" +checksum = "ea11f5ac85996fa093075d66397922d4f56085d5d84ec13043d0cd4f159c6818" dependencies = [ "cranelift-codegen", "libc", @@ -479,12 +481,12 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.107.1" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce009efc27c598ac0c019c7f3dc582403835547128aeb497edf76cb77d75250" +checksum = "e4f175d4e299a8edabfbd64fa93c7650836cc8ad7f4879f9bd2632575a1f12d0" dependencies = [ "cranelift-codegen", - "cranelift-entity 0.107.1", + "cranelift-entity 0.107.2", "cranelift-frontend", "itertools 0.12.1", "log", @@ -544,7 +546,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -612,15 +614,15 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -662,9 +664,9 @@ checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "fastly-shared" -version = "0.9.11" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d63515f1dbea1485823992bd5fdef0e0807c7185234f58c20bff4bfeb41742b4" +checksum = "276812acf6f1b34029a5eb6ff3add7fe11452e1513762d02263a031097e68761" dependencies = [ "bitflags 1.3.2", "http", @@ -672,9 +674,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fd-lock" @@ -689,9 +691,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -846,9 +848,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -896,9 +898,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", ] @@ -1031,7 +1033,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "serde", ] @@ -1068,6 +1070,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + [[package]] name = "itertools" version = "0.10.5" @@ -1114,9 +1122,9 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -1144,9 +1152,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libloading" @@ -1155,7 +1163,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -1176,9 +1184,9 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -1294,7 +1302,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8dd6c0cdf9429bce006e1362bfce61fa1bfd8c898a643ed8d2b471934701d3d" dependencies = [ "crc32fast", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "indexmap", "memchr", ] @@ -1352,9 +1360,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", "parking_lot_core", @@ -1362,22 +1370,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "percent-encoding" @@ -1431,9 +1439,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] @@ -1449,9 +1457,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -1508,11 +1516,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", ] [[package]] @@ -1600,9 +1608,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -1612,9 +1620,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -1627,9 +1635,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring", @@ -1670,9 +1678,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -1710,11 +1718,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -1723,9 +1731,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -1742,9 +1750,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "semver-parser" @@ -1754,18 +1762,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ "proc-macro2", "quote", @@ -1774,9 +1782,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -1848,9 +1856,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -1888,9 +1896,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1922,9 +1930,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.58" +version = "2.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" dependencies = [ "proc-macro2", "quote", @@ -1976,18 +1984,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ "proc-macro2", "quote", @@ -2047,7 +2055,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.6", + "socket2 0.5.7", "tokio-macros", "windows-sys 0.48.0", ] @@ -2075,16 +2083,15 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -2242,9 +2249,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" [[package]] name = "unicode-xid" @@ -2449,6 +2456,15 @@ dependencies = [ "leb128", ] +[[package]] +name = "wasm-encoder" +version = "0.206.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d759312e1137f199096d80a70be685899cd7d3d09c572836bb2e9b69b4dc3b1e" +dependencies = [ + "leb128", +] + [[package]] name = "wasmparser" version = "0.202.0" @@ -2457,7 +2473,7 @@ checksum = "d6998515d3cf3f8b980ef7c11b29a9b1017d4cf86b99ae93b546992df9931413" dependencies = [ "bitflags 2.5.0", "indexmap", - "semver 1.0.22", + "semver 1.0.23", ] [[package]] @@ -2472,9 +2488,9 @@ dependencies = [ [[package]] name = "wasmtime" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2364a810370f08ece49d013255058c3c88ca6c0a080de66549233b7d2ca078b8" +checksum = "4af5cb32045daee8476711eb12b8b71275c2dd1fc7a58cc2a11b33ce9205f6a2" dependencies = [ "addr2line", "anyhow", @@ -2494,12 +2510,12 @@ dependencies = [ "paste", "rayon", "rustix", - "semver 1.0.22", + "semver 1.0.23", "serde", "serde_derive", "serde_json", "target-lexicon", - "wasm-encoder", + "wasm-encoder 0.202.0", "wasmparser", "wasmtime-cache", "wasmtime-component-macro", @@ -2518,18 +2534,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c52cceae147514e279460ac3c43c1ea440c51c39202842611623b3f9734f73a8" +checksum = "7515c4d24c8b55c0feab67e3d52a42f999fda8b9cfafbd69a82ed6bcf299d26e" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b34056847ca9bde1d97cbc829a95d634f54d2879faa17200e55f3cddac159aea" +checksum = "c3aa2de7189ea6b3270727d0027790494aec5e7101ca50da3f9549a86628cae4" dependencies = [ "anyhow", "base64", @@ -2547,9 +2563,9 @@ dependencies = [ [[package]] name = "wasmtime-component-macro" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8fd43a734bf424e3983363f1b7532a997edb206f52104568058e412e18db9ba" +checksum = "794839a710a39a12677c67ff43fec54ef00d0ca6c6f631209a7c5524522221d3" dependencies = [ "anyhow", "proc-macro2", @@ -2562,21 +2578,21 @@ dependencies = [ [[package]] name = "wasmtime-component-util" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d65e6a21c3e3482240ff03cc26f5c7ae7ee5df524c2283f39cf492ab711a15" +checksum = "7839a1b9e15d17be1cb2a105f18be8e0bbf52bdec7a7cd6eb5d80d4c2cdf74f0" [[package]] name = "wasmtime-cranelift" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2a6ed70499769b4d51f6f656204b0806b3d783f6ec5a8517c68e8b75ecaad19" +checksum = "57ec2d9a4b9990bea53a5dfd689d48663dbd19a46903eaf73e2022b3d1ef20d3" dependencies = [ "anyhow", "cfg-if", "cranelift-codegen", "cranelift-control", - "cranelift-entity 0.107.1", + "cranelift-entity 0.107.2", "cranelift-frontend", "cranelift-native", "cranelift-wasm", @@ -2592,14 +2608,14 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f7b5dbae8c3c6586e22f063ddb9e5cbf02c09629df75e5d8710f7bf880b117" +checksum = "ad72e2e3f7ea5b50fedf66dd36ba24634e4f445c370644683b433d45d88f6126" dependencies = [ "anyhow", "bincode", "cpp_demangle", - "cranelift-entity 0.107.1", + "cranelift-entity 0.107.2", "gimli", "indexmap", "log", @@ -2609,7 +2625,7 @@ dependencies = [ "serde_derive", "target-lexicon", "thiserror", - "wasm-encoder", + "wasm-encoder 0.202.0", "wasmparser", "wasmprinter", "wasmtime-component-util", @@ -2618,9 +2634,9 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "582e7ef625be814c57b1f8c3924c8899560d315f2285436c9184a09985dc3756" +checksum = "4dbdf3053e7e7ced0cd4ed76579995b62169a1a43696890584eae2de2e33bf54" dependencies = [ "anyhow", "cc", @@ -2633,9 +2649,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf1b989e3f648340253b76c6c58b2ade89bdf0e23edc4e911deb801fa915b18" +checksum = "983ca409f2cd66385ce49486c022da0128acb7910c055beb5230998b49c6084c" dependencies = [ "object 0.33.0", "once_cell", @@ -2645,9 +2661,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55b43e693c0beeca494d522f4850afca53cb46acf309483aef32a125276ee78" +checksum = "ede45379f3b4d395d8947006de8043801806099a240a26db553919b68e96ab15" dependencies = [ "cfg-if", "libc", @@ -2656,9 +2672,9 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2b876c09b7863d8a01bf87eb45f3b121fab245f8afbff7c38c38c1c9059aee" +checksum = "65019d29d175c567b84173f2adf3b7a3af6d5592f8fe510dccae55d2569ec0d2" dependencies = [ "anyhow", "cc", @@ -2674,7 +2690,7 @@ dependencies = [ "psm", "rustix", "sptr", - "wasm-encoder", + "wasm-encoder 0.202.0", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-fiber", @@ -2686,17 +2702,17 @@ dependencies = [ [[package]] name = "wasmtime-slab" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05c8ddfb8ebbab6ac186bc1f8c02ed988bc9ea455fea10f72bc3a07503309b4b" +checksum = "ca6585868f5c427c3e9d2a8c0c3354e6d7d4518a0d17723ab25a0c1eebf5d5b4" [[package]] name = "wasmtime-types" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fa3a1f3c0deb3034d76e7dcf340c5df670a6603019ee5b58adb70870649c769" +checksum = "84d5381ff174faded38c7b2085fbe430dff59489c87a91403354d710075750fb" dependencies = [ - "cranelift-entity 0.107.1", + "cranelift-entity 0.107.2", "serde", "serde_derive", "thiserror", @@ -2705,9 +2721,9 @@ dependencies = [ [[package]] name = "wasmtime-versioned-export-macros" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b85321f0a1cd3c859b94e728533ba00074d3eca62362acf6998be0eab6f4001c" +checksum = "0d3b70422fdfa915c903f003b8b42554a8ae1aa0c6208429d8314ebf5721f3ac" dependencies = [ "proc-macro2", "quote", @@ -2716,9 +2732,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c5966b1aa330f07ef58f83b074908ea210ee864948ae3697f8892c91104e6e3" +checksum = "08dd00241969c3be8c5dfdedbb8d9c5af6783e514ffbf8f7522036561bd1337a" dependencies = [ "anyhow", "async-trait", @@ -2747,9 +2763,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi-nn" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdd089bfb0e05396023ad2dced6273cd39863f5e35021d186fc7e3950497ec18" +checksum = "550e63fe1048ab3ce627b324fbd321abbea6f39a3c6463d82ae432886b500f05" dependencies = [ "anyhow", "openvino", @@ -2762,9 +2778,9 @@ dependencies = [ [[package]] name = "wasmtime-winch" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d446696aa83f680d85e188670631cb7958957f63d027d6c36b945c2baa3e1e" +checksum = "996360967b5196dec20ddcfce499ce4dc80cc925c088b0f2b376d29b96833a6a" dependencies = [ "anyhow", "cranelift-codegen", @@ -2779,9 +2795,9 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d1d0c83af38eb6918af9c7cbc07d39f741a7baa9ddd152e19d9f93ff627dc05" +checksum = "01840c0cfbbb01664c796e3f4edbd656e58f9d76db083c7e7c6bba59ea657a96" dependencies = [ "anyhow", "heck 0.4.1", @@ -2800,31 +2816,31 @@ dependencies = [ [[package]] name = "wast" -version = "202.0.0" +version = "206.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fbcb11204515c953c9b42ede0a46a1c5e17f82af05c4fae201a8efff1b0f4fe" +checksum = "68586953ee4960b1f5d84ebf26df3b628b17e6173bc088e0acfbce431469795a" dependencies = [ "bumpalo", "leb128", "memchr", "unicode-width", - "wasm-encoder", + "wasm-encoder 0.206.0", ] [[package]] name = "wat" -version = "1.202.0" +version = "1.206.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4de4b15a47135c56a3573406e9977b9518787a6154459b4842a9b9d3d1684848" +checksum = "da4c6f2606276c6e991aebf441b2fc92c517807393f039992a3e0ad873efe4ad" dependencies = [ - "wast 202.0.0", + "wast 206.0.0", ] [[package]] name = "wiggle" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909dcda9e41ab1f8280cf7d774fa16d240792d6fe086a88ef69a9dd97827d289" +checksum = "f93fc3510978a905f931d74784ed8685bd6453e18ad8f92809e793d48827e3cd" dependencies = [ "anyhow", "async-trait", @@ -2838,9 +2854,9 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce431612cd480dbf925fb7c3c513dec176a57ea977bf3685726e4b0ab41a6408" +checksum = "4ec3909e70f36066526ad3b2abb4855ab836f8a6b293449582563ac50d651083" dependencies = [ "anyhow", "heck 0.4.1", @@ -2853,9 +2869,9 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9815f5f4b6c6e01449569469416783992ac703c8fbf83d3724dfb16a02fe2e5c" +checksum = "b4c31124572ab16401c491c0d4fb5fe5d17dab65fcfcc56d7d8efb1c1e56a3db" dependencies = [ "proc-macro2", "quote", @@ -2881,11 +2897,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -2896,9 +2912,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "0.18.1" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "720aabcf6838b31b42c7adc04d847696b066ddc5877efd6071ed5f08ae75bf20" +checksum = "cefeb84a0f39227cf2eb665cf348e6150ebf3372d08adff03264064ab590fdf4" dependencies = [ "anyhow", "cranelift-codegen", @@ -2917,7 +2933,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -2935,7 +2951,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -2955,17 +2971,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -2976,9 +2993,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -2988,9 +3005,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -3000,9 +3017,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -3012,9 +3035,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -3024,9 +3047,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -3036,9 +3059,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -3048,9 +3071,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -3081,7 +3104,7 @@ dependencies = [ "id-arena", "indexmap", "log", - "semver 1.0.22", + "semver 1.0.23", "serde", "serde_derive", "serde_json", @@ -3103,18 +3126,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", diff --git a/cli/tests/trap-test/Cargo.lock b/cli/tests/trap-test/Cargo.lock index 7ff3512e..30db39db 100644 --- a/cli/tests/trap-test/Cargo.lock +++ b/cli/tests/trap-test/Cargo.lock @@ -70,47 +70,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -118,9 +119,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" [[package]] name = "arbitrary" @@ -130,9 +131,9 @@ checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "async-trait" -version = "0.1.79" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", @@ -141,9 +142,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" @@ -198,9 +199,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" @@ -299,12 +300,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.91" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd97381a8cc6493395a5afc4c691c1084b3768db713b73aa215217aa245d153" +checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -315,14 +317,14 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -367,9 +369,9 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "core-foundation" @@ -407,28 +409,28 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.107.1" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c7a700bc3e2e834c81c7e9e57c6b27049172fc6156a6a406dd2265d64c30409" +checksum = "ebf72ceaf38f7d41194d0cf6748214d8ef7389167fe09aad80f87646dbfa325b" dependencies = [ - "cranelift-entity 0.107.1", + "cranelift-entity 0.107.2", ] [[package]] name = "cranelift-codegen" -version = "0.107.1" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35bb55da792dc46a35e6e283b02b9d6aa7f21349691f41176d8ecf4a1494b6ad" +checksum = "9ee7fde5cd9173f00ce02c491ee9e306d64740f4b1a697946e0474f389999e13" dependencies = [ "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-control", - "cranelift-entity 0.107.1", + "cranelift-entity 0.107.2", "cranelift-isle", "gimli", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "log", "regalloc2", "smallvec", @@ -437,24 +439,24 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.107.1" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf590672e1a7580158968898ade9c82801d6ebeaa4649d6f99f9cbb411512a8b" +checksum = "b49bec6a517e78d4067500dc16acb558e772491a2bcb37301127448adfb8413c" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.107.1" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab16a95d8b10b72eaa8bb9f0ce0fdd013e5f225bea92f69d2dbd2424aae5381" +checksum = "ead4ea497b2dc2ac31fcabd6d5d0d5dc25b3964814122e343724bdf65a53c843" [[package]] name = "cranelift-control" -version = "0.107.1" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60448a5af01f5716877e616ec1613424fb65f427320c6e6447315966507f12da" +checksum = "f81e8028c8d711ea7592648e70221f2e54acb8665f7ecd49545f021ec14c3341" dependencies = [ "arbitrary", ] @@ -467,9 +469,9 @@ checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352" [[package]] name = "cranelift-entity" -version = "0.107.1" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78689d6588f53981bf005b82d94125cc40cf9856b667bc276d1acdede400b633" +checksum = "32acd0632ba65c2566e75f64af9ef094bb8d90e58a9fbd33d920977a9d85c054" dependencies = [ "serde", "serde_derive", @@ -477,9 +479,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.107.1" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c86da6e45adc39e8d66a73d6fb782b0d7961df9e44b724246e01e515f86b1f0d" +checksum = "a395a704934aa944ba8939cac9001174b9ae5236f48bc091f89e33bb968336f6" dependencies = [ "cranelift-codegen", "log", @@ -489,15 +491,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.107.1" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb6f70d94826074699bc350c33dab82eb6f06022a3518bb466f501569d7379e" +checksum = "b325ce81c4ee7082dc894537eb342c37898e14230fe7c02ea945691db3e2dd01" [[package]] name = "cranelift-native" -version = "0.107.1" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27ec0ef4115eb9cc15be9c841085db17233403f8ed325e02bd6a9d78d6c939c" +checksum = "ea11f5ac85996fa093075d66397922d4f56085d5d84ec13043d0cd4f159c6818" dependencies = [ "cranelift-codegen", "libc", @@ -506,12 +508,12 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.107.1" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce009efc27c598ac0c019c7f3dc582403835547128aeb497edf76cb77d75250" +checksum = "e4f175d4e299a8edabfbd64fa93c7650836cc8ad7f4879f9bd2632575a1f12d0" dependencies = [ "cranelift-codegen", - "cranelift-entity 0.107.1", + "cranelift-entity 0.107.2", "cranelift-frontend", "itertools 0.12.1", "log", @@ -626,15 +628,15 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -676,9 +678,9 @@ checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "fastly-shared" -version = "0.9.11" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d63515f1dbea1485823992bd5fdef0e0807c7185234f58c20bff4bfeb41742b4" +checksum = "276812acf6f1b34029a5eb6ff3add7fe11452e1513762d02263a031097e68761" dependencies = [ "bitflags 1.3.2", "http", @@ -697,9 +699,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -854,9 +856,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -904,9 +906,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", ] @@ -1039,7 +1041,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "serde", ] @@ -1076,6 +1078,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + [[package]] name = "itertools" version = "0.10.5" @@ -1122,9 +1130,9 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -1152,9 +1160,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libloading" @@ -1163,7 +1171,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -1184,9 +1192,9 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -1268,9 +1276,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -1301,7 +1309,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8dd6c0cdf9429bce006e1362bfce61fa1bfd8c898a643ed8d2b471934701d3d" dependencies = [ "crc32fast", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "indexmap", "memchr", ] @@ -1353,9 +1361,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", "parking_lot_core", @@ -1363,22 +1371,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "percent-encoding" @@ -1432,9 +1440,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] @@ -1450,9 +1458,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -1509,11 +1517,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", ] [[package]] @@ -1601,9 +1609,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -1613,9 +1621,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -1628,9 +1636,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring", @@ -1671,9 +1679,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -1711,11 +1719,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -1724,9 +1732,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -1743,9 +1751,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "semver-parser" @@ -1755,18 +1763,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ "proc-macro2", "quote", @@ -1775,9 +1783,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -1824,9 +1832,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -1864,9 +1872,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1898,9 +1906,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.58" +version = "2.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" dependencies = [ "proc-macro2", "quote", @@ -1940,18 +1948,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ "proc-macro2", "quote", @@ -1997,7 +2005,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.6", + "socket2 0.5.7", "tokio-macros", "windows-sys 0.48.0", ] @@ -2025,16 +2033,15 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -2219,9 +2226,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" [[package]] name = "unicode-xid" @@ -2397,6 +2404,15 @@ dependencies = [ "leb128", ] +[[package]] +name = "wasm-encoder" +version = "0.206.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d759312e1137f199096d80a70be685899cd7d3d09c572836bb2e9b69b4dc3b1e" +dependencies = [ + "leb128", +] + [[package]] name = "wasmparser" version = "0.202.0" @@ -2405,7 +2421,7 @@ checksum = "d6998515d3cf3f8b980ef7c11b29a9b1017d4cf86b99ae93b546992df9931413" dependencies = [ "bitflags 2.5.0", "indexmap", - "semver 1.0.22", + "semver 1.0.23", ] [[package]] @@ -2420,9 +2436,9 @@ dependencies = [ [[package]] name = "wasmtime" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2364a810370f08ece49d013255058c3c88ca6c0a080de66549233b7d2ca078b8" +checksum = "4af5cb32045daee8476711eb12b8b71275c2dd1fc7a58cc2a11b33ce9205f6a2" dependencies = [ "addr2line", "anyhow", @@ -2442,12 +2458,12 @@ dependencies = [ "paste", "rayon", "rustix", - "semver 1.0.22", + "semver 1.0.23", "serde", "serde_derive", "serde_json", "target-lexicon", - "wasm-encoder", + "wasm-encoder 0.202.0", "wasmparser", "wasmtime-cache", "wasmtime-component-macro", @@ -2466,18 +2482,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c52cceae147514e279460ac3c43c1ea440c51c39202842611623b3f9734f73a8" +checksum = "7515c4d24c8b55c0feab67e3d52a42f999fda8b9cfafbd69a82ed6bcf299d26e" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b34056847ca9bde1d97cbc829a95d634f54d2879faa17200e55f3cddac159aea" +checksum = "c3aa2de7189ea6b3270727d0027790494aec5e7101ca50da3f9549a86628cae4" dependencies = [ "anyhow", "base64", @@ -2495,9 +2511,9 @@ dependencies = [ [[package]] name = "wasmtime-component-macro" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8fd43a734bf424e3983363f1b7532a997edb206f52104568058e412e18db9ba" +checksum = "794839a710a39a12677c67ff43fec54ef00d0ca6c6f631209a7c5524522221d3" dependencies = [ "anyhow", "proc-macro2", @@ -2510,21 +2526,21 @@ dependencies = [ [[package]] name = "wasmtime-component-util" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d65e6a21c3e3482240ff03cc26f5c7ae7ee5df524c2283f39cf492ab711a15" +checksum = "7839a1b9e15d17be1cb2a105f18be8e0bbf52bdec7a7cd6eb5d80d4c2cdf74f0" [[package]] name = "wasmtime-cranelift" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2a6ed70499769b4d51f6f656204b0806b3d783f6ec5a8517c68e8b75ecaad19" +checksum = "57ec2d9a4b9990bea53a5dfd689d48663dbd19a46903eaf73e2022b3d1ef20d3" dependencies = [ "anyhow", "cfg-if", "cranelift-codegen", "cranelift-control", - "cranelift-entity 0.107.1", + "cranelift-entity 0.107.2", "cranelift-frontend", "cranelift-native", "cranelift-wasm", @@ -2540,14 +2556,14 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f7b5dbae8c3c6586e22f063ddb9e5cbf02c09629df75e5d8710f7bf880b117" +checksum = "ad72e2e3f7ea5b50fedf66dd36ba24634e4f445c370644683b433d45d88f6126" dependencies = [ "anyhow", "bincode", "cpp_demangle", - "cranelift-entity 0.107.1", + "cranelift-entity 0.107.2", "gimli", "indexmap", "log", @@ -2557,7 +2573,7 @@ dependencies = [ "serde_derive", "target-lexicon", "thiserror", - "wasm-encoder", + "wasm-encoder 0.202.0", "wasmparser", "wasmprinter", "wasmtime-component-util", @@ -2566,9 +2582,9 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "582e7ef625be814c57b1f8c3924c8899560d315f2285436c9184a09985dc3756" +checksum = "4dbdf3053e7e7ced0cd4ed76579995b62169a1a43696890584eae2de2e33bf54" dependencies = [ "anyhow", "cc", @@ -2581,9 +2597,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf1b989e3f648340253b76c6c58b2ade89bdf0e23edc4e911deb801fa915b18" +checksum = "983ca409f2cd66385ce49486c022da0128acb7910c055beb5230998b49c6084c" dependencies = [ "object 0.33.0", "once_cell", @@ -2593,9 +2609,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55b43e693c0beeca494d522f4850afca53cb46acf309483aef32a125276ee78" +checksum = "ede45379f3b4d395d8947006de8043801806099a240a26db553919b68e96ab15" dependencies = [ "cfg-if", "libc", @@ -2604,9 +2620,9 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2b876c09b7863d8a01bf87eb45f3b121fab245f8afbff7c38c38c1c9059aee" +checksum = "65019d29d175c567b84173f2adf3b7a3af6d5592f8fe510dccae55d2569ec0d2" dependencies = [ "anyhow", "cc", @@ -2622,7 +2638,7 @@ dependencies = [ "psm", "rustix", "sptr", - "wasm-encoder", + "wasm-encoder 0.202.0", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-fiber", @@ -2634,17 +2650,17 @@ dependencies = [ [[package]] name = "wasmtime-slab" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05c8ddfb8ebbab6ac186bc1f8c02ed988bc9ea455fea10f72bc3a07503309b4b" +checksum = "ca6585868f5c427c3e9d2a8c0c3354e6d7d4518a0d17723ab25a0c1eebf5d5b4" [[package]] name = "wasmtime-types" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fa3a1f3c0deb3034d76e7dcf340c5df670a6603019ee5b58adb70870649c769" +checksum = "84d5381ff174faded38c7b2085fbe430dff59489c87a91403354d710075750fb" dependencies = [ - "cranelift-entity 0.107.1", + "cranelift-entity 0.107.2", "serde", "serde_derive", "thiserror", @@ -2653,9 +2669,9 @@ dependencies = [ [[package]] name = "wasmtime-versioned-export-macros" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b85321f0a1cd3c859b94e728533ba00074d3eca62362acf6998be0eab6f4001c" +checksum = "0d3b70422fdfa915c903f003b8b42554a8ae1aa0c6208429d8314ebf5721f3ac" dependencies = [ "proc-macro2", "quote", @@ -2664,9 +2680,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c5966b1aa330f07ef58f83b074908ea210ee864948ae3697f8892c91104e6e3" +checksum = "08dd00241969c3be8c5dfdedbb8d9c5af6783e514ffbf8f7522036561bd1337a" dependencies = [ "anyhow", "async-trait", @@ -2695,9 +2711,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi-nn" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdd089bfb0e05396023ad2dced6273cd39863f5e35021d186fc7e3950497ec18" +checksum = "550e63fe1048ab3ce627b324fbd321abbea6f39a3c6463d82ae432886b500f05" dependencies = [ "anyhow", "openvino", @@ -2710,9 +2726,9 @@ dependencies = [ [[package]] name = "wasmtime-winch" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d446696aa83f680d85e188670631cb7958957f63d027d6c36b945c2baa3e1e" +checksum = "996360967b5196dec20ddcfce499ce4dc80cc925c088b0f2b376d29b96833a6a" dependencies = [ "anyhow", "cranelift-codegen", @@ -2727,9 +2743,9 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d1d0c83af38eb6918af9c7cbc07d39f741a7baa9ddd152e19d9f93ff627dc05" +checksum = "01840c0cfbbb01664c796e3f4edbd656e58f9d76db083c7e7c6bba59ea657a96" dependencies = [ "anyhow", "heck 0.4.1", @@ -2748,31 +2764,31 @@ dependencies = [ [[package]] name = "wast" -version = "202.0.0" +version = "206.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fbcb11204515c953c9b42ede0a46a1c5e17f82af05c4fae201a8efff1b0f4fe" +checksum = "68586953ee4960b1f5d84ebf26df3b628b17e6173bc088e0acfbce431469795a" dependencies = [ "bumpalo", "leb128", "memchr", "unicode-width", - "wasm-encoder", + "wasm-encoder 0.206.0", ] [[package]] name = "wat" -version = "1.202.0" +version = "1.206.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4de4b15a47135c56a3573406e9977b9518787a6154459b4842a9b9d3d1684848" +checksum = "da4c6f2606276c6e991aebf441b2fc92c517807393f039992a3e0ad873efe4ad" dependencies = [ - "wast 202.0.0", + "wast 206.0.0", ] [[package]] name = "wiggle" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909dcda9e41ab1f8280cf7d774fa16d240792d6fe086a88ef69a9dd97827d289" +checksum = "f93fc3510978a905f931d74784ed8685bd6453e18ad8f92809e793d48827e3cd" dependencies = [ "anyhow", "async-trait", @@ -2786,9 +2802,9 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce431612cd480dbf925fb7c3c513dec176a57ea977bf3685726e4b0ab41a6408" +checksum = "4ec3909e70f36066526ad3b2abb4855ab836f8a6b293449582563ac50d651083" dependencies = [ "anyhow", "heck 0.4.1", @@ -2801,9 +2817,9 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "20.0.1" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9815f5f4b6c6e01449569469416783992ac703c8fbf83d3724dfb16a02fe2e5c" +checksum = "b4c31124572ab16401c491c0d4fb5fe5d17dab65fcfcc56d7d8efb1c1e56a3db" dependencies = [ "proc-macro2", "quote", @@ -2829,11 +2845,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -2844,9 +2860,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "0.18.1" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "720aabcf6838b31b42c7adc04d847696b066ddc5877efd6071ed5f08ae75bf20" +checksum = "cefeb84a0f39227cf2eb665cf348e6150ebf3372d08adff03264064ab590fdf4" dependencies = [ "anyhow", "cranelift-codegen", @@ -2865,7 +2881,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -2883,7 +2899,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -2903,17 +2919,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -2924,9 +2941,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -2936,9 +2953,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -2948,9 +2965,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -2960,9 +2983,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -2972,9 +2995,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -2984,9 +3007,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -2996,9 +3019,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -3029,7 +3052,7 @@ dependencies = [ "id-arena", "indexmap", "log", - "semver 1.0.22", + "semver 1.0.23", "serde", "serde_derive", "serde_json", @@ -3051,18 +3074,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", diff --git a/test-fixtures/Cargo.lock b/test-fixtures/Cargo.lock index eae19d4d..70c2d590 100644 --- a/test-fixtures/Cargo.lock +++ b/test-fixtures/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" [[package]] name = "base64" @@ -61,9 +61,9 @@ dependencies = [ [[package]] name = "fastly" -version = "0.9.11" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4118254fe63944b21073c5fe2d4addc34f021d805213ae9bd60964d3f498c6f" +checksum = "7ce91a71c1576ca56ff2de349550d175e70004515499c64c845b1b40a017b075" dependencies = [ "anyhow", "bytes", @@ -84,9 +84,9 @@ dependencies = [ [[package]] name = "fastly-macros" -version = "0.9.11" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad6d1c8deeffcdcf2f8b4fbe988f8c05ff474dedb8256aa465e371c6d5d3118" +checksum = "d5d5de12e9bc451138b281cee3cc57e8b1f3b46b7afb8d0d201e6b50d1f6b574" dependencies = [ "proc-macro2", "quote", @@ -95,9 +95,9 @@ dependencies = [ [[package]] name = "fastly-shared" -version = "0.9.11" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d63515f1dbea1485823992bd5fdef0e0807c7185234f58c20bff4bfeb41742b4" +checksum = "276812acf6f1b34029a5eb6ff3add7fe11452e1513762d02263a031097e68761" dependencies = [ "bitflags", "http", @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "fastly-sys" -version = "0.9.11" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41946803f764704d3f288f5ceeee3f3f2b4bad9f0812d02abb68e3a371fd59a6" +checksum = "9b71f4531944113114b69571608a2d9a98bca6a656ff6d7b87cac726ff70e00d" dependencies = [ "bitflags", "fastly-shared", @@ -173,9 +173,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "mime" @@ -197,18 +197,18 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -224,35 +224,35 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.61", ] [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -297,9 +297,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.58" +version = "2.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" dependencies = [ "proc-macro2", "quote", @@ -322,22 +322,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.61", ] [[package]] From 79eb6a215579c87c6809695182aa5730b13410e6 Mon Sep 17 00:00:00 2001 From: Trevor Elliott Date: Tue, 7 May 2024 17:00:11 -0700 Subject: [PATCH 5/6] Fix some more as_slice uses in wiggle_abi --- lib/src/wiggle_abi/backend_impl.rs | 72 +++++++++---------------- lib/src/wiggle_abi/body_impl.rs | 11 ++-- lib/src/wiggle_abi/obj_store_impl.rs | 10 ++-- lib/src/wiggle_abi/secret_store_impl.rs | 6 +-- 4 files changed, 34 insertions(+), 65 deletions(-) diff --git a/lib/src/wiggle_abi/backend_impl.rs b/lib/src/wiggle_abi/backend_impl.rs index 8a2c2657..0350448f 100644 --- a/lib/src/wiggle_abi/backend_impl.rs +++ b/lib/src/wiggle_abi/backend_impl.rs @@ -56,33 +56,21 @@ impl FastlyBackend for Session { nwritten_out: &wiggle::GuestPtr, ) -> Result<(), Error> { let backend = lookup_backend_definition(self, backend)?; - let mut value = value - .as_array(value_max_len) - .as_slice_mut()? - .ok_or(Error::SharedMemory)?; - let value_max_len: usize = value_max_len - .try_into() - .map_err(|_| Error::InvalidArgument)?; let host = backend.uri.host().expect("backend uri has host"); - match host.len() { - len_needed if len_needed > value_max_len => { - let len_needed = len_needed.try_into().expect("host.len() must fit in u32"); - nwritten_out.write(len_needed)?; - Err(Error::BufferLengthError { - buf: "host", - len: "host.len()", - }) - } - - len => { - let host = host.as_bytes(); - value[0..len].copy_from_slice(host); - let len = len.try_into().expect("host.len() must fit in u32"); - nwritten_out.write(len)?; - Ok(()) - } + let host_len = host.len().try_into().expect("host.len() must fit in u32"); + if host_len > value_max_len { + nwritten_out.write(host_len)?; + return Err(Error::BufferLengthError { + buf: "host", + len: "host.len()", + }); } + + let host = host.as_bytes(); + value.as_array(host_len).copy_from_slice(host)?; + nwritten_out.write(host_len)?; + Ok(()) } fn get_override_host<'a>( @@ -93,37 +81,25 @@ impl FastlyBackend for Session { nwritten_out: &wiggle::GuestPtr<'a, u32>, ) -> Result<(), Error> { let backend = lookup_backend_definition(self, backend)?; - let mut value = value - .as_array(value_max_len) - .as_slice_mut()? - .ok_or(Error::SharedMemory)?; - let value_max_len: usize = value_max_len - .try_into() - .map_err(|_| Error::InvalidArgument)?; let host = backend .override_host .as_ref() .ok_or(Error::ValueAbsent)? .to_str()?; - match host.len() { - len_needed if len_needed > value_max_len => { - let len_needed = len_needed.try_into().expect("host.len() must fit in u32"); - nwritten_out.write(len_needed)?; - Err(Error::BufferLengthError { - buf: "host", - len: "host.len()", - }) - } - - len => { - let host = host.as_bytes(); - value[0..len].copy_from_slice(host); - let len = len.try_into().expect("host.len() must fit in u32"); - nwritten_out.write(len)?; - Ok(()) - } + let host_len = host.len().try_into().expect("host.len() must fit in u32"); + if host_len > value_max_len { + nwritten_out.write(host_len)?; + return Err(Error::BufferLengthError { + buf: "host", + len: "host.len()", + }); } + + let host = host.as_bytes(); + value.as_array(host_len).copy_from_slice(host)?; + nwritten_out.write(host_len)?; + Ok(()) } fn get_port(&mut self, backend: &wiggle::GuestPtr) -> Result { diff --git a/lib/src/wiggle_abi/body_impl.rs b/lib/src/wiggle_abi/body_impl.rs index 2c5005d6..dc4e3865 100644 --- a/lib/src/wiggle_abi/body_impl.rs +++ b/lib/src/wiggle_abi/body_impl.rs @@ -53,11 +53,6 @@ impl FastlyHttpBody for Session { buf: &GuestPtr<'a, u8>, buf_len: u32, ) -> Result { - let mut buf_slice = buf - .as_array(buf_len) - .as_slice_mut()? - .ok_or(Error::SharedMemory)?; - // only normal bodies (not streaming bodies) can be read from let body = self.body_mut(body_handle)?; @@ -65,9 +60,11 @@ impl FastlyHttpBody for Session { // pass up any error encountered when reading a chunk let mut chunk = chunk?; // split the chunk, saving any bytes that don't fit into the destination buffer - let extra_bytes = chunk.split_off(std::cmp::min(buf_len as usize, chunk.len())); + let copy_len = std::cmp::min(buf_len as usize, chunk.len()); + let extra_bytes = chunk.split_off(copy_len); // `chunk.len()` is now the smaller of (1) the destination buffer and (2) the available data. - buf_slice[..chunk.len()].copy_from_slice(&chunk); + buf.as_array(u32::try_from(copy_len).unwrap()) + .copy_from_slice(&chunk)?; // if there are leftover bytes, put them back at the front of the body if !extra_bytes.is_empty() { body.push_front(extra_bytes); diff --git a/lib/src/wiggle_abi/obj_store_impl.rs b/lib/src/wiggle_abi/obj_store_impl.rs index b416bfc5..aa897511 100644 --- a/lib/src/wiggle_abi/obj_store_impl.rs +++ b/lib/src/wiggle_abi/obj_store_impl.rs @@ -38,7 +38,7 @@ impl FastlyObjectStore for Session { opt_body_handle_out: &GuestPtr, ) -> Result<(), Error> { let store = self.get_obj_store_key(store).unwrap(); - let key = ObjectKey::new(&*key.as_str()?.ok_or(Error::SharedMemory)?)?; + let key = ObjectKey::new(key.as_str()?.ok_or(Error::SharedMemory)?.to_string())?; match self.obj_lookup(store, &key) { Ok(obj) => { let new_handle = self.insert_body(Body::from(obj)); @@ -60,7 +60,7 @@ impl FastlyObjectStore for Session { opt_pending_body_handle_out: &GuestPtr, ) -> Result<(), Error> { let store = self.get_obj_store_key(store).unwrap(); - let key = ObjectKey::new(&*key.as_str()?.ok_or(Error::SharedMemory)?)?; + let key = ObjectKey::new(key.as_str()?.ok_or(Error::SharedMemory)?.to_string())?; // just create a future that's already ready let fut = futures::future::ok(self.obj_lookup(store, &key)); let task = PeekableTask::spawn(fut).await; @@ -98,7 +98,7 @@ impl FastlyObjectStore for Session { body_handle: BodyHandle, ) -> Result<(), Error> { let store = self.get_obj_store_key(store).unwrap().clone(); - let key = ObjectKey::new(&*key.as_str()?.ok_or(Error::SharedMemory)?)?; + let key = ObjectKey::new(key.as_str()?.ok_or(Error::SharedMemory)?.to_string())?; let bytes = self.take_body(body_handle)?.read_into_vec().await?; self.obj_insert(store, key, bytes)?; @@ -113,7 +113,7 @@ impl FastlyObjectStore for Session { opt_pending_body_handle_out: &GuestPtr, ) -> Result<(), Error> { let store = self.get_obj_store_key(store).unwrap().clone(); - let key = ObjectKey::new(&*key.as_str()?.ok_or(Error::SharedMemory)?)?; + let key = ObjectKey::new(key.as_str()?.ok_or(Error::SharedMemory)?.to_string())?; let bytes = self.take_body(body_handle)?.read_into_vec().await?; let fut = futures::future::ok(self.obj_insert(store, key, bytes)); let task = PeekableTask::spawn(fut).await; @@ -140,7 +140,7 @@ impl FastlyObjectStore for Session { opt_pending_delete_handle_out: &GuestPtr, ) -> Result<(), Error> { let store = self.get_obj_store_key(store).unwrap().clone(); - let key = ObjectKey::new(&*key.as_str()?.ok_or(Error::SharedMemory)?)?; + let key = ObjectKey::new(key.as_str()?.ok_or(Error::SharedMemory)?.to_string())?; let fut = futures::future::ok(self.obj_delete(store, key)); let task = PeekableTask::spawn(fut).await; opt_pending_delete_handle_out diff --git a/lib/src/wiggle_abi/secret_store_impl.rs b/lib/src/wiggle_abi/secret_store_impl.rs index 0e177809..d8e0fc30 100644 --- a/lib/src/wiggle_abi/secret_store_impl.rs +++ b/lib/src/wiggle_abi/secret_store_impl.rs @@ -128,11 +128,7 @@ impl FastlySecretStore for Session { plaintext_buf: &GuestPtr<'_, u8>, plaintext_len: u32, ) -> Result { - let plaintext = plaintext_buf - .as_array(plaintext_len) - .as_slice()? - .ok_or(Error::SharedMemory)? - .to_vec(); + let plaintext = plaintext_buf.as_array(plaintext_len).to_vec()?; Ok(self.add_secret(plaintext)) } } From a00699800441ad2d4b2eefe6acd2168d893ceeaf Mon Sep 17 00:00:00 2001 From: Trevor Elliott Date: Tue, 7 May 2024 17:02:55 -0700 Subject: [PATCH 6/6] Remove debugging eprintln! uses --- lib/src/logging.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/src/logging.rs b/lib/src/logging.rs index b9a250bf..572578fe 100644 --- a/lib/src/logging.rs +++ b/lib/src/logging.rs @@ -57,10 +57,7 @@ impl LogEndpoint { } to_write.push(b'\n'); - eprintln!("locking"); - LOG_WRITER.lock().unwrap().write_all(&to_write)?; - eprintln!("unlocking"); - Ok(()) + LOG_WRITER.lock().unwrap().write_all(&to_write) } }