From e39b82a2fb31fc4c84100834bd83642225e8f21e Mon Sep 17 00:00:00 2001 From: Ekleog-NEAR <96595974+Ekleog-NEAR@users.noreply.github.com> Date: Fri, 17 Nov 2023 12:42:39 +0100 Subject: [PATCH] bump wasmtime to 14.0.4 (#10189) --- Cargo.lock | 348 +++++++++++++++++++++++++++++++++++------------------ Cargo.toml | 2 +- deny.toml | 26 ++-- 3 files changed, 240 insertions(+), 136 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b50052585dc..7e033e99a74 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -259,7 +259,16 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ - "gimli", + "gimli 0.27.2", +] + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli 0.28.0", ] [[package]] @@ -429,7 +438,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.32", ] [[package]] @@ -451,7 +460,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.32", ] [[package]] @@ -462,7 +471,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.32", ] [[package]] @@ -564,12 +573,12 @@ version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" dependencies = [ - "addr2line", + "addr2line 0.19.0", "cc", "cfg-if 1.0.0", "libc", "miniz_oxide 0.6.2", - "object", + "object 0.30.4", "rustc-demangle", ] @@ -633,7 +642,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.15", + "syn 2.0.32", ] [[package]] @@ -644,9 +653,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "bitmaps" @@ -850,7 +859,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.32", "syn_derive", ] @@ -1162,7 +1171,7 @@ dependencies = [ "heck 0.4.0", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.32", ] [[package]] @@ -1328,18 +1337,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.96.3" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c064a534a914eb6709d198525321a386dad50627aecfaf64053f369993a3e5a" +checksum = "2b5bb9245ec7dcc04d03110e538d31f0969d301c9d673145f4b4d5c3478539a3" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.96.3" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "619ed4d24acef0bd58b16a1be39077c0b36c65782e6c933892439af5e799110e" +checksum = "ebb18d10e5ddac43ba4ca8fd4e310938569c3e484cc01b6372b27dc5bb4dfd28" dependencies = [ "bumpalo", "cranelift-bforest", @@ -1348,8 +1357,8 @@ dependencies = [ "cranelift-control", "cranelift-entity", "cranelift-isle", - "gimli", - "hashbrown 0.13.2", + "gimli 0.28.0", + "hashbrown 0.14.0", "log", "regalloc2", "smallvec", @@ -1358,42 +1367,43 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.96.3" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c777ce22678ae1869f990b2f31e0cd7ca109049213bfc0baf3e2205a18b21ebb" +checksum = "7a3ce6d22982c1b9b6b012654258bab1a13947bb12703518bef06b1a4867c3d6" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.96.3" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb65884d17a1fa55990dd851c43c140afb4c06c3312cf42cfa1222c3b23f9561" +checksum = "47220fd4f9a0ce23541652b6f16f83868d282602c600d14934b2a4c166b4bd80" [[package]] name = "cranelift-control" -version = "0.96.3" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a0cea8abc90934d0a7ee189a29fd35fecd5c40f59ae7e6aab1805e8ab1a535e" +checksum = "ed5a4c42672aea9b6e820046b52e47a1c05d3394a6cdf4cb3c3c4b702f954bd2" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.96.3" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e50bebc05f2401a1320169314b62f91ad811ef20163cac00151d78e0684d4c" +checksum = "0b4e9a3296fc827f9d35135dc2c0c8dd8d8359eb1ef904bae2d55d5bcb0c9f94" dependencies = [ "serde", + "serde_derive", ] [[package]] name = "cranelift-frontend" -version = "0.96.3" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b82ccfe704d53f669791399d417928410785132d809ec46f5e2ce069e9d17c8" +checksum = "33ec537d0f0b8e084517f3e7bfa1d89af343d7c7df455573fca9f272d4e01267" dependencies = [ "cranelift-codegen", "log", @@ -1403,15 +1413,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.96.3" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2515d8e7836f9198b160b2c80aaa1f586d7749d57d6065af86223fb65b7e2c3" +checksum = "45bab6d69919d210a50331d35cc6ce111567bc040aebac63a8ae130d0400a075" [[package]] name = "cranelift-native" -version = "0.96.3" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcb47ffdcdac7e9fed6e4a618939773a4dc4a412fa7da9e701ae667431a10af3" +checksum = "f32e81605f352cf37af5463f11cd7deec7b6572741931a8d372f7fdd4a744f5d" dependencies = [ "cranelift-codegen", "libc", @@ -1420,9 +1430,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.96.3" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852390f92c3eaa457e42be44d174ff5abbbcd10062d5963bda8ffb2505e73a71" +checksum = "0edaa4cbec1bc787395c074233df2652dd62f3e29d3ee60329514a0a51e6b045" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1430,7 +1440,7 @@ dependencies = [ "itertools", "log", "smallvec", - "wasmparser 0.103.0", + "wasmparser 0.115.0", "wasmtime-types", ] @@ -1681,7 +1691,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.15", + "syn 2.0.32", ] [[package]] @@ -1698,7 +1708,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.32", ] [[package]] @@ -1722,7 +1732,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.15", + "syn 2.0.32", ] [[package]] @@ -1733,7 +1743,7 @@ checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" dependencies = [ "darling_core", "quote", - "syn 2.0.15", + "syn 2.0.32", ] [[package]] @@ -1764,7 +1774,7 @@ checksum = "53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.32", ] [[package]] @@ -2003,7 +2013,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.32", ] [[package]] @@ -2077,6 +2087,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + [[package]] name = "fallible-streaming-iterator" version = "0.1.9" @@ -2303,7 +2319,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" dependencies = [ - "bitflags 2.3.1", + "bitflags 2.4.1", "debugid", "fxhash", "serde", @@ -2392,9 +2408,15 @@ name = "gimli" version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" + +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" dependencies = [ - "fallible-iterator", - "indexmap 1.9.2", + "fallible-iterator 0.3.0", + "indexmap 2.0.0", "stable_deref_trait", ] @@ -2461,6 +2483,9 @@ name = "hashbrown" version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +dependencies = [ + "ahash 0.8.3", +] [[package]] name = "hashlink" @@ -2738,6 +2763,7 @@ checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ "equivalent", "hashbrown 0.14.0", + "serde", ] [[package]] @@ -2960,9 +2986,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.146" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libfuzzer-sys" @@ -3051,6 +3077,12 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +[[package]] +name = "linux-raw-sys" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" + [[package]] name = "local-channel" version = "0.1.3" @@ -3249,6 +3281,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + [[package]] name = "mime" version = "0.3.16" @@ -4083,7 +4124,7 @@ name = "near-performance-metrics-macros" version = "0.0.0" dependencies = [ "quote", - "syn 2.0.15", + "syn 2.0.32", ] [[package]] @@ -4219,7 +4260,7 @@ dependencies = [ "quote", "serde", "serde_json", - "syn 2.0.15", + "syn 2.0.32", ] [[package]] @@ -4230,7 +4271,7 @@ dependencies = [ "near-rpc-error-core", "serde", "serde_json", - "syn 2.0.15", + "syn 2.0.32", ] [[package]] @@ -4420,7 +4461,7 @@ dependencies = [ "pretty_assertions", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.32", "trybuild", ] @@ -4868,10 +4909,19 @@ name = "object" version = "0.30.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" +dependencies = [ + "memchr", +] + +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "crc32fast", - "hashbrown 0.13.2", - "indexmap 1.9.2", + "hashbrown 0.14.0", + "indexmap 2.0.0", "memchr", ] @@ -4899,7 +4949,7 @@ version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 2.3.1", + "bitflags 2.4.1", "cfg-if 1.0.0", "foreign-types", "libc", @@ -4916,7 +4966,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.32", ] [[package]] @@ -5342,7 +5392,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058" dependencies = [ "proc-macro2", - "syn 2.0.15", + "syn 2.0.32", ] [[package]] @@ -5580,9 +5630,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "5907a1b7c277254a8b15170f6e7c97cfa60ee7872a3217663bb81151e48184bb" dependencies = [ "proc-macro2", ] @@ -5766,9 +5816,9 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.8.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a52e724646c6c0800fc456ec43b4165d2f91fba88ceaca06d9e0b400023478" +checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" dependencies = [ "hashbrown 0.13.2", "log", @@ -6034,9 +6084,9 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" dependencies = [ - "bitflags 2.3.1", + "bitflags 2.4.1", "chrono", - "fallible-iterator", + "fallible-iterator 0.2.0", "fallible-streaming-iterator", "hashlink", "libsqlite3-sys", @@ -6149,6 +6199,19 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "rustix" +version = "0.38.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ad981d6c340a49cdc40a1028d9c6084ec7e9fa33fcb839cab656a267071e234" +dependencies = [ + "bitflags 2.4.1", + "errno 0.3.1", + "libc", + "linux-raw-sys 0.4.11", + "windows-sys 0.48.0", +] + [[package]] name = "rustversion" version = "1.0.6" @@ -6285,9 +6348,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.160" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] @@ -6335,13 +6398,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.160" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.32", ] [[package]] @@ -6413,7 +6476,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.32", ] [[package]] @@ -6668,6 +6731,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "sptr" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" + [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -6826,9 +6895,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" dependencies = [ "proc-macro2", "quote", @@ -6844,7 +6913,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.32", ] [[package]] @@ -6961,22 +7030,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.32" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.32" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.103", + "syn 2.0.32", ] [[package]] @@ -7110,7 +7179,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.32", ] [[package]] @@ -7708,6 +7777,15 @@ dependencies = [ "leb128", ] +[[package]] +name = "wasm-encoder" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ca90ba1b5b0a70d3d49473c5579951f3bddc78d47b59256d2f9d4922b150aca" +dependencies = [ + "leb128", +] + [[package]] name = "wasm-smith" version = "0.10.0" @@ -7936,9 +8014,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.103.0" +version = "0.105.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c437373cac5ea84f1113d648d51f71751ffbe3d90c00ae67618cf20d0b5ee7b" +checksum = "83be9e0b3f9570dc1979a33ae7b89d032c73211564232b99976553e5c155ec32" dependencies = [ "indexmap 1.9.2", "url", @@ -7946,12 +8024,12 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.105.0" +version = "0.115.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83be9e0b3f9570dc1979a33ae7b89d032c73211564232b99976553e5c155ec32" +checksum = "e06c0641a4add879ba71ccb3a1e4278fd546f76f1eafb21d8f7b07733b547cd5" dependencies = [ - "indexmap 1.9.2", - "url", + "indexmap 2.0.0", + "semver 1.0.9", ] [[package]] @@ -7966,26 +8044,28 @@ dependencies = [ [[package]] name = "wasmtime" -version = "9.0.3" +version = "14.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa0f72886c3264eb639f50188d1eb98b975564130292fea8deb4facf91ca7258" +checksum = "ca54f6090ce46973f33a79f265924b204f248f91aec09229bce53d19d567c1a6" dependencies = [ "anyhow", "bincode", "bumpalo", "cfg-if 1.0.0", "fxprof-processed-profile", - "indexmap 1.9.2", + "indexmap 2.0.0", "libc", "log", - "object", + "object 0.32.1", "once_cell", "paste", "psm", "serde", + "serde_derive", "serde_json", "target-lexicon 0.12.3", - "wasmparser 0.103.0", + "wasm-encoder 0.35.0", + "wasmparser 0.115.0", "wasmtime-cranelift", "wasmtime-environ", "wasmtime-jit", @@ -7995,87 +8075,92 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "9.0.3" +version = "14.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18391ed41ca957eecdbe64c51879b75419cbc52e2d8663fe82945b28b4f19da" +checksum = "54984bc0b5689da87a43d7c181d23092b4d5cfcbb7ae3eb6b917dd55865d95e6" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "wasmtime-cranelift" -version = "9.0.3" +version = "14.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2495036d05eb1e79ecf22e092eeacd279dcf24b4fcab77fb4cf8ef9bd42c3ea" +checksum = "1cf3cee8be02f5006d21b773ffd6802f96a0b7d661ff2ad8a01fb93df458b1aa" dependencies = [ "anyhow", + "cfg-if 1.0.0", "cranelift-codegen", "cranelift-control", "cranelift-entity", "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli", + "gimli 0.28.0", "log", - "object", + "object 0.32.1", "target-lexicon 0.12.3", "thiserror", - "wasmparser 0.103.0", + "wasmparser 0.115.0", "wasmtime-cranelift-shared", "wasmtime-environ", + "wasmtime-versioned-export-macros", ] [[package]] name = "wasmtime-cranelift-shared" -version = "9.0.3" +version = "14.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef677f7b0d3f3b73275675486d791f1e85e7c24afe8dd367c6b9950028906330" +checksum = "420fd2a69bc162957f4c94f21c7fa08ecf60d916f4e87b56332507c555da381d" dependencies = [ "anyhow", "cranelift-codegen", "cranelift-control", "cranelift-native", - "gimli", - "object", + "gimli 0.28.0", + "object 0.32.1", "target-lexicon 0.12.3", "wasmtime-environ", ] [[package]] name = "wasmtime-environ" -version = "9.0.3" +version = "14.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d03356374ffafa881c5f972529d2bb11ce48fe2736285e2b0ad72c6d554257b" +checksum = "fb6a445ce2b2810127caee6c1b79b8da4ae57712b05556a674592c18b7500a14" dependencies = [ "anyhow", "cranelift-entity", - "gimli", - "indexmap 1.9.2", + "gimli 0.28.0", + "indexmap 2.0.0", "log", - "object", + "object 0.32.1", "serde", + "serde_derive", "target-lexicon 0.12.3", "thiserror", - "wasmparser 0.103.0", + "wasmparser 0.115.0", "wasmtime-types", ] [[package]] name = "wasmtime-jit" -version = "9.0.3" +version = "14.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5374f0d2ee0069391dd9348f148802846b2b3e0af650385f9c56b3012d3c5d1" +checksum = "1f0f6586c61125fbfc13c3108c3dd565d21f314dd5bac823b9a5b7ab576d21f1" dependencies = [ - "addr2line", + "addr2line 0.21.0", "anyhow", "bincode", "cfg-if 1.0.0", "cpp_demangle", - "gimli", + "gimli 0.28.0", "log", - "object", + "object 0.32.1", "rustc-demangle", + "rustix 0.38.24", "serde", + "serde_derive", "target-lexicon 0.12.3", "wasmtime-environ", "wasmtime-jit-icache-coherence", @@ -8085,18 +8170,19 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "9.0.3" +version = "14.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "102653b177225bfdd2da41cc385965d4bf6bc10cf14ec7b306bc9b015fb01c22" +checksum = "109a9e46afe33580b952b14a4207354355f19bcdf0b47485b397b68409eaf553" dependencies = [ "once_cell", + "wasmtime-versioned-export-macros", ] [[package]] name = "wasmtime-jit-icache-coherence" -version = "9.0.3" +version = "14.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374ff63b3eb41db57c56682a9ef7737d2c9efa801f5dbf9da93941c9dd436a06" +checksum = "f67e6be36375c39cff57ed3b137ab691afbf2d9ba8ee1c01f77888413f218749" dependencies = [ "cfg-if 1.0.0", "libc", @@ -8105,40 +8191,62 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "9.0.3" +version = "14.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1b832f19099066ebd26e683121d331f12cf98f158eac0f889972854413b46f" +checksum = "1d07986b2327b5e7f535ed638fbde25990fc8f85400194fda0d26db71c7b685e" dependencies = [ "anyhow", "cc", "cfg-if 1.0.0", - "indexmap 1.9.2", + "indexmap 2.0.0", "libc", "log", "mach", "memfd", - "memoffset 0.8.0", + "memoffset 0.9.0", "paste", "rand 0.8.5", - "rustix 0.37.20", + "rustix 0.38.24", + "sptr", + "wasm-encoder 0.35.0", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-jit-debug", + "wasmtime-versioned-export-macros", + "wasmtime-wmemcheck", "windows-sys 0.48.0", ] [[package]] name = "wasmtime-types" -version = "9.0.3" +version = "14.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c574221440e05bbb04efa09786d049401be2eb10081ecf43eb72fbd637bd12f" +checksum = "e810a0d2e869abd1cb42bd232990f6bd211672b3d202d2ae7e70ffb97ed70ea3" dependencies = [ "cranelift-entity", "serde", + "serde_derive", "thiserror", - "wasmparser 0.103.0", + "wasmparser 0.115.0", ] +[[package]] +name = "wasmtime-versioned-export-macros" +version = "14.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09b5575a75e711ca6c36bb9ad647c93541cdc8e34218031acba5da3f35919dd3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] + +[[package]] +name = "wasmtime-wmemcheck" +version = "14.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dafab2db172a53e23940e0fa3078c202f567ee5f13f4b42f66b694fab43c658" + [[package]] name = "wast" version = "40.0.0" diff --git a/Cargo.toml b/Cargo.toml index 683aa306db9..45e2829995a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -338,7 +338,7 @@ wasmer-vm = { package = "wasmer-vm-near", version = "=2.4.1" } wasmparser = "0.78" # TODO: unify at least the versions of wasmparser we have in our codebase wasmprinter = "0.2" wasm-smith = "0.10" -wasmtime = { version = "9.0.3", default-features = false, features = ["cranelift"] } +wasmtime = { version = "14.0.4", default-features = false, features = ["cranelift"] } wast = "40.0" wat = "1.0.40" webrtc-util = "0.7" diff --git a/deny.toml b/deny.toml index 7283057c457..bb49890cb27 100644 --- a/deny.toml +++ b/deny.toml @@ -37,12 +37,6 @@ deny = [ ] skip = [ - { name = "clap", version = "=2.34.0" }, - # criterion uses clap=2.34.0 which relies on an older textwrap - { name = "textwrap", version = "=0.11.0" }, - - # wasmer 0.17 and wasmtime 0.17 use conflicting versions of those - { name = "wasmparser", version = "=0.51.4" }, # wasmer 0.17 and wasmtime 0.17 uses older versions of some crates { name = "generic-array", version = "=0.12.4" }, @@ -54,8 +48,6 @@ skip = [ { name = "digest", version = "=0.9.0" }, { name = "sha2", version = "=0.9.9" }, - # near-vm-runner and wasmer-compiler-near use 0.78.2 - { name = "wasmparser", version = "=0.78.2" }, # Need this specific version of pwasm-utils for backwards-compatible # stack limiting. { name = "pwasm-utils", version = "=0.12.0" }, @@ -66,12 +58,18 @@ skip = [ # wasmer and wasmtime { name = "target-lexicon", version = "=0.10.0" }, + { name = "wasmparser", version = "=0.51.4" }, + { name = "wasmparser", version = "=0.78.2" }, { name = "wasmparser", version = "=0.84.0" }, { name = "wasmparser", version = "=0.99.0" }, - - # wasmtime v9 - { name = "wasmparser", version = "=0.103.0" }, - + { name = "wasmparser", version = "=0.105.0" }, + { name = "wasm-encoder", version = "=0.27.0" }, + { name = "object", version = "=0.30.4" }, + { name = "memoffset", version = "=0.6.5" }, + { name = "memoffset", version = "=0.8.0" }, + { name = "linux-raw-sys", version = "=0.3.8" }, + { name = "addr2line", version = "=0.19.0" }, + { name = "gimli", version = "=0.27.2" }, # wasmer 0.17.x { name = "parking_lot", version = "=0.10.2" }, @@ -93,6 +91,7 @@ skip = [ # old version of rustix, wasmtime, is-terminal, etc. { name = "rustix", version = "0.36.6" }, + { name = "rustix", version = "0.37.20" }, { name = "linux-raw-sys", version = "0.1.4" }, { name = "windows-sys", version = "=0.42.0" }, { name = "windows-sys", version = "=0.45.0" }, @@ -161,9 +160,6 @@ skip = [ # actix-http hasn't upgraded iminz_oxide/flate2 yet. { name = "miniz_oxide", version = "=0.5.1" }, - # webrtc-util depends on old version of nix depends on old version of memoffset - { name = "memoffset", version = "=0.6.5" }, - # cloud-storage { name = "base64", version = "=0.12.3" }, { name = "num-bigint", version = "=0.2.6" },