From a08542d8c1f29d423c3c4f2e4e7b6fe1c9538bda Mon Sep 17 00:00:00 2001 From: Trevor Elliott Date: Thu, 26 Sep 2024 09:54:53 -0700 Subject: [PATCH 1/4] Update to wasmtime-25 --- Cargo.lock | 517 +++++++++++++++++---------------- Cargo.toml | 8 +- cli/tests/trap-test/Cargo.lock | 515 ++++++++++++++++---------------- test-fixtures/Cargo.lock | 60 ++-- 4 files changed, 563 insertions(+), 537 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 32789a28..274a74ab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,15 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli 0.28.1", -] - [[package]] name = "addr2line" version = "0.22.0" @@ -21,10 +12,13 @@ dependencies = [ ] [[package]] -name = "adler" -version = "1.0.2" +name = "addr2line" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +dependencies = [ + "gimli 0.31.0", +] [[package]] name = "adler2" @@ -119,9 +113,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "arbitrary" @@ -131,9 +125,9 @@ checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", @@ -148,17 +142,17 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ - "addr2line 0.22.0", - "cc", + "addr2line 0.24.1", "cfg-if", "libc", - "miniz_oxide 0.7.4", + "miniz_oxide", "object 0.36.4", "rustc-demangle", + "windows-targets", ] [[package]] @@ -206,9 +200,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "bytesize" @@ -218,9 +212,9 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "cap-fs-ext" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb23061fc1c4ead4e45ca713080fe768e6234e959f5a5c399c39eb41aa34e56e" +checksum = "712695628f77a28acd7c9135b9f05f9c1563f8eb91b317f63876bac550032403" dependencies = [ "cap-primitives", "cap-std", @@ -230,9 +224,9 @@ dependencies = [ [[package]] name = "cap-net-ext" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83ae11f116bcbafc5327c6af250341db96b5930046732e1905f7dc65887e0e1" +checksum = "7d609980992759cef960324ccece956ee87929cc05a75d6546168192063dd8b1" dependencies = [ "cap-primitives", "cap-std", @@ -242,9 +236,9 @@ dependencies = [ [[package]] name = "cap-primitives" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d00bd8d26c4270d950eaaa837387964a2089a1c3c349a690a1fa03221d29531" +checksum = "ff5bcbaf57897c8f14098cc9ad48a78052930a9948119eea01b80ca224070fa6" dependencies = [ "ambient-authority", "fs-set-times", @@ -259,9 +253,9 @@ dependencies = [ [[package]] name = "cap-rand" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbcb16a619d8b8211ed61f42bd290d2a1ac71277a69cf8417ec0996fa92f5211" +checksum = "e7c780812948b31f362c3bab82d23b902529c26705d0e094888bc7fdb9656908" dependencies = [ "ambient-authority", "rand", @@ -269,9 +263,9 @@ dependencies = [ [[package]] name = "cap-std" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19eb8e3d71996828751c1ed3908a439639752ac6bdc874e41469ef7fc15fbd7f" +checksum = "e6cf1a22e6eab501e025a9953532b1e95efb8a18d6364bf8a4a7547b30c49186" dependencies = [ "cap-primitives", "io-extras", @@ -281,9 +275,9 @@ dependencies = [ [[package]] name = "cap-time-ext" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61142dc51e25b7acc970ca578ce2c3695eac22bbba46c1073f5f583e78957725" +checksum = "1e1547a95cd071db92382c649260bcc6721879ef5d1f0f442af33bff75003dd7" dependencies = [ "ambient-authority", "cap-primitives", @@ -295,9 +289,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.15" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" dependencies = [ "jobserver", "libc", @@ -312,9 +306,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.16" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" dependencies = [ "clap_builder", "clap_derive", @@ -322,9 +316,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" dependencies = [ "anstream", "anstyle", @@ -334,9 +328,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.13" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -389,37 +383,48 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] [[package]] name = "cranelift-bforest" -version = "0.109.0" +version = "0.112.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6e376bd92bddd03dcfc443b14382611cae5d10012aa0b1628bbf18bb73f12f7" +dependencies = [ + "cranelift-entity 0.112.1", +] + +[[package]] +name = "cranelift-bitset" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6b33d7e757a887989eb18b35712b2a67d96171ec3149d1bfb657b29b7b367c" +checksum = "45ecbe07f25a8100e5077933516200e97808f1d7196b5a073edb85fa08fde32e" dependencies = [ - "cranelift-entity 0.109.0", + "serde", + "serde_derive", ] [[package]] name = "cranelift-codegen" -version = "0.109.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9acf15cb22be42d07c3b57d7856329cb228b7315d385346149df2566ad5e4aa" +checksum = "bc60913f32c1de18538c28bef74b8c87cf16de7841a1b0956fcf01b23237853a" dependencies = [ "bumpalo", "cranelift-bforest", + "cranelift-bitset", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-control", - "cranelift-entity 0.109.0", + "cranelift-entity 0.112.1", "cranelift-isle", - "gimli 0.28.1", - "hashbrown 0.14.5", + "gimli 0.29.0", + "hashbrown", "log", "regalloc2", "rustc-hash", @@ -429,24 +434,24 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.109.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e934d301392b73b3f8b0540391fb82465a0f179a3cee7c726482ac4727efcc97" +checksum = "bae009e7822f47aa55e7dcef846ccf3aa4eb102ca6b4bcb8a44b36f3f49aa85c" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.109.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb2a2566b3d54b854dfb288b3b187f6d3d17d6f762c92898207eba302931da" +checksum = "0c78f01a852536c68e34444450f845ed6e0782a1f047f85397fe460b8fbce8f1" [[package]] name = "cranelift-control" -version = "0.109.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0100f33b704cdacd01ad66ff41f8c5030d57cbff078e2a4e49ab1822591299fa" +checksum = "7a061b22e00a9e36b31f2660dfb05a9617b7775bd54b79754d3bb75a990dac06" dependencies = [ "arbitrary", ] @@ -459,19 +464,20 @@ checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352" [[package]] name = "cranelift-entity" -version = "0.109.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8cfdc315e5d18997093e040a8d234bea1ac1e118a716d3e30f40d449e78207b" +checksum = "95e2b261a3e74ae42f4e606906d5ffa44ee2684e8b1ae23bdf75d21908dc9233" dependencies = [ + "cranelift-bitset", "serde", "serde_derive", ] [[package]] name = "cranelift-frontend" -version = "0.109.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f74b84f16af2e982b0c0c72233503d9d55cbfe3865dbe807ca28dc6642a28b5" +checksum = "fe14abba0e6bab42aca0f9ce757f96880f9187e88bc6cb975ed6acd8a42f7770" dependencies = [ "cranelift-codegen", "log", @@ -481,15 +487,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.109.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adf306d3dde705fb94bd48082f01d38c4ededc74293a4c007805f610bf08bc6e" +checksum = "311d91ae72b37d4262b51217baf8c9e01f1afd5148931468da1fdb7e9d011347" [[package]] name = "cranelift-native" -version = "0.109.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ea0ebdef7aff4a79bcbc8b6495f31315f16b3bf311152f472eaa8d679352581" +checksum = "2a3f84c75e578189ff7a716c24ad83740b553bf583f2510b323bfe4c1a74bb93" dependencies = [ "cranelift-codegen", "libc", @@ -498,17 +504,17 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.109.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d549108a1942065cdbac3bb96c2952afa0e1b9a3beff4b08c4308ac72257576d" +checksum = "f56b7b2476c47b2091eee5a20bc54a80fbb29ca5313ae2bd0dea52621abcfca1" dependencies = [ "cranelift-codegen", - "cranelift-entity 0.109.0", + "cranelift-entity 0.112.1", "cranelift-frontend", "itertools 0.12.1", "log", "smallvec", - "wasmparser 0.209.1", + "wasmparser 0.217.0", "wasmtime-types", ] @@ -563,7 +569,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.5", + "hashbrown", "lock_api", "once_cell", "parking_lot_core", @@ -693,9 +699,9 @@ checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "fastly-shared" -version = "0.10.4" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00c7cd62059abdcc8d2565e9c1e63c195a7cd0fddd4851148265c6c428471b0d" +checksum = "8d3d3fae2a497c92302b8f86365c26027345800ead360c758ed6dc25f743fbde" dependencies = [ "bitflags 1.3.2", "http 1.1.0", @@ -725,7 +731,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide 0.8.0", + "miniz_oxide", ] [[package]] @@ -888,9 +894,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" dependencies = [ "fallible-iterator", "indexmap", @@ -899,9 +905,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "h2" @@ -922,15 +928,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash", -] - [[package]] name = "hashbrown" version = "0.14.5" @@ -1042,9 +1039,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1086,7 +1083,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown", "serde", ] @@ -1108,9 +1105,9 @@ checksum = "5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c" [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "is-terminal" @@ -1205,9 +1202,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libloading" @@ -1296,24 +1293,6 @@ dependencies = [ "rustix", ] -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.8.0" @@ -1361,7 +1340,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "crc32fast", - "hashbrown 0.14.5", + "hashbrown", "indexmap", "memchr", ] @@ -1380,9 +1359,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openvino" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24bd3a7ef39968e6a4f1b1206c1c876f9bd50cf739ccbcd69f8539bbac5dcc7a" +checksum = "aee013796927eec6012a344f10ecdc06bf26de79c626a2395e3f115464907ef6" dependencies = [ "openvino-finder", "openvino-sys", @@ -1391,9 +1370,9 @@ dependencies = [ [[package]] name = "openvino-finder" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d234d1394a413ea8adaf0c40806b9ad1946be6310b441f688840654a331973" +checksum = "af4c6841df4cd60fef743015f3348f81b6b225bd255ed0c4cab6e8c479e45eaa" dependencies = [ "cfg-if", "log", @@ -1401,9 +1380,9 @@ dependencies = [ [[package]] name = "openvino-sys" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c98acf37fc84ad9d7da4dc6c18f0f60ad209b43a6f555be01f9003d0a2a43d" +checksum = "f62fc2bd6882f2300a6b5017eaad292586d70995d333582aabcf1f1121cd147c" dependencies = [ "env_logger", "libloading", @@ -1486,9 +1465,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "postcard" @@ -1590,9 +1569,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "355ae415ccd3a04315d3f8246e86d67689ea74d88d915576e1589a351062a13b" dependencies = [ "bitflags 2.6.0", ] @@ -1610,11 +1589,11 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.9.3" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" +checksum = "12908dbeb234370af84d0579b9f68258a0f67e201412dd9a2814e6f45b2fc0f0" dependencies = [ - "hashbrown 0.13.2", + "hashbrown", "log", "rustc-hash", "slice-group-by", @@ -1688,15 +1667,15 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" -version = "1.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustix" -version = "0.38.35" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -1767,11 +1746,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1805,9 +1784,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -1827,6 +1806,9 @@ name = "semver" version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +dependencies = [ + "serde", +] [[package]] name = "semver-parser" @@ -1836,18 +1818,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -1856,9 +1838,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -1868,9 +1850,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -2078,18 +2060,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", @@ -2176,9 +2158,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -2219,9 +2201,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.20" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "serde", @@ -2327,30 +2309,30 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-xid" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "untrusted" @@ -2571,18 +2553,9 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.209.1" +version = "0.217.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4a05336882dae732ce6bd48b7e11fe597293cb72c13da4f35d7d5f8d53b2a7" -dependencies = [ - "leb128", -] - -[[package]] -name = "wasm-encoder" -version = "0.216.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c23aebea22c8a75833ae08ed31ccc020835b12a41999e58c31464271b94a88" +checksum = "7b88b0814c9a2b323a9b46c687e726996c255ac8b64aa237dd11c81ed4854760" dependencies = [ "leb128", ] @@ -2611,7 +2584,7 @@ checksum = "dd921789c9dcc495f589cb37d200155dee65b4a4beeb853323b5e24e0a5f9c58" dependencies = [ "ahash", "bitflags 2.6.0", - "hashbrown 0.14.5", + "hashbrown", "indexmap", "semver 1.0.23", "serde", @@ -2619,13 +2592,13 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.209.1" +version = "0.217.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07035cc9a9b41e62d3bb3a3815a66ab87c993c06fe1cf6b2a3f2a18499d937db" +checksum = "ca917a21307d3adf2b9857b94dd05ebf8496bdcff4437a9b9fb3899d3e6c74e7" dependencies = [ "ahash", "bitflags 2.6.0", - "hashbrown 0.14.5", + "hashbrown", "indexmap", "semver 1.0.23", "serde", @@ -2633,30 +2606,32 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.209.1" +version = "0.217.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceca8ae6eaa8c7c87b33c25c53bdf299f8c2a764aee1179402ff7652ef3a6859" +checksum = "50dc568b3e0d47e8f96ea547c90790cfa783f0205160c40de894a427114185ce" dependencies = [ "anyhow", - "wasmparser 0.209.1", + "termcolor", + "wasmparser 0.217.0", ] [[package]] name = "wasmtime" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "786d8b5e7a4d54917c5ebe555b9667337e5f93383f49bddaaeec2eba68093b45" +checksum = "03601559991d459a228236a49135364eac85ac00dc07b65fb95ae61a957793af" dependencies = [ - "addr2line 0.21.0", + "addr2line 0.22.0", "anyhow", "async-trait", + "bitflags 2.6.0", "bumpalo", "cc", "cfg-if", "encoding_rs", "fxprof-processed-profile", - "gimli 0.28.1", - "hashbrown 0.14.5", + "gimli 0.29.0", + "hashbrown", "indexmap", "ittapi", "libc", @@ -2664,7 +2639,6 @@ dependencies = [ "log", "mach2", "memfd", - "memoffset", "object 0.36.4", "once_cell", "paste", @@ -2679,8 +2653,8 @@ dependencies = [ "smallvec", "sptr", "target-lexicon", - "wasm-encoder 0.209.1", - "wasmparser 0.209.1", + "wasm-encoder 0.217.0", + "wasmparser 0.217.0", "wasmtime-asm-macros", "wasmtime-cache", "wasmtime-component-macro", @@ -2699,18 +2673,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d697d99c341d4a9ffb72f3af7a02124d233eeb59aee010f36d88e97cca553d5e" +checksum = "e453b3bde07312874c0c6703e2de9281daab46646172c1b71fa59a97226f858e" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "916610f9ae9a6c22deb25bba2e6247ba9f00b093d30620875203b91328a1adfa" +checksum = "a35e1d7cce7b536cc71955e5898b099104a577d2583694b7b31a6f38c14c04a3" dependencies = [ "anyhow", "base64", @@ -2728,9 +2702,9 @@ dependencies = [ [[package]] name = "wasmtime-component-macro" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b29b462b068e73b5b27fae092a27f47e5937cabf6b26be2779c978698a52feca" +checksum = "4a6faeabbdbfd27e24e8d5204207ba9c247a13cf84181ea721b5f209f281fe01" dependencies = [ "anyhow", "proc-macro2", @@ -2738,59 +2712,62 @@ dependencies = [ "syn", "wasmtime-component-util", "wasmtime-wit-bindgen", - "wit-parser 0.209.1", + "wit-parser 0.217.0", ] [[package]] name = "wasmtime-component-util" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d2912c53d9054984b380dfbd7579f9c3681b2a73b903a56bd71a1c4f175f1e" +checksum = "6b1b24db4aa3dc7c0d3181d1833b4fe9ec0cd3f08780b746415c84c0a9ec9011" [[package]] name = "wasmtime-cranelift" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3975deafea000457ba84355c7c0fce0372937204f77026510b7b454f28a3a65" +checksum = "c737bef9ea94aab874e29ac6a8688b89ceb43c7b51f047079c43387972c07ee3" dependencies = [ "anyhow", "cfg-if", "cranelift-codegen", "cranelift-control", - "cranelift-entity 0.109.0", + "cranelift-entity 0.112.1", "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.28.1", + "gimli 0.29.0", "log", "object 0.36.4", + "smallvec", "target-lexicon", "thiserror", - "wasmparser 0.209.1", + "wasmparser 0.217.0", "wasmtime-environ", "wasmtime-versioned-export-macros", ] [[package]] name = "wasmtime-environ" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f444e900e848b884d8a8a2949b6f5b92af642a3e663ff8fbe78731143a55be61" +checksum = "817bfa9ea878ec37aa24f85fd6912844e8d87d321662824cf920d561b698cdfd" dependencies = [ "anyhow", "cpp_demangle", - "cranelift-entity 0.109.0", - "gimli 0.28.1", + "cranelift-bitset", + "cranelift-entity 0.112.1", + "gimli 0.29.0", "indexmap", "log", "object 0.36.4", "postcard", "rustc-demangle", + "semver 1.0.23", "serde", "serde_derive", "target-lexicon", - "wasm-encoder 0.209.1", - "wasmparser 0.209.1", + "wasm-encoder 0.217.0", + "wasmparser 0.217.0", "wasmprinter", "wasmtime-component-util", "wasmtime-types", @@ -2798,9 +2775,9 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ded58eb2d1bf0dcd2182d0ccd7055c4b10b50d711514f1d73f61515d0fa829d" +checksum = "5070971b479b4e4879dbae8a8e1efee738a36d047c5738acfedb38d6740b79d1" dependencies = [ "anyhow", "cc", @@ -2813,9 +2790,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bc54198c6720f098210a85efb3ba8c078d1de4d373cdb6778850a66ae088d11" +checksum = "26fd0000903068c13465b9c023f56f0664f433035cbbd8eae69aa7c755f97637" dependencies = [ "object 0.36.4", "once_cell", @@ -2825,9 +2802,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5afe2f0499542f9a4bcfa1b55bfdda803b6ade4e7c93c6b99e0f39dba44b0a91" +checksum = "48011232c0da424f89c3752a378d0b7f512fae321ea414a43e1e7a302a6a1f7e" dependencies = [ "anyhow", "cfg-if", @@ -2837,28 +2814,29 @@ dependencies = [ [[package]] name = "wasmtime-slab" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a7de1f2bec5bbb35d532e61c85c049dc84ae671df60492f90b954ecf21169e7" +checksum = "d9858a22e656ae8574631221b474b8bebf63f1367fcac3f179873833eabc2ced" [[package]] name = "wasmtime-types" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "412463e9000e14cf6856be48628d2213c20c153e29ffc22b036980c892ea6964" +checksum = "4d14b8a9206fe94485a03edb1654cd530dbd2a859a85a43502cb4e99653a568c" dependencies = [ - "cranelift-entity 0.109.0", + "anyhow", + "cranelift-entity 0.112.1", "serde", "serde_derive", "smallvec", - "wasmparser 0.209.1", + "wasmparser 0.217.0", ] [[package]] name = "wasmtime-versioned-export-macros" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5a9bc4f44ceeb168e9e8e3be4e0b4beb9095b468479663a9e24c667e36826f" +checksum = "e9bb1f01efb8b542eadfda511e8ea1cc54309451aba97b69969e5b1a59cb7ded" dependencies = [ "proc-macro2", "quote", @@ -2867,9 +2845,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8abb1301089ed8e0b4840f539cba316a73ac382090f1b25d22d8c8eed8df49c7" +checksum = "2cc26a3923937186f5a4a4fa44d9dd1a7a389bbb06f8bac03cde2d52aad3ace8" dependencies = [ "anyhow", "async-trait", @@ -2898,9 +2876,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi-nn" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74ad60f6406604fced9fdd9693cd0d17d30e041bb2a652eb75fdab741f79c59e" +checksum = "b910699bc00ffb609a13d6bfe31e32bae052efa56a91cdbd9e9ceda39bcafea3" dependencies = [ "anyhow", "openvino", @@ -2909,20 +2887,21 @@ dependencies = [ "walkdir", "wasmtime", "wiggle", + "windows", ] [[package]] name = "wasmtime-winch" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed4db238a0241df2d15f79ad17b3a37a27f2ea6cb885894d81b42ae107544466" +checksum = "b238eeaf55652df0e63a6829d1ca9ef726d63517f56194faa0f6b9941f8d9151" dependencies = [ "anyhow", "cranelift-codegen", - "gimli 0.28.1", + "gimli 0.29.0", "object 0.36.4", "target-lexicon", - "wasmparser 0.209.1", + "wasmparser 0.217.0", "wasmtime-cranelift", "wasmtime-environ", "winch-codegen", @@ -2930,14 +2909,14 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc077306b38288262e5ba01d4b21532a6987416cdc0aedf04bb06c22a68fdc" +checksum = "eb1596caa67b31ac675fd3da61685c4260f8b10832021db42c85d227b7ba8133" dependencies = [ "anyhow", "heck 0.4.1", "indexmap", - "wit-parser 0.209.1", + "wit-parser 0.217.0", ] [[package]] @@ -2951,31 +2930,31 @@ dependencies = [ [[package]] name = "wast" -version = "216.0.0" +version = "217.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7eb1f2eecd913fdde0dc6c3439d0f24530a98ac6db6cb3d14d92a5328554a08" +checksum = "79004ecebded92d3c710d4841383368c7f04b63d0992ddd6b0c7d5029b7629b7" dependencies = [ "bumpalo", "leb128", "memchr", "unicode-width", - "wasm-encoder 0.216.0", + "wasm-encoder 0.217.0", ] [[package]] name = "wat" -version = "1.216.0" +version = "1.217.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac0409090fb5154f95fb5ba3235675fd9e579e731524d63b6a2f653e1280c82a" +checksum = "c126271c3d92ca0f7c63e4e462e40c69cca52fd4245fcda730d1cf558fb55088" dependencies = [ - "wast 216.0.0", + "wast 217.0.0", ] [[package]] name = "wiggle" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29830e5d01c182d24b94092c697aa7ab0ee97d22e78a2bf40ca91eae6ebca5c2" +checksum = "e998c11dd3f293a8f657ce14e9c8fdc5cddd858f1e6448290d4ec04ca7ffe5b7" dependencies = [ "anyhow", "async-trait", @@ -2989,9 +2968,9 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "557567f2793508760cd855f7659b7a0b9dc4dbc451f53f1415d6943a15311ade" +checksum = "d0d8db385e5207c1ac431837868c8e48fc3f7e81f3a146793086d661875520ec" dependencies = [ "anyhow", "heck 0.4.1", @@ -3004,9 +2983,9 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc26129a8aea20b62c961d1b9ab4a3c3b56b10042ed85d004f8678af0f21ba6e" +checksum = "2706ee9e7d1e106de80a3b3c6ec2f42920149e2def3e8060187c8e61f99bc0ef" dependencies = [ "proc-macro2", "quote", @@ -3047,21 +3026,33 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "0.20.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c6915884e731b2db0d8cf08cb64474cb69221a161675fd3c135f91febc3daa" +checksum = "4ac790aaeff15764481c731239a45346df3f0af966839ac1575f49989fdbb542" dependencies = [ "anyhow", "cranelift-codegen", - "gimli 0.28.1", + "gimli 0.29.0", "regalloc2", "smallvec", "target-lexicon", - "wasmparser 0.209.1", + "wasmparser 0.217.0", "wasmtime-cranelift", "wasmtime-environ", ] +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-implement", + "windows-interface", + "windows-targets", +] + [[package]] name = "windows-core" version = "0.52.0" @@ -3071,6 +3062,28 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "windows-implement" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-interface" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "windows-sys" version = "0.52.0" @@ -3155,9 +3168,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -3250,9 +3263,9 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.209.1" +version = "0.217.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e79b9e3c0b6bb589dec46317e645851e0db2734c44e2be5e251b03ff4a51269" +checksum = "fb893dcd6d370cfdf19a0d9adfcd403efb8e544e1a0ea3a8b81a21fe392eaa78" dependencies = [ "anyhow", "id-arena", @@ -3263,7 +3276,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.209.1", + "wasmparser 0.217.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index c2fde00e..e4e78491 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,10 +41,10 @@ futures = "0.3.24" url = "2.3.1" # Wasmtime dependencies -wasmtime = "22.0.0" -wasmtime-wasi = "22.0.0" -wasmtime-wasi-nn = "22.0.0" -wiggle = "22.0.0" +wasmtime = "25.0.0" +wasmtime-wasi = "25.0.0" +wasmtime-wasi-nn = "25.0.0" +wiggle = "25.0.0" wat = "1.212.0" wasmparser = "0.208.0" wasm-encoder = { version = "0.208.0", features = ["wasmparser"] } diff --git a/cli/tests/trap-test/Cargo.lock b/cli/tests/trap-test/Cargo.lock index d5d0ae38..d94e855c 100644 --- a/cli/tests/trap-test/Cargo.lock +++ b/cli/tests/trap-test/Cargo.lock @@ -2,15 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli 0.28.1", -] - [[package]] name = "addr2line" version = "0.22.0" @@ -21,10 +12,13 @@ dependencies = [ ] [[package]] -name = "adler" -version = "1.0.2" +name = "addr2line" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +dependencies = [ + "gimli 0.31.0", +] [[package]] name = "adler2" @@ -134,9 +128,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "arbitrary" @@ -146,9 +140,9 @@ checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", @@ -163,17 +157,17 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ - "addr2line 0.22.0", - "cc", + "addr2line 0.24.1", "cfg-if", "libc", - "miniz_oxide 0.7.4", + "miniz_oxide", "object", "rustc-demangle", + "windows-targets", ] [[package]] @@ -217,9 +211,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "bytesize" @@ -229,9 +223,9 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "cap-fs-ext" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb23061fc1c4ead4e45ca713080fe768e6234e959f5a5c399c39eb41aa34e56e" +checksum = "712695628f77a28acd7c9135b9f05f9c1563f8eb91b317f63876bac550032403" dependencies = [ "cap-primitives", "cap-std", @@ -241,9 +235,9 @@ dependencies = [ [[package]] name = "cap-net-ext" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83ae11f116bcbafc5327c6af250341db96b5930046732e1905f7dc65887e0e1" +checksum = "7d609980992759cef960324ccece956ee87929cc05a75d6546168192063dd8b1" dependencies = [ "cap-primitives", "cap-std", @@ -253,9 +247,9 @@ dependencies = [ [[package]] name = "cap-primitives" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d00bd8d26c4270d950eaaa837387964a2089a1c3c349a690a1fa03221d29531" +checksum = "ff5bcbaf57897c8f14098cc9ad48a78052930a9948119eea01b80ca224070fa6" dependencies = [ "ambient-authority", "fs-set-times", @@ -270,9 +264,9 @@ dependencies = [ [[package]] name = "cap-rand" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbcb16a619d8b8211ed61f42bd290d2a1ac71277a69cf8417ec0996fa92f5211" +checksum = "e7c780812948b31f362c3bab82d23b902529c26705d0e094888bc7fdb9656908" dependencies = [ "ambient-authority", "rand", @@ -280,9 +274,9 @@ dependencies = [ [[package]] name = "cap-std" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19eb8e3d71996828751c1ed3908a439639752ac6bdc874e41469ef7fc15fbd7f" +checksum = "e6cf1a22e6eab501e025a9953532b1e95efb8a18d6364bf8a4a7547b30c49186" dependencies = [ "cap-primitives", "io-extras", @@ -292,9 +286,9 @@ dependencies = [ [[package]] name = "cap-time-ext" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61142dc51e25b7acc970ca578ce2c3695eac22bbba46c1073f5f583e78957725" +checksum = "1e1547a95cd071db92382c649260bcc6721879ef5d1f0f442af33bff75003dd7" dependencies = [ "ambient-authority", "cap-primitives", @@ -306,9 +300,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.15" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" dependencies = [ "jobserver", "libc", @@ -335,9 +329,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.16" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" dependencies = [ "clap_builder", "clap_derive", @@ -345,9 +339,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" dependencies = [ "anstream", "anstyle", @@ -357,9 +351,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.13" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -412,37 +406,48 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] [[package]] name = "cranelift-bforest" -version = "0.109.0" +version = "0.112.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6e376bd92bddd03dcfc443b14382611cae5d10012aa0b1628bbf18bb73f12f7" +dependencies = [ + "cranelift-entity 0.112.1", +] + +[[package]] +name = "cranelift-bitset" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6b33d7e757a887989eb18b35712b2a67d96171ec3149d1bfb657b29b7b367c" +checksum = "45ecbe07f25a8100e5077933516200e97808f1d7196b5a073edb85fa08fde32e" dependencies = [ - "cranelift-entity 0.109.0", + "serde", + "serde_derive", ] [[package]] name = "cranelift-codegen" -version = "0.109.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9acf15cb22be42d07c3b57d7856329cb228b7315d385346149df2566ad5e4aa" +checksum = "bc60913f32c1de18538c28bef74b8c87cf16de7841a1b0956fcf01b23237853a" dependencies = [ "bumpalo", "cranelift-bforest", + "cranelift-bitset", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-control", - "cranelift-entity 0.109.0", + "cranelift-entity 0.112.1", "cranelift-isle", - "gimli 0.28.1", - "hashbrown 0.14.5", + "gimli 0.29.0", + "hashbrown", "log", "regalloc2", "rustc-hash", @@ -452,24 +457,24 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.109.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e934d301392b73b3f8b0540391fb82465a0f179a3cee7c726482ac4727efcc97" +checksum = "bae009e7822f47aa55e7dcef846ccf3aa4eb102ca6b4bcb8a44b36f3f49aa85c" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.109.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb2a2566b3d54b854dfb288b3b187f6d3d17d6f762c92898207eba302931da" +checksum = "0c78f01a852536c68e34444450f845ed6e0782a1f047f85397fe460b8fbce8f1" [[package]] name = "cranelift-control" -version = "0.109.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0100f33b704cdacd01ad66ff41f8c5030d57cbff078e2a4e49ab1822591299fa" +checksum = "7a061b22e00a9e36b31f2660dfb05a9617b7775bd54b79754d3bb75a990dac06" dependencies = [ "arbitrary", ] @@ -482,19 +487,20 @@ checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352" [[package]] name = "cranelift-entity" -version = "0.109.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8cfdc315e5d18997093e040a8d234bea1ac1e118a716d3e30f40d449e78207b" +checksum = "95e2b261a3e74ae42f4e606906d5ffa44ee2684e8b1ae23bdf75d21908dc9233" dependencies = [ + "cranelift-bitset", "serde", "serde_derive", ] [[package]] name = "cranelift-frontend" -version = "0.109.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f74b84f16af2e982b0c0c72233503d9d55cbfe3865dbe807ca28dc6642a28b5" +checksum = "fe14abba0e6bab42aca0f9ce757f96880f9187e88bc6cb975ed6acd8a42f7770" dependencies = [ "cranelift-codegen", "log", @@ -504,15 +510,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.109.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adf306d3dde705fb94bd48082f01d38c4ededc74293a4c007805f610bf08bc6e" +checksum = "311d91ae72b37d4262b51217baf8c9e01f1afd5148931468da1fdb7e9d011347" [[package]] name = "cranelift-native" -version = "0.109.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ea0ebdef7aff4a79bcbc8b6495f31315f16b3bf311152f472eaa8d679352581" +checksum = "2a3f84c75e578189ff7a716c24ad83740b553bf583f2510b323bfe4c1a74bb93" dependencies = [ "cranelift-codegen", "libc", @@ -521,17 +527,17 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.109.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d549108a1942065cdbac3bb96c2952afa0e1b9a3beff4b08c4308ac72257576d" +checksum = "f56b7b2476c47b2091eee5a20bc54a80fbb29ca5313ae2bd0dea52621abcfca1" dependencies = [ "cranelift-codegen", - "cranelift-entity 0.109.0", + "cranelift-entity 0.112.1", "cranelift-frontend", "itertools 0.12.1", "log", "smallvec", - "wasmparser 0.209.1", + "wasmparser 0.217.0", "wasmtime-types", ] @@ -703,9 +709,9 @@ checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "fastly-shared" -version = "0.10.4" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00c7cd62059abdcc8d2565e9c1e63c195a7cd0fddd4851148265c6c428471b0d" +checksum = "8d3d3fae2a497c92302b8f86365c26027345800ead360c758ed6dc25f743fbde" dependencies = [ "bitflags 1.3.2", "http 1.1.0", @@ -729,7 +735,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide 0.8.0", + "miniz_oxide", ] [[package]] @@ -892,9 +898,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" dependencies = [ "fallible-iterator", "indexmap", @@ -903,9 +909,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "h2" @@ -926,15 +932,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash", -] - [[package]] name = "hashbrown" version = "0.14.5" @@ -1046,9 +1043,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1090,7 +1087,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown", "serde", ] @@ -1112,9 +1109,9 @@ checksum = "5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c" [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "is-terminal" @@ -1209,9 +1206,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libloading" @@ -1300,24 +1297,6 @@ dependencies = [ "rustix", ] -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.8.0" @@ -1355,7 +1334,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "crc32fast", - "hashbrown 0.14.5", + "hashbrown", "indexmap", "memchr", ] @@ -1374,9 +1353,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openvino" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24bd3a7ef39968e6a4f1b1206c1c876f9bd50cf739ccbcd69f8539bbac5dcc7a" +checksum = "aee013796927eec6012a344f10ecdc06bf26de79c626a2395e3f115464907ef6" dependencies = [ "openvino-finder", "openvino-sys", @@ -1385,9 +1364,9 @@ dependencies = [ [[package]] name = "openvino-finder" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d234d1394a413ea8adaf0c40806b9ad1946be6310b441f688840654a331973" +checksum = "af4c6841df4cd60fef743015f3348f81b6b225bd255ed0c4cab6e8c479e45eaa" dependencies = [ "cfg-if", "log", @@ -1395,9 +1374,9 @@ dependencies = [ [[package]] name = "openvino-sys" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c98acf37fc84ad9d7da4dc6c18f0f60ad209b43a6f555be01f9003d0a2a43d" +checksum = "f62fc2bd6882f2300a6b5017eaad292586d70995d333582aabcf1f1121cd147c" dependencies = [ "env_logger", "libloading", @@ -1474,9 +1453,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "postcard" @@ -1578,9 +1557,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "355ae415ccd3a04315d3f8246e86d67689ea74d88d915576e1589a351062a13b" dependencies = [ "bitflags 2.6.0", ] @@ -1598,11 +1577,11 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.9.3" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" +checksum = "12908dbeb234370af84d0579b9f68258a0f67e201412dd9a2814e6f45b2fc0f0" dependencies = [ - "hashbrown 0.13.2", + "hashbrown", "log", "rustc-hash", "slice-group-by", @@ -1676,15 +1655,15 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" -version = "1.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustix" -version = "0.38.35" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -1755,11 +1734,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1793,9 +1772,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -1815,6 +1794,9 @@ name = "semver" version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +dependencies = [ + "serde", +] [[package]] name = "semver-parser" @@ -1824,18 +1806,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -1844,9 +1826,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -1856,9 +1838,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -2028,18 +2010,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", @@ -2112,9 +2094,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -2155,9 +2137,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.20" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "serde", @@ -2290,30 +2272,30 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-xid" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "untrusted" @@ -2493,18 +2475,9 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.209.1" +version = "0.217.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4a05336882dae732ce6bd48b7e11fe597293cb72c13da4f35d7d5f8d53b2a7" -dependencies = [ - "leb128", -] - -[[package]] -name = "wasm-encoder" -version = "0.216.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c23aebea22c8a75833ae08ed31ccc020835b12a41999e58c31464271b94a88" +checksum = "7b88b0814c9a2b323a9b46c687e726996c255ac8b64aa237dd11c81ed4854760" dependencies = [ "leb128", ] @@ -2533,7 +2506,7 @@ checksum = "dd921789c9dcc495f589cb37d200155dee65b4a4beeb853323b5e24e0a5f9c58" dependencies = [ "ahash", "bitflags 2.6.0", - "hashbrown 0.14.5", + "hashbrown", "indexmap", "semver 1.0.23", "serde", @@ -2541,13 +2514,13 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.209.1" +version = "0.217.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07035cc9a9b41e62d3bb3a3815a66ab87c993c06fe1cf6b2a3f2a18499d937db" +checksum = "ca917a21307d3adf2b9857b94dd05ebf8496bdcff4437a9b9fb3899d3e6c74e7" dependencies = [ "ahash", "bitflags 2.6.0", - "hashbrown 0.14.5", + "hashbrown", "indexmap", "semver 1.0.23", "serde", @@ -2555,30 +2528,32 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.209.1" +version = "0.217.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceca8ae6eaa8c7c87b33c25c53bdf299f8c2a764aee1179402ff7652ef3a6859" +checksum = "50dc568b3e0d47e8f96ea547c90790cfa783f0205160c40de894a427114185ce" dependencies = [ "anyhow", - "wasmparser 0.209.1", + "termcolor", + "wasmparser 0.217.0", ] [[package]] name = "wasmtime" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "786d8b5e7a4d54917c5ebe555b9667337e5f93383f49bddaaeec2eba68093b45" +checksum = "03601559991d459a228236a49135364eac85ac00dc07b65fb95ae61a957793af" dependencies = [ - "addr2line 0.21.0", + "addr2line 0.22.0", "anyhow", "async-trait", + "bitflags 2.6.0", "bumpalo", "cc", "cfg-if", "encoding_rs", "fxprof-processed-profile", - "gimli 0.28.1", - "hashbrown 0.14.5", + "gimli 0.29.0", + "hashbrown", "indexmap", "ittapi", "libc", @@ -2586,7 +2561,6 @@ dependencies = [ "log", "mach2", "memfd", - "memoffset", "object", "once_cell", "paste", @@ -2601,8 +2575,8 @@ dependencies = [ "smallvec", "sptr", "target-lexicon", - "wasm-encoder 0.209.1", - "wasmparser 0.209.1", + "wasm-encoder 0.217.0", + "wasmparser 0.217.0", "wasmtime-asm-macros", "wasmtime-cache", "wasmtime-component-macro", @@ -2621,18 +2595,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d697d99c341d4a9ffb72f3af7a02124d233eeb59aee010f36d88e97cca553d5e" +checksum = "e453b3bde07312874c0c6703e2de9281daab46646172c1b71fa59a97226f858e" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "916610f9ae9a6c22deb25bba2e6247ba9f00b093d30620875203b91328a1adfa" +checksum = "a35e1d7cce7b536cc71955e5898b099104a577d2583694b7b31a6f38c14c04a3" dependencies = [ "anyhow", "base64", @@ -2650,9 +2624,9 @@ dependencies = [ [[package]] name = "wasmtime-component-macro" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b29b462b068e73b5b27fae092a27f47e5937cabf6b26be2779c978698a52feca" +checksum = "4a6faeabbdbfd27e24e8d5204207ba9c247a13cf84181ea721b5f209f281fe01" dependencies = [ "anyhow", "proc-macro2", @@ -2660,59 +2634,62 @@ dependencies = [ "syn", "wasmtime-component-util", "wasmtime-wit-bindgen", - "wit-parser 0.209.1", + "wit-parser 0.217.0", ] [[package]] name = "wasmtime-component-util" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d2912c53d9054984b380dfbd7579f9c3681b2a73b903a56bd71a1c4f175f1e" +checksum = "6b1b24db4aa3dc7c0d3181d1833b4fe9ec0cd3f08780b746415c84c0a9ec9011" [[package]] name = "wasmtime-cranelift" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3975deafea000457ba84355c7c0fce0372937204f77026510b7b454f28a3a65" +checksum = "c737bef9ea94aab874e29ac6a8688b89ceb43c7b51f047079c43387972c07ee3" dependencies = [ "anyhow", "cfg-if", "cranelift-codegen", "cranelift-control", - "cranelift-entity 0.109.0", + "cranelift-entity 0.112.1", "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.28.1", + "gimli 0.29.0", "log", "object", + "smallvec", "target-lexicon", "thiserror", - "wasmparser 0.209.1", + "wasmparser 0.217.0", "wasmtime-environ", "wasmtime-versioned-export-macros", ] [[package]] name = "wasmtime-environ" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f444e900e848b884d8a8a2949b6f5b92af642a3e663ff8fbe78731143a55be61" +checksum = "817bfa9ea878ec37aa24f85fd6912844e8d87d321662824cf920d561b698cdfd" dependencies = [ "anyhow", "cpp_demangle", - "cranelift-entity 0.109.0", - "gimli 0.28.1", + "cranelift-bitset", + "cranelift-entity 0.112.1", + "gimli 0.29.0", "indexmap", "log", "object", "postcard", "rustc-demangle", + "semver 1.0.23", "serde", "serde_derive", "target-lexicon", - "wasm-encoder 0.209.1", - "wasmparser 0.209.1", + "wasm-encoder 0.217.0", + "wasmparser 0.217.0", "wasmprinter", "wasmtime-component-util", "wasmtime-types", @@ -2720,9 +2697,9 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ded58eb2d1bf0dcd2182d0ccd7055c4b10b50d711514f1d73f61515d0fa829d" +checksum = "5070971b479b4e4879dbae8a8e1efee738a36d047c5738acfedb38d6740b79d1" dependencies = [ "anyhow", "cc", @@ -2735,9 +2712,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bc54198c6720f098210a85efb3ba8c078d1de4d373cdb6778850a66ae088d11" +checksum = "26fd0000903068c13465b9c023f56f0664f433035cbbd8eae69aa7c755f97637" dependencies = [ "object", "once_cell", @@ -2747,9 +2724,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5afe2f0499542f9a4bcfa1b55bfdda803b6ade4e7c93c6b99e0f39dba44b0a91" +checksum = "48011232c0da424f89c3752a378d0b7f512fae321ea414a43e1e7a302a6a1f7e" dependencies = [ "anyhow", "cfg-if", @@ -2759,28 +2736,29 @@ dependencies = [ [[package]] name = "wasmtime-slab" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a7de1f2bec5bbb35d532e61c85c049dc84ae671df60492f90b954ecf21169e7" +checksum = "d9858a22e656ae8574631221b474b8bebf63f1367fcac3f179873833eabc2ced" [[package]] name = "wasmtime-types" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "412463e9000e14cf6856be48628d2213c20c153e29ffc22b036980c892ea6964" +checksum = "4d14b8a9206fe94485a03edb1654cd530dbd2a859a85a43502cb4e99653a568c" dependencies = [ - "cranelift-entity 0.109.0", + "anyhow", + "cranelift-entity 0.112.1", "serde", "serde_derive", "smallvec", - "wasmparser 0.209.1", + "wasmparser 0.217.0", ] [[package]] name = "wasmtime-versioned-export-macros" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5a9bc4f44ceeb168e9e8e3be4e0b4beb9095b468479663a9e24c667e36826f" +checksum = "e9bb1f01efb8b542eadfda511e8ea1cc54309451aba97b69969e5b1a59cb7ded" dependencies = [ "proc-macro2", "quote", @@ -2789,9 +2767,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8abb1301089ed8e0b4840f539cba316a73ac382090f1b25d22d8c8eed8df49c7" +checksum = "2cc26a3923937186f5a4a4fa44d9dd1a7a389bbb06f8bac03cde2d52aad3ace8" dependencies = [ "anyhow", "async-trait", @@ -2820,9 +2798,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi-nn" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74ad60f6406604fced9fdd9693cd0d17d30e041bb2a652eb75fdab741f79c59e" +checksum = "b910699bc00ffb609a13d6bfe31e32bae052efa56a91cdbd9e9ceda39bcafea3" dependencies = [ "anyhow", "openvino", @@ -2831,20 +2809,21 @@ dependencies = [ "walkdir", "wasmtime", "wiggle", + "windows", ] [[package]] name = "wasmtime-winch" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed4db238a0241df2d15f79ad17b3a37a27f2ea6cb885894d81b42ae107544466" +checksum = "b238eeaf55652df0e63a6829d1ca9ef726d63517f56194faa0f6b9941f8d9151" dependencies = [ "anyhow", "cranelift-codegen", - "gimli 0.28.1", + "gimli 0.29.0", "object", "target-lexicon", - "wasmparser 0.209.1", + "wasmparser 0.217.0", "wasmtime-cranelift", "wasmtime-environ", "winch-codegen", @@ -2852,14 +2831,14 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc077306b38288262e5ba01d4b21532a6987416cdc0aedf04bb06c22a68fdc" +checksum = "eb1596caa67b31ac675fd3da61685c4260f8b10832021db42c85d227b7ba8133" dependencies = [ "anyhow", "heck 0.4.1", "indexmap", - "wit-parser 0.209.1", + "wit-parser 0.217.0", ] [[package]] @@ -2873,31 +2852,31 @@ dependencies = [ [[package]] name = "wast" -version = "216.0.0" +version = "217.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7eb1f2eecd913fdde0dc6c3439d0f24530a98ac6db6cb3d14d92a5328554a08" +checksum = "79004ecebded92d3c710d4841383368c7f04b63d0992ddd6b0c7d5029b7629b7" dependencies = [ "bumpalo", "leb128", "memchr", "unicode-width", - "wasm-encoder 0.216.0", + "wasm-encoder 0.217.0", ] [[package]] name = "wat" -version = "1.216.0" +version = "1.217.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac0409090fb5154f95fb5ba3235675fd9e579e731524d63b6a2f653e1280c82a" +checksum = "c126271c3d92ca0f7c63e4e462e40c69cca52fd4245fcda730d1cf558fb55088" dependencies = [ - "wast 216.0.0", + "wast 217.0.0", ] [[package]] name = "wiggle" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29830e5d01c182d24b94092c697aa7ab0ee97d22e78a2bf40ca91eae6ebca5c2" +checksum = "e998c11dd3f293a8f657ce14e9c8fdc5cddd858f1e6448290d4ec04ca7ffe5b7" dependencies = [ "anyhow", "async-trait", @@ -2911,9 +2890,9 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "557567f2793508760cd855f7659b7a0b9dc4dbc451f53f1415d6943a15311ade" +checksum = "d0d8db385e5207c1ac431837868c8e48fc3f7e81f3a146793086d661875520ec" dependencies = [ "anyhow", "heck 0.4.1", @@ -2926,9 +2905,9 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "22.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc26129a8aea20b62c961d1b9ab4a3c3b56b10042ed85d004f8678af0f21ba6e" +checksum = "2706ee9e7d1e106de80a3b3c6ec2f42920149e2def3e8060187c8e61f99bc0ef" dependencies = [ "proc-macro2", "quote", @@ -2969,21 +2948,33 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "0.20.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c6915884e731b2db0d8cf08cb64474cb69221a161675fd3c135f91febc3daa" +checksum = "4ac790aaeff15764481c731239a45346df3f0af966839ac1575f49989fdbb542" dependencies = [ "anyhow", "cranelift-codegen", - "gimli 0.28.1", + "gimli 0.29.0", "regalloc2", "smallvec", "target-lexicon", - "wasmparser 0.209.1", + "wasmparser 0.217.0", "wasmtime-cranelift", "wasmtime-environ", ] +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-implement", + "windows-interface", + "windows-targets", +] + [[package]] name = "windows-core" version = "0.52.0" @@ -2993,6 +2984,28 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "windows-implement" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-interface" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "windows-sys" version = "0.52.0" @@ -3077,9 +3090,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -3133,9 +3146,9 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.209.1" +version = "0.217.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e79b9e3c0b6bb589dec46317e645851e0db2734c44e2be5e251b03ff4a51269" +checksum = "fb893dcd6d370cfdf19a0d9adfcd403efb8e544e1a0ea3a8b81a21fe392eaa78" dependencies = [ "anyhow", "id-arena", @@ -3146,7 +3159,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.209.1", + "wasmparser 0.217.0", ] [[package]] diff --git a/test-fixtures/Cargo.lock b/test-fixtures/Cargo.lock index 5f11ac9f..c56a2a59 100644 --- a/test-fixtures/Cargo.lock +++ b/test-fixtures/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "base64" @@ -40,9 +40,9 @@ dependencies = [ [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "cfg-if" @@ -52,9 +52,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cpufeatures" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -109,9 +109,9 @@ dependencies = [ [[package]] name = "fastly" -version = "0.10.4" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2afee1dc886cbae0525020cc8e788ac9678744c311399c022913a5e06f19b52f" +checksum = "291f8c77eadfb49f5c258263c4d020143ac00d8b6170cd0c3e8c2e7f15ef2b61" dependencies = [ "anyhow", "bytes", @@ -134,9 +134,9 @@ dependencies = [ [[package]] name = "fastly-macros" -version = "0.10.4" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372765a9863aaeaac2faed544b364387f6500be423f384b6e7e30dc1e7ca65ce" +checksum = "318a46d3977f84c106a295b232f73c6553b6c61cfcfd34aa487038e495486285" dependencies = [ "proc-macro2", "quote", @@ -145,9 +145,9 @@ dependencies = [ [[package]] name = "fastly-shared" -version = "0.10.4" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00c7cd62059abdcc8d2565e9c1e63c195a7cd0fddd4851148265c6c428471b0d" +checksum = "8d3d3fae2a497c92302b8f86365c26027345800ead360c758ed6dc25f743fbde" dependencies = [ "bitflags", "http", @@ -155,9 +155,9 @@ dependencies = [ [[package]] name = "fastly-sys" -version = "0.10.4" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3810e682832f22d7ec021dab9262d2157e09980bd4d509ee60aa485761cfc5e" +checksum = "a8a916457afd05221a21c766a4d5f8a32189bc337da45fff5f2ec073170b4985" dependencies = [ "bitflags", "fastly-shared", @@ -229,9 +229,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "memchr" @@ -304,18 +304,18 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "serde" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -324,9 +324,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -423,18 +423,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", @@ -500,15 +500,15 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] From 09cd46c7d919a1b1bf0ed7eaea32973c8892d51c Mon Sep 17 00:00:00 2001 From: Trevor Elliott Date: Thu, 26 Sep 2024 10:14:15 -0700 Subject: [PATCH 2/4] Update for changes between wasmtime 22 and 25 --- lib/src/component/kv_store.rs | 2 +- lib/src/component/uap.rs | 2 +- lib/src/execute.rs | 12 ++++++------ lib/src/linking.rs | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/src/component/kv_store.rs b/lib/src/component/kv_store.rs index 7a73db7c..28e8729c 100644 --- a/lib/src/component/kv_store.rs +++ b/lib/src/component/kv_store.rs @@ -29,7 +29,7 @@ impl kv_store::HostLookupResult for ComponentCtx { todo!() } - fn drop( + async fn drop( &mut self, _rep: wasmtime::component::Resource, ) -> wasmtime::Result<()> { diff --git a/lib/src/component/uap.rs b/lib/src/component/uap.rs index 4e7cd74b..1ea7d88b 100644 --- a/lib/src/component/uap.rs +++ b/lib/src/component/uap.rs @@ -41,7 +41,7 @@ impl uap::HostUserAgent for ComponentCtx { Err(Error::NotAvailable("User-agent parsing is not available").into()) } - fn drop(&mut self, _agent: Resource) -> wasmtime::Result<()> { + async fn drop(&mut self, _agent: Resource) -> wasmtime::Result<()> { Err(Error::NotAvailable("User-agent parsing is not available").into()) } } diff --git a/lib/src/execute.rs b/lib/src/execute.rs index 3af81d82..a8aaee0c 100644 --- a/lib/src/execute.rs +++ b/lib/src/execute.rs @@ -49,7 +49,7 @@ pub const EPOCH_INTERRUPTION_PERIOD: Duration = Duration::from_micros(50); enum Instance { Module(Module, InstancePre), - Component(component::InstancePre), + Component(compute::ComputePre), } impl Instance { @@ -171,7 +171,7 @@ impl ExecuteCtx { Component::from_binary(&engine, &input)? }; let instance_pre = linker.instantiate_pre(&component)?; - Instance::Component(instance_pre) + Instance::Component(compute::ComputePre::new(instance_pre)?) } else { let mut linker = Linker::new(&engine); link_host_functions(&mut linker, &wasi_modules)?; @@ -493,10 +493,10 @@ impl ExecuteCtx { }) .map_err(ExecutionError::Context)?; - let (compute, _instance) = - compute::Compute::instantiate_pre(&mut store, instance_pre) - .await - .map_err(ExecutionError::Instantiation)?; + let compute = instance_pre + .instantiate_async(&mut store) + .await + .map_err(ExecutionError::Instantiation)?; let result = compute .fastly_api_reactor() diff --git a/lib/src/linking.rs b/lib/src/linking.rs index e2ffd80c..22c7858c 100644 --- a/lib/src/linking.rs +++ b/lib/src/linking.rs @@ -8,7 +8,7 @@ use { std::collections::HashSet, wasmtime::{GuestProfiler, Linker, Store, StoreLimits, StoreLimitsBuilder, UpdateDeadline}, wasmtime_wasi::{preview1::WasiP1Ctx, WasiCtxBuilder}, - wasmtime_wasi_nn::WasiNnCtx, + wasmtime_wasi_nn::witx::WasiNnCtx, }; pub struct Limiter { From 1ce9118883274dd8ea996be460d425b86baa88ea Mon Sep 17 00:00:00 2001 From: Trevor Elliott Date: Thu, 26 Sep 2024 11:26:50 -0700 Subject: [PATCH 3/4] Weed out duplicates of wasmparser and wasm-encoder --- Cargo.lock | 122 +++++++++++++-------------------- Cargo.toml | 8 +-- cli/tests/trap-test/Cargo.lock | 93 +++++++------------------ 3 files changed, 77 insertions(+), 146 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 274a74ab..4649f71a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -514,7 +514,7 @@ dependencies = [ "itertools 0.12.1", "log", "smallvec", - "wasmparser 0.217.0", + "wasmparser", "wasmtime-types", ] @@ -1490,6 +1490,16 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "prettyplease" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +dependencies = [ + "proc-macro2", + "syn", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -2411,7 +2421,7 @@ dependencies = [ "byte-array-literals", "object 0.33.0", "wasi", - "wasm-encoder 0.208.1", + "wasm-encoder", "wit-bindgen-rust-macro", ] @@ -2451,8 +2461,8 @@ dependencies = [ "tracing", "tracing-futures", "url", - "wasm-encoder 0.208.1", - "wasmparser 0.208.1", + "wasm-encoder", + "wasmparser", "wasmtime", "wasmtime-wasi", "wasmtime-wasi-nn", @@ -2541,16 +2551,6 @@ version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" -[[package]] -name = "wasm-encoder" -version = "0.208.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6425e84e42f7f558478e40ecc2287912cb319f2ca68e5c0bb93c61d4fc63fa17" -dependencies = [ - "leb128", - "wasmparser 0.208.1", -] - [[package]] name = "wasm-encoder" version = "0.217.0" @@ -2558,13 +2558,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b88b0814c9a2b323a9b46c687e726996c255ac8b64aa237dd11c81ed4854760" dependencies = [ "leb128", + "wasmparser", ] [[package]] name = "wasm-metadata" -version = "0.208.1" +version = "0.217.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a2c4280ad374a6db3d76d4bb61e2ec4b3b9ce5469cc4f2bbc5708047a2bbff" +checksum = "65a146bf9a60e9264f0548a2599aa9656dba9a641eff9ab88299dc2a637e483c" dependencies = [ "anyhow", "indexmap", @@ -2572,22 +2573,8 @@ dependencies = [ "serde_derive", "serde_json", "spdx", - "wasm-encoder 0.208.1", - "wasmparser 0.208.1", -] - -[[package]] -name = "wasmparser" -version = "0.208.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd921789c9dcc495f589cb37d200155dee65b4a4beeb853323b5e24e0a5f9c58" -dependencies = [ - "ahash", - "bitflags 2.6.0", - "hashbrown", - "indexmap", - "semver 1.0.23", - "serde", + "wasm-encoder", + "wasmparser", ] [[package]] @@ -2612,7 +2599,7 @@ checksum = "50dc568b3e0d47e8f96ea547c90790cfa783f0205160c40de894a427114185ce" dependencies = [ "anyhow", "termcolor", - "wasmparser 0.217.0", + "wasmparser", ] [[package]] @@ -2653,8 +2640,8 @@ dependencies = [ "smallvec", "sptr", "target-lexicon", - "wasm-encoder 0.217.0", - "wasmparser 0.217.0", + "wasm-encoder", + "wasmparser", "wasmtime-asm-macros", "wasmtime-cache", "wasmtime-component-macro", @@ -2712,7 +2699,7 @@ dependencies = [ "syn", "wasmtime-component-util", "wasmtime-wit-bindgen", - "wit-parser 0.217.0", + "wit-parser", ] [[package]] @@ -2741,7 +2728,7 @@ dependencies = [ "smallvec", "target-lexicon", "thiserror", - "wasmparser 0.217.0", + "wasmparser", "wasmtime-environ", "wasmtime-versioned-export-macros", ] @@ -2766,8 +2753,8 @@ dependencies = [ "serde", "serde_derive", "target-lexicon", - "wasm-encoder 0.217.0", - "wasmparser 0.217.0", + "wasm-encoder", + "wasmparser", "wasmprinter", "wasmtime-component-util", "wasmtime-types", @@ -2829,7 +2816,7 @@ dependencies = [ "serde", "serde_derive", "smallvec", - "wasmparser 0.217.0", + "wasmparser", ] [[package]] @@ -2901,7 +2888,7 @@ dependencies = [ "gimli 0.29.0", "object 0.36.4", "target-lexicon", - "wasmparser 0.217.0", + "wasmparser", "wasmtime-cranelift", "wasmtime-environ", "winch-codegen", @@ -2916,7 +2903,7 @@ dependencies = [ "anyhow", "heck 0.4.1", "indexmap", - "wit-parser 0.217.0", + "wit-parser", ] [[package]] @@ -2938,7 +2925,7 @@ dependencies = [ "leb128", "memchr", "unicode-width", - "wasm-encoder 0.217.0", + "wasm-encoder", ] [[package]] @@ -3036,7 +3023,7 @@ dependencies = [ "regalloc2", "smallvec", "target-lexicon", - "wasmparser 0.217.0", + "wasmparser", "wasmtime-cranelift", "wasmtime-environ", ] @@ -3187,24 +3174,26 @@ dependencies = [ [[package]] name = "wit-bindgen-core" -version = "0.25.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7076a12e69af6e1f6093bd16657d7ae61c30cfd3c5f62321046eb863b17ab1e2" +checksum = "fc9cfd3f1b4e29e9a90fe04157764f24ae396cfb8530dae5753de140e73f9e56" dependencies = [ "anyhow", "heck 0.5.0", - "wit-parser 0.208.1", + "wit-parser", ] [[package]] name = "wit-bindgen-rust" -version = "0.25.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f8ca0dd2aa75452450da1906391aba9d3a43d95fa920e872361ea00acc452a5" +checksum = "cf075ae0c89dc391f7d710d70c69bfd018c029c74a54f7ddfd0266dccc8ff0c5" dependencies = [ "anyhow", "heck 0.5.0", "indexmap", + "prettyplease", + "syn", "wasm-metadata", "wit-bindgen-core", "wit-component", @@ -3212,11 +3201,12 @@ dependencies = [ [[package]] name = "wit-bindgen-rust-macro" -version = "0.25.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d734e18bdf439ed86afe9d85fc5bfa38db4b676fc0e0a0dae95bd8f14de039" +checksum = "a2ab28d36e4d326bd43d483512348874d4fffa378d8dc1da6dd6521afe2ec4f6" dependencies = [ "anyhow", + "prettyplease", "proc-macro2", "quote", "syn", @@ -3226,9 +3216,9 @@ dependencies = [ [[package]] name = "wit-component" -version = "0.208.1" +version = "0.217.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fef7dd0e47f5135dd8739ccc5b188ab8b7e27e1d64df668aa36680f0b8646db8" +checksum = "d7117809905e49db716d81e794f79590c052bf2fdbbcda1731ca0fb28f6f3ddf" dependencies = [ "anyhow", "bitflags 2.6.0", @@ -3237,28 +3227,10 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "wasm-encoder 0.208.1", + "wasm-encoder", "wasm-metadata", - "wasmparser 0.208.1", - "wit-parser 0.208.1", -] - -[[package]] -name = "wit-parser" -version = "0.208.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516417a730725fe3e6c9e2efc8d86697480f80496d32b24e62736950704c047c" -dependencies = [ - "anyhow", - "id-arena", - "indexmap", - "log", - "semver 1.0.23", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser 0.208.1", + "wasmparser", + "wit-parser", ] [[package]] @@ -3276,7 +3248,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.217.0", + "wasmparser", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index e4e78491..3b9d390c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,16 +46,16 @@ wasmtime-wasi = "25.0.0" wasmtime-wasi-nn = "25.0.0" wiggle = "25.0.0" wat = "1.212.0" -wasmparser = "0.208.0" -wasm-encoder = { version = "0.208.0", features = ["wasmparser"] } -wit-component = "0.208.0" +wasmparser = "0.217.0" +wasm-encoder = { version = "0.217.0", features = ["wasmparser"] } +wit-component = "0.217.0" # Adapter dependencies byte-array-literals = { path = "crates/adapter/byte-array-literals" } bitflags = { version = "2.5.0", default-features = false } object = { version = "0.33", default-features = false, features = ["archive"] } wasi = { version = "0.11.0", default-features = false } -wit-bindgen-rust-macro = { version = "0.25.0", default-features = false } +wit-bindgen-rust-macro = { version = "0.32.0", default-features = false } [profile.release.package.viceroy-component-adapter] opt-level = 's' diff --git a/cli/tests/trap-test/Cargo.lock b/cli/tests/trap-test/Cargo.lock index d94e855c..c57429c8 100644 --- a/cli/tests/trap-test/Cargo.lock +++ b/cli/tests/trap-test/Cargo.lock @@ -537,7 +537,7 @@ dependencies = [ "itertools 0.12.1", "log", "smallvec", - "wasmparser 0.217.0", + "wasmparser", "wasmtime-types", ] @@ -2373,8 +2373,8 @@ dependencies = [ "tracing", "tracing-futures", "url", - "wasm-encoder 0.208.1", - "wasmparser 0.208.1", + "wasm-encoder", + "wasmparser", "wasmtime", "wasmtime-wasi", "wasmtime-wasi-nn", @@ -2463,16 +2463,6 @@ version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" -[[package]] -name = "wasm-encoder" -version = "0.208.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6425e84e42f7f558478e40ecc2287912cb319f2ca68e5c0bb93c61d4fc63fa17" -dependencies = [ - "leb128", - "wasmparser 0.208.1", -] - [[package]] name = "wasm-encoder" version = "0.217.0" @@ -2480,13 +2470,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b88b0814c9a2b323a9b46c687e726996c255ac8b64aa237dd11c81ed4854760" dependencies = [ "leb128", + "wasmparser", ] [[package]] name = "wasm-metadata" -version = "0.208.1" +version = "0.217.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a2c4280ad374a6db3d76d4bb61e2ec4b3b9ce5469cc4f2bbc5708047a2bbff" +checksum = "65a146bf9a60e9264f0548a2599aa9656dba9a641eff9ab88299dc2a637e483c" dependencies = [ "anyhow", "indexmap", @@ -2494,22 +2485,8 @@ dependencies = [ "serde_derive", "serde_json", "spdx", - "wasm-encoder 0.208.1", - "wasmparser 0.208.1", -] - -[[package]] -name = "wasmparser" -version = "0.208.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd921789c9dcc495f589cb37d200155dee65b4a4beeb853323b5e24e0a5f9c58" -dependencies = [ - "ahash", - "bitflags 2.6.0", - "hashbrown", - "indexmap", - "semver 1.0.23", - "serde", + "wasm-encoder", + "wasmparser", ] [[package]] @@ -2534,7 +2511,7 @@ checksum = "50dc568b3e0d47e8f96ea547c90790cfa783f0205160c40de894a427114185ce" dependencies = [ "anyhow", "termcolor", - "wasmparser 0.217.0", + "wasmparser", ] [[package]] @@ -2575,8 +2552,8 @@ dependencies = [ "smallvec", "sptr", "target-lexicon", - "wasm-encoder 0.217.0", - "wasmparser 0.217.0", + "wasm-encoder", + "wasmparser", "wasmtime-asm-macros", "wasmtime-cache", "wasmtime-component-macro", @@ -2634,7 +2611,7 @@ dependencies = [ "syn", "wasmtime-component-util", "wasmtime-wit-bindgen", - "wit-parser 0.217.0", + "wit-parser", ] [[package]] @@ -2663,7 +2640,7 @@ dependencies = [ "smallvec", "target-lexicon", "thiserror", - "wasmparser 0.217.0", + "wasmparser", "wasmtime-environ", "wasmtime-versioned-export-macros", ] @@ -2688,8 +2665,8 @@ dependencies = [ "serde", "serde_derive", "target-lexicon", - "wasm-encoder 0.217.0", - "wasmparser 0.217.0", + "wasm-encoder", + "wasmparser", "wasmprinter", "wasmtime-component-util", "wasmtime-types", @@ -2751,7 +2728,7 @@ dependencies = [ "serde", "serde_derive", "smallvec", - "wasmparser 0.217.0", + "wasmparser", ] [[package]] @@ -2823,7 +2800,7 @@ dependencies = [ "gimli 0.29.0", "object", "target-lexicon", - "wasmparser 0.217.0", + "wasmparser", "wasmtime-cranelift", "wasmtime-environ", "winch-codegen", @@ -2838,7 +2815,7 @@ dependencies = [ "anyhow", "heck 0.4.1", "indexmap", - "wit-parser 0.217.0", + "wit-parser", ] [[package]] @@ -2860,7 +2837,7 @@ dependencies = [ "leb128", "memchr", "unicode-width", - "wasm-encoder 0.217.0", + "wasm-encoder", ] [[package]] @@ -2958,7 +2935,7 @@ dependencies = [ "regalloc2", "smallvec", "target-lexicon", - "wasmparser 0.217.0", + "wasmparser", "wasmtime-cranelift", "wasmtime-environ", ] @@ -3109,9 +3086,9 @@ dependencies = [ [[package]] name = "wit-component" -version = "0.208.1" +version = "0.217.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fef7dd0e47f5135dd8739ccc5b188ab8b7e27e1d64df668aa36680f0b8646db8" +checksum = "d7117809905e49db716d81e794f79590c052bf2fdbbcda1731ca0fb28f6f3ddf" dependencies = [ "anyhow", "bitflags 2.6.0", @@ -3120,28 +3097,10 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "wasm-encoder 0.208.1", + "wasm-encoder", "wasm-metadata", - "wasmparser 0.208.1", - "wit-parser 0.208.1", -] - -[[package]] -name = "wit-parser" -version = "0.208.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516417a730725fe3e6c9e2efc8d86697480f80496d32b24e62736950704c047c" -dependencies = [ - "anyhow", - "id-arena", - "indexmap", - "log", - "semver 1.0.23", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser 0.208.1", + "wasmparser", + "wit-parser", ] [[package]] @@ -3159,7 +3118,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.217.0", + "wasmparser", ] [[package]] From 8ed540e358d920c51c77734827e6e1eae29e08b2 Mon Sep 17 00:00:00 2001 From: Trevor Elliott Date: Thu, 26 Sep 2024 11:46:06 -0700 Subject: [PATCH 4/4] Update the adapter --- crates/adapter/src/lib.rs | 2 ++ lib/data/viceroy-component-adapter.wasm | Bin 199772 -> 200636 bytes 2 files changed, 2 insertions(+) diff --git a/crates/adapter/src/lib.rs b/crates/adapter/src/lib.rs index aa6f2dc2..0dbba8be 100644 --- a/crates/adapter/src/lib.rs +++ b/crates/adapter/src/lib.rs @@ -33,6 +33,8 @@ pub mod bindings { runtime_path: "crate::bindings::wit_bindgen_rt_shim", disable_run_ctors_once_workaround: true, skip: ["poll"], + generate_all, + disable_custom_section_link_helpers: true, }); pub mod wit_bindgen_rt_shim { diff --git a/lib/data/viceroy-component-adapter.wasm b/lib/data/viceroy-component-adapter.wasm index ed93e5bbefaeb0a7da208221d1cf20f588296400..d0c37ee7546d0311c836399a2ec099ccea69dbf4 100755 GIT binary patch delta 25000 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