diff --git a/Cargo.lock b/Cargo.lock index 275245ef03..df46bfe853 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,7 +14,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.7", ] [[package]] @@ -64,42 +64,49 @@ dependencies = [ [[package]] name = "ahash" -version = "0.3.8" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "const-random", + "getrandom 0.2.9", + "once_cell", + "version_check", ] [[package]] name = "ahash" -version = "0.4.7" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", +] [[package]] name = "aho-corasick" -version = "0.7.18" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] [[package]] -name = "ansi_term" -version = "0.9.0" +name = "android_system_properties" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] [[package]] name = "ansi_term" -version = "0.11.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi", -] +checksum = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6" [[package]] name = "ansi_term" @@ -112,24 +119,24 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.52" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3" +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" [[package]] name = "arbitrary" -version = "1.1.7" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d86fd10d912cab78764cc44307d9cd5f164e09abbeb87fb19fb6d95937e8da5f" +checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e" dependencies = [ "derive_arbitrary", ] [[package]] name = "arrayref" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" @@ -158,15 +165,15 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" dependencies = [ - "serde 1.0.145", + "serde 1.0.160", "serde_json", ] [[package]] name = "async-channel" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" +checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" dependencies = [ "concurrent-queue", "event-listener", @@ -175,23 +182,23 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" +checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" dependencies = [ + "async-lock", "async-task", "concurrent-queue", "fastrand", "futures-lite", - "once_cell", "slab", ] [[package]] name = "async-global-executor" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5262ed948da60dd8956c6c5aca4d4163593dddb7b32d73267c93dab7b2e98940" +checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" dependencies = [ "async-channel", "async-executor", @@ -199,34 +206,34 @@ dependencies = [ "async-lock", "blocking", "futures-lite", - "num_cpus", "once_cell", ] [[package]] name = "async-io" -version = "1.7.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5e18f61464ae81cde0a23e713ae8fd299580c54d697a35820cfd0625b8b0e07" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ + "async-lock", + "autocfg", + "cfg-if", "concurrent-queue", "futures-lite", - "libc", "log", - "once_cell", "parking", "polling", + "rustix", "slab", "socket2", "waker-fn", - "winapi", ] [[package]] name = "async-lock" -version = "2.5.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" dependencies = [ "event-listener", ] @@ -242,19 +249,20 @@ dependencies = [ [[package]] name = "async-process" -version = "1.4.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2c06e30a24e8c78a3987d07f0930edf76ef35e027e7bdb063fccafdad1f60c" +checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" dependencies = [ "async-io", + "async-lock", + "autocfg", "blocking", - "cfg-if 1.0.0", + "cfg-if", "event-listener", "futures-lite", - "libc", - "once_cell", + "rustix", "signal-hook", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -286,26 +294,26 @@ dependencies = [ [[package]] name = "async-task" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.48" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.13", ] [[package]] name = "atomic-waker" -version = "1.0.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" [[package]] name = "atty" @@ -313,7 +321,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] @@ -325,22 +333,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7862e21c893d65a1650125d157eaeec691439379a1cee17ee49031b79236ada4" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" [[package]] name = "basic-cookies" @@ -355,11 +369,11 @@ dependencies = [ [[package]] name = "bcs" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b06b4c1f053002b70e7084ac944c77d58d5d92b2110dbc5e852735e00ad3ccc" +checksum = "4bd3ffe8b19a604421a5d461d4a70346223e535903fbc3067138bddbebddcf77" dependencies = [ - "serde 1.0.145", + "serde 1.0.160", "thiserror", ] @@ -378,16 +392,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3deeecb812ca5300b7d3f66f730cc2ebd3511c3d36c691dd79c165d5b19a26e3" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "bit-set" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" dependencies = [ "bit-vec", ] @@ -439,14 +453,14 @@ dependencies = [ [[package]] name = "bitvec" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ "funty 2.0.0", "radium 0.7.0", "tap", - "wyz 0.5.0", + "wyz 0.5.1", ] [[package]] @@ -479,16 +493,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ "block-padding 0.2.1", - "generic-array 0.14.4", + "generic-array 0.14.7", ] [[package]] name = "block-buffer" -version = "0.10.2" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.7", ] [[package]] @@ -508,41 +522,40 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "blocking" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" dependencies = [ "async-channel", + "async-lock", "async-task", "atomic-waker", "fastrand", "futures-lite", - "once_cell", + "log", ] [[package]] name = "bstr" -version = "0.2.15" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d" +checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" dependencies = [ - "lazy_static 1.4.0", "memchr", - "regex-automata", - "serde 1.0.145", + "serde 1.0.160", ] [[package]] name = "bumpalo" -version = "3.6.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "byte-slice-cast" -version = "1.2.0" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d30c751592b77c499e7bce34d99d67c2c11bdc0574e9a488ddade14150a4698" +checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "byte-tools" @@ -557,7 +570,7 @@ dependencies = [ "anyhow", "curve25519-dalek-fiat", "ed25519-dalek-fiat", - "sha2", + "sha2 0.9.9", "sha3 0.9.1", ] @@ -615,23 +628,17 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" - -[[package]] -name = "cache-padded" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "camino" -version = "1.0.5" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52d74260d9bf6944e2208aa46841b4b8f0d7ffc0849a06837b2f510337f86b2b" +checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" dependencies = [ - "serde 1.0.145", + "serde 1.0.160", ] [[package]] @@ -640,19 +647,19 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" dependencies = [ - "serde 1.0.145", + "serde 1.0.160", ] [[package]] name = "cargo_metadata" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba2ae6de944143141f6155a473a6b02f66c7c3f9f47316f802f80204ebfe6e12" +checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", - "semver 1.0.4", - "serde 1.0.145", + "semver", + "serde 1.0.160", "serde_json", ] @@ -664,12 +671,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" [[package]] name = "cast" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0" -dependencies = [ - "rustc_version", -] +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "castaway" @@ -679,29 +683,23 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] name = "cc" -version = "1.0.67" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" dependencies = [ "jobserver", ] [[package]] name = "cfg-expr" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edae0b9625d1fce32f7d64b71784d9b1bf8469ec1a9c417e44aaf16a9cbd7571" +checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" dependencies = [ "smallvec", "target-lexicon", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -710,22 +708,24 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.19" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" dependencies = [ - "libc", + "iana-time-zone", + "js-sys", "num-integer", - "num-traits 0.2.14", + "num-traits 0.2.15", "time", + "wasm-bindgen", "winapi", ] [[package]] name = "chrono-tz" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58549f1842da3080ce63002102d5bc954c7bc843d4f47818e642abdc36253552" +checksum = "29c39203181991a7dd4343b8005bd804e7a9a37afb8ac070e43771e8c820bbde" dependencies = [ "chrono", "chrono-tz-build", @@ -734,9 +734,9 @@ dependencies = [ [[package]] name = "chrono-tz-build" -version = "0.0.2" +version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db058d493fb2f65f41861bfed7e3fe6335264a9f0f92710cab5bdf01fef09069" +checksum = "6f509c3a87b33437b05e2458750a0700e5bdd6956176773e6c7d6dd15a283a0c" dependencies = [ "parse-zoneinfo", "phf", @@ -749,16 +749,16 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.7", ] [[package]] name = "clap" -version = "2.33.3" +version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ - "ansi_term 0.11.0", + "ansi_term 0.12.1", "atty", "bitflags", "strsim 0.8.0", @@ -769,32 +769,41 @@ dependencies = [ [[package]] name = "clap" -version = "3.1.8" +version = "3.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71c47df61d9e16dc010b55dba1952a57d8c215dbb533fd13cdd13369aac73b1c" +checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" dependencies = [ "atty", "bitflags", "clap_derive", + "clap_lex", "indexmap", - "lazy_static 1.4.0", - "os_str_bytes", + "once_cell", "strsim 0.10.0", "termcolor", - "textwrap 0.15.0", + "textwrap 0.16.0", ] [[package]] name = "clap_derive" -version = "3.1.7" +version = "3.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1" +checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" dependencies = [ - "heck 0.4.0", + "heck 0.4.1", "proc-macro-error", - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", ] [[package]] @@ -804,7 +813,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3362992a0d9f1dd7c3d0e89e0ab2bb540b7a95fea8cd798090e758fda2899b5e" dependencies = [ "codespan-reporting", - "serde 1.0.145", + "serde 1.0.160", ] [[package]] @@ -813,7 +822,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" dependencies = [ - "serde 1.0.145", + "serde 1.0.160", "termcolor", "unicode-width", ] @@ -837,14 +846,14 @@ checksum = "410208eb08c3f3ad44b95b51c4fc0d5993cbcc9dd39cfadb4214b9115a97dcb5" dependencies = [ "ansi_term 0.12.1", "dissimilar", - "itertools 0.10.1", + "itertools", ] [[package]] name = "combine" -version = "4.6.4" +version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a604e93b79d1808327a6fca85a6f2d69de66461e7620f5a4cbf5fb4d1d7c948" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" dependencies = [ "bytes", "memchr", @@ -852,11 +861,11 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "1.2.4" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" dependencies = [ - "cache-padded", + "crossbeam-utils", ] [[package]] @@ -868,35 +877,13 @@ dependencies = [ "lazy_static 1.4.0", "nom", "rust-ini", - "serde 1.0.145", + "serde 1.0.160", "serde-hjson", "serde_json", "toml", "yaml-rust", ] -[[package]] -name = "const-random" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f590d95d011aa80b063ffe3253422ed5aa462af4e9867d43ce8337562bac77c4" -dependencies = [ - "const-random-macro", - "proc-macro-hack", -] - -[[package]] -name = "const-random-macro" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40" -dependencies = [ - "getrandom 0.2.2", - "lazy_static 1.4.0", - "proc-macro-hack", - "tiny-keccak", -] - [[package]] name = "constant_time_eq" version = "0.1.5" @@ -915,15 +902,18 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] -name = "cpuid-bool" -version = "0.1.2" +name = "cpufeatures" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" +checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" +dependencies = [ + "libc", +] [[package]] name = "cpuid-bool" @@ -933,23 +923,23 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" [[package]] name = "criterion" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23" +checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" dependencies = [ "atty", "cast", - "clap 2.33.3", + "clap 2.34.0", "criterion-plot", "csv", - "itertools 0.10.1", + "itertools", "lazy_static 1.4.0", - "num-traits 0.2.14", + "num-traits 0.2.15", "oorandom", "plotters", "rayon", "regex", - "serde 1.0.145", + "serde 1.0.160", "serde_cbor", "serde_derive", "serde_json", @@ -969,21 +959,21 @@ dependencies = [ [[package]] name = "criterion-plot" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d" +checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" dependencies = [ "cast", - "itertools 0.9.0", + "itertools", ] [[package]] name = "crossbeam" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845" +checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", @@ -993,57 +983,55 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.4" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.8" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", - "lazy_static 1.4.0", "memoffset", "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.8" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ - "cfg-if 1.0.0", - "lazy_static 1.4.0", + "cfg-if", ] [[package]] @@ -1055,8 +1043,8 @@ dependencies = [ "bitflags", "crossterm_winapi 0.8.0", "libc", - "mio 0.7.13", - "parking_lot 0.11.1", + "mio 0.7.14", + "parking_lot 0.11.2", "signal-hook", "signal-hook-mio", "winapi", @@ -1071,8 +1059,8 @@ dependencies = [ "bitflags", "crossterm_winapi 0.9.0", "libc", - "mio 0.7.13", - "parking_lot 0.11.1", + "mio 0.7.14", + "parking_lot 0.11.2", "signal-hook", "signal-hook-mio", "winapi", @@ -1104,11 +1092,11 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-common" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.7", "typenum", ] @@ -1118,21 +1106,20 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.7", "subtle", ] [[package]] name = "csv" -version = "1.1.6" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" dependencies = [ - "bstr", "csv-core", - "itoa 0.4.7", + "itoa", "ryu", - "serde 1.0.145", + "serde 1.0.160", ] [[package]] @@ -1146,12 +1133,12 @@ dependencies = [ [[package]] name = "ctor" -version = "0.1.22" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ - "quote 1.0.9", - "syn 1.0.99", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -1165,12 +1152,12 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.2.1" +version = "3.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19c6cedffdc8c03a3346d723eb20bd85a13362bb96dc2ac000842c6381ec7bf" +checksum = "bbcf33c2a618cbe41ee43ae6e9f2e48368cd9f9db2896f10167d8d762679f639" dependencies = [ "nix", - "winapi", + "windows-sys 0.45.0", ] [[package]] @@ -1190,9 +1177,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.56+curl-7.83.1" +version = "0.4.61+curl-8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093e169dd4de29e468fa649fbae11cdcd5551c81fe5bf1b0677adad7ef3d26f" +checksum = "14d05c10f541ae6f3bc5b3d923c20001f47db7d5f0b2bc6ad16490133842db79" dependencies = [ "cc", "libc", @@ -1213,39 +1200,84 @@ dependencies = [ "byteorder", "digest 0.9.0", "fiat-crypto", - "rand_core 0.6.2", + "rand_core 0.6.4", "subtle", "zeroize", ] +[[package]] +name = "cxx" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2 1.0.56", + "quote 1.0.26", + "scratch", + "syn 2.0.13", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" +dependencies = [ + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.13", +] + [[package]] name = "dashmap" -version = "3.11.10" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f260e2fc850179ef410018660006951c1b55b79e8087e87111a2c388994b9b5" +checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" dependencies = [ - "ahash 0.3.8", - "cfg-if 0.1.10", - "num_cpus", + "cfg-if", + "hashbrown 0.12.3", + "lock_api", + "once_cell", + "parking_lot_core 0.9.7", ] [[package]] name = "datatest-stable" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0ff02642cff6f40d39f61c8d51cb394fd313e1aa2057833b91ad788c4e9331f" +checksum = "4eaf86e44e9f0a21f6e42d8e7f83c9ee049f081745eeed1c6f47a613c76e5977" dependencies = [ + "libtest-mimic", "regex", - "structopt 0.3.25", - "termcolor", "walkdir", ] [[package]] name = "debug-ignore" -version = "1.0.1" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "223089cd5a4e4491f0a0dddd9933f9575123160cf96ca2bb56a690046ecf1745" +checksum = "ffe7ed1d93f4553003e20b629abe9085e1e81b1429520f897f8f8860bc6dfc21" [[package]] name = "derivative" @@ -1253,20 +1285,20 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "derive_arbitrary" -version = "1.1.6" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226ad66541d865d7a7173ad6a9e691c33fdb910ac723f4bc734b3e5294a1f931" +checksum = "f3cdeb9ec472d588e539a818b2dee436825730da08ad0017c4b1a17676bdc8b7" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -1275,9 +1307,9 @@ version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -1289,11 +1321,11 @@ dependencies = [ "camino", "globset", "guppy", - "itertools 0.10.1", + "itertools", "once_cell", - "petgraph 0.6.0", + "petgraph 0.6.3", "rayon", - "serde 1.0.145", + "serde 1.0.160", "toml", ] @@ -1309,7 +1341,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "clap 3.1.8", + "clap 3.2.23", "datatest-stable", "diem-framework-natives", "move-cli", @@ -1340,14 +1372,14 @@ dependencies = [ "once_cell", "proptest", "proptest-derive", - "rand 0.8.4", - "rand_core 0.6.2", + "rand 0.8.5", + "rand_core 0.6.4", "ripemd160", - "serde 1.0.145", + "serde 1.0.160", "serde-name", "serde_bytes", "serde_json", - "sha2", + "sha2 0.9.9", "sha3 0.9.1", "static_assertions", "thiserror", @@ -1361,9 +1393,9 @@ name = "diem-crypto-derive" version = "0.0.3" dependencies = [ "anyhow", - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -1396,7 +1428,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c0ff24a73b51d9009c40897faf87d31b77345c90ffbf4dc3a1d2957032c5653" dependencies = [ - "itertools 0.10.1", + "itertools", ] [[package]] @@ -1414,16 +1446,16 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.7", ] [[package]] name = "digest" -version = "0.10.3" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ - "block-buffer 0.10.2", + "block-buffer 0.10.4", "crypto-common", ] @@ -1462,18 +1494,18 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "dirs-sys-next", ] [[package]] name = "dirs-sys" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", - "redox_users 0.4.0", + "redox_users 0.4.3", "winapi", ] @@ -1484,27 +1516,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", - "redox_users 0.4.0", + "redox_users 0.4.3", "winapi", ] [[package]] name = "dissimilar" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31ad93652f40969dead8d4bf897a41e9462095152eb21c56e5830537e41179dd" - -[[package]] -name = "dtoa" -version = "0.4.7" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d7ed2934d741c6b37e33e3832298e8850b53fd2d2bea03873375596c7cea4e" +checksum = "210ec60ae7d710bed8683e333e9d2855a8a56a3e9892b38bad3bb0d4d29b0d5e" [[package]] name = "duct" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc6a0a59ed0888e0041cf708e66357b7ae1a82f1c67247e1f93b5e0818f7d8d" +checksum = "37ae3fc31835f74c2a7ceda3aeede378b0ae2e74c8f1c36559fcc9ae2a4e7d3e" dependencies = [ "libc", "once_cell", @@ -1514,17 +1540,17 @@ dependencies = [ [[package]] name = "dunce" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453440c271cf5577fd2a40e4942540cb7d0d2f85e27c8d07dd0023c925a67541" +checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" [[package]] name = "ed25519" -version = "1.0.3" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c66a534cbb46ab4ea03477eae19d5c22c01da8258030280b7bd9d8433fb6ef" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ - "serde 1.0.145", + "serde 1.0.160", "signature", ] @@ -1536,24 +1562,24 @@ checksum = "97c6ac152eba578c1c53d2cefe8ad02e239e3d6f971b0f1ef3cb54cd66037fa0" dependencies = [ "curve25519-dalek-fiat", "ed25519", - "rand 0.8.4", - "serde 1.0.145", + "rand 0.8.5", + "serde 1.0.160", "serde_bytes", - "sha2", + "sha2 0.9.9", "zeroize", ] [[package]] name = "either" -version = "1.6.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "ena" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7402b94a93c24e742487327a7cd839dc9d36fec9de9fb25b09f2dae459f36c3" +checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" dependencies = [ "log", ] @@ -1566,11 +1592,11 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1588,23 +1614,44 @@ dependencies = [ [[package]] name = "environmental" -version = "1.1.3" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b" + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b91989ae21441195d7d9b9993a2f9295c7e1a8c96255d8b729accddc124797" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] [[package]] name = "ethabi" -version = "17.0.0" +version = "17.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69517146dfab88e9238c00c724fd8e277951c3cc6f22b016d72f422a832213e" +checksum = "e4966fba78396ff92db3b817ee71143eccd98acf0f876b8d600e585a670c5d1b" dependencies = [ "ethereum-types 0.13.1", "hex", "once_cell", "regex", - "serde 1.0.145", + "serde 1.0.160", "serde_json", - "sha3 0.10.1", + "sha3 0.10.6", "thiserror", "uint", ] @@ -1650,7 +1697,7 @@ dependencies = [ "rlp", "rlp-derive", "scale-info", - "serde 1.0.145", + "serde 1.0.160", "sha3 0.9.1", "triehash", ] @@ -1686,9 +1733,9 @@ dependencies = [ [[package]] name = "ethnum" -version = "1.0.4" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f58da196a1fc8f14cb51f373f504efc66c434c577b777c2cd30d6fad16e4822" +checksum = "0198b9d0078e0f30dedc7acbb21c974e838fc8fae3ee170128658a98cb2c1c04" [[package]] name = "event-listener" @@ -1713,7 +1760,7 @@ dependencies = [ "primitive-types 0.10.1", "rlp", "scale-info", - "serde 1.0.145", + "serde 1.0.160", "sha3 0.8.2", ] @@ -1727,7 +1774,7 @@ dependencies = [ "parity-scale-codec 2.3.1", "primitive-types 0.10.1", "scale-info", - "serde 1.0.145", + "serde 1.0.160", ] [[package]] @@ -1774,7 +1821,7 @@ version = "0.1.0" dependencies = [ "anyhow", "atty", - "clap 3.1.8", + "clap 3.2.23", "codespan", "codespan-reporting", "ethabi", @@ -1783,7 +1830,7 @@ dependencies = [ "move-to-yul", "once_cell", "regex", - "serde 1.0.145", + "serde 1.0.160", "serde_json", ] @@ -1798,26 +1845,20 @@ dependencies = [ "rand 0.7.3", ] -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - [[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] [[package]] name = "fiat-crypto" -version = "0.1.6" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72312b32704d99a969a55168f1f77edf8554fc7c7b978d457962aaf21404ef85" +checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "file_diff" @@ -1832,7 +1873,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" dependencies = [ "byteorder", - "rand 0.8.4", + "rand 0.8.5", "rustc-hex", "static_assertions", ] @@ -1845,9 +1886,9 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" [[package]] name = "fixedbitset" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "fnv" @@ -1872,19 +1913,18 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" dependencies = [ - "matches", "percent-encoding", ] [[package]] name = "fst" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d79238883cf0307100b90aba4a755d8051a3182305dfe7f649a1e9dc0517006f" +checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a" [[package]] name = "funty" @@ -1900,9 +1940,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.12" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9052a1a50244d8d5aa9bf55cbc2fb6f357c86cc52e46c62ed390a7180cf150" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -1915,9 +1955,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.16" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -1925,15 +1965,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.16" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.12" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e59fdc009a4b3096bf94f740a0f2424c082521f20a9b08c5c07c48d90fd9b9" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -1942,15 +1982,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.16" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ "fastrand", "futures-core", @@ -1963,36 +2003,33 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.16" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ - "autocfg", - "proc-macro-hack", - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.13", ] [[package]] name = "futures-sink" -version = "0.3.16" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.16" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.16" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ - "autocfg", "futures-channel", "futures-core", "futures-io", @@ -2002,8 +2039,6 @@ dependencies = [ "memchr", "pin-project-lite", "pin-utils", - "proc-macro-hack", - "proc-macro-nested", "slab", ] @@ -2018,9 +2053,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.4" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -2032,20 +2067,20 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi 0.9.0+wasi-snapshot-preview1", ] [[package]] name = "getrandom" -version = "0.2.2" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", - "wasi 0.10.0+wasi-snapshot-preview1", + "wasi 0.11.0+wasi-snapshot-preview1", ] [[package]] @@ -2060,15 +2095,15 @@ dependencies = [ [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.8" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd" +checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ "aho-corasick", "bstr", @@ -2090,9 +2125,9 @@ dependencies = [ [[package]] name = "gloo-timers" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" dependencies = [ "futures-channel", "futures-core", @@ -2108,20 +2143,20 @@ checksum = "2d2086fdcefd1a3dc6f4ba4568147648231e2211be1fcc4d1063601c6baadd2e" dependencies = [ "camino", "cargo_metadata", - "cfg-if 1.0.0", + "cfg-if", "debug-ignore", - "fixedbitset 0.4.0", + "fixedbitset 0.4.2", "guppy-summaries", "guppy-workspace-hack", "indexmap", - "itertools 0.10.1", + "itertools", "nested", "once_cell", "pathdiff", - "petgraph 0.6.0", + "petgraph 0.6.3", "rayon", - "semver 1.0.4", - "serde 1.0.145", + "semver", + "serde 1.0.160", "serde_json", "smallvec", "target-spec", @@ -2135,10 +2170,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ca5ad97ff788027e546992f7f374e277da50ca4e06dab268f33088a74897e9e" dependencies = [ "camino", - "cfg-if 1.0.0", + "cfg-if", "diffus", - "semver 1.0.4", - "serde 1.0.145", + "semver", + "serde 1.0.160", "toml", ] @@ -2150,9 +2185,9 @@ checksum = "92620684d99f750bae383ecb3be3748142d6095760afd5cbcf2261e9a279d780" [[package]] name = "h2" -version = "0.3.14" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" +checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" dependencies = [ "bytes", "fnv", @@ -2169,9 +2204,9 @@ dependencies = [ [[package]] name = "half" -version = "1.7.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "hash-db" @@ -2190,33 +2225,36 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.9.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.4.7", + "ahash 0.7.6", ] [[package]] name = "hashbrown" -version = "0.11.2" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.3", +] [[package]] name = "heck" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" dependencies = [ "unicode-segmentation", ] [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -2227,6 +2265,21 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + [[package]] name = "hex" version = "0.4.3" @@ -2261,13 +2314,13 @@ dependencies = [ [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", - "itoa 1.0.1", + "itoa", ] [[package]] @@ -2283,9 +2336,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" @@ -2295,14 +2348,14 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "httpmock" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c159c4fc205e6c1a9b325cb7ec135d13b5f47188ce175dabb76ec847f331d9bd" +checksum = "c6b56b6265f15908780cbee987912c1e98dbca675361f748291605a8a3a1df09" dependencies = [ "assert-json-diff", "async-object-pool", "async-trait", - "base64", + "base64 0.13.1", "basic-cookies", "crossbeam-utils", "form_urlencoded", @@ -2313,7 +2366,7 @@ dependencies = [ "levenshtein", "log", "regex", - "serde 1.0.145", + "serde 1.0.160", "serde_json", "serde_regex", "similar", @@ -2323,9 +2376,9 @@ dependencies = [ [[package]] name = "humansize" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6cab2627acfc432780848602f3f558f7e9dd427352224b0d9324025796d2a5e" +checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026" [[package]] name = "humantime" @@ -2335,19 +2388,19 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "humantime-serde" -version = "1.0.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac34a56cfd4acddb469cc7fff187ed5ac36f498ba085caf8bbc725e3ff474058" +checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c" dependencies = [ "humantime", - "serde 1.0.145", + "serde 1.0.160", ] [[package]] name = "hyper" -version = "0.14.20" +version = "0.14.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" +checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" dependencies = [ "bytes", "futures-channel", @@ -2358,7 +2411,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.1", + "itoa", "pin-project-lite", "socket2", "tokio", @@ -2380,24 +2433,46 @@ dependencies = [ "tokio-native-tls", ] +[[package]] +name = "iana-time-zone" +version = "0.1.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + [[package]] name = "idna" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] [[package]] name = "ignore" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b287fb45c60bb826a0dc68ff08742b9d88a2fea13d6e0c286b3172065aaf878c" +checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" dependencies = [ - "crossbeam-utils", "globset", "lazy_static 1.4.0", "log", @@ -2416,7 +2491,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9" dependencies = [ "bitmaps", - "rand_core 0.6.2", + "rand_core 0.6.4", "rand_xoshiro", "sized-chunks", "typenum", @@ -2438,7 +2513,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec 3.4.0", ] [[package]] @@ -2456,7 +2531,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c" dependencies = [ - "serde 1.0.145", + "serde 1.0.160", ] [[package]] @@ -2465,9 +2540,9 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -2478,41 +2553,40 @@ checksum = "0cfe9645a18782869361d9c8732246be7b410ad4e919d3609ebabdac00ba12c3" [[package]] name = "indexmap" -version = "1.7.0" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown 0.11.2", + "hashbrown 0.12.3", ] [[package]] name = "indoc" -version = "1.0.3" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a75aeaaef0ce18b58056d306c27b07436fbb34b8816c53094b76dd81803136" -dependencies = [ - "unindent", -] +checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] name = "instant" -version = "0.1.10" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] name = "internment" -version = "0.5.0" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84361d019110e87ee0b527edae8cba07feb78a09c53d8579e5411005d0ad5065" +checksum = "6ab388864246d58a276e60e7569a833d9cc4cd75c66e5ca77c177dad38e59996" dependencies = [ + "ahash 0.7.6", "dashmap", - "hashbrown 0.9.1", + "hashbrown 0.12.3", "once_cell", + "parking_lot 0.12.1", ] [[package]] @@ -2524,11 +2598,34 @@ dependencies = [ "proptest", ] +[[package]] +name = "io-lifetimes" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "ipnet" -version = "2.5.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" + +[[package]] +name = "is-terminal" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.48.0", +] [[package]] name = "is_ci" @@ -2565,57 +2662,45 @@ dependencies = [ [[package]] name = "itertools" -version = "0.9.0" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" - [[package]] name = "itoa" -version = "1.0.1" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jobserver" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.48" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc9f84f9b115ce7843d60706df1422a916680bfdfcbdb0447c5614ff9d7e4d78" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] [[package]] name = "keccak" -version = "0.1.0" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" +checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +dependencies = [ + "cpufeatures", +] [[package]] name = "kv-log-macro" @@ -2628,32 +2713,32 @@ dependencies = [ [[package]] name = "lalrpop" -version = "0.19.8" +version = "0.19.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30455341b0e18f276fa64540aff54deafb54c589de6aca68659c63dd2d5d823" +checksum = "f34313ec00c2eb5c3c87ca6732ea02dcf3af99c3ff7a8fb622ffb99c9d860a87" dependencies = [ "ascii-canvas", - "atty", "bit-set", "diff", "ena", - "itertools 0.10.1", + "is-terminal", + "itertools", "lalrpop-util", - "petgraph 0.6.0", + "petgraph 0.6.3", "pico-args", "regex", "regex-syntax", "string_cache", "term 0.7.0", "tiny-keccak", - "unicode-xid 0.2.2", + "unicode-xid 0.2.4", ] [[package]] name = "lalrpop-util" -version = "0.19.8" +version = "0.19.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf796c978e9b4d983414f4caedc9273aa33ee214c5b887bd55fde84c85d2dc4" +checksum = "e5c1f7869c94d214466c5fd432dfed12c379fd87786768d36455892d46b18edd" dependencies = [ "regex", ] @@ -2703,28 +2788,34 @@ checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" dependencies = [ "arrayvec 0.5.2", "bitflags", - "cfg-if 1.0.0", + "cfg-if", "ryu", "static_assertions", ] [[package]] name = "libc" -version = "0.2.126" +version = "0.2.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" [[package]] name = "libfuzzer-sys" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae185684fe19814afd066da15a7cc41e126886c21282934225d9fc847582da58" +checksum = "beb09950ae85a0a94b27676cccf37da5ff13f27076aa1adbc6545dd0d0e1bd4e" dependencies = [ "arbitrary", "cc", "once_cell", ] +[[package]] +name = "libm" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" + [[package]] name = "libnghttp2-sys" version = "0.1.7+1.45.0" @@ -2735,6 +2826,17 @@ dependencies = [ "libc", ] +[[package]] +name = "libtest-mimic" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79529479c298f5af41375b0c1a77ef670d450b4c9cd7949d2b43af08121b20ec" +dependencies = [ + "clap 3.2.23", + "termcolor", + "threadpool", +] + [[package]] name = "libz-sys" version = "1.1.8" @@ -2747,18 +2849,34 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "link-cplusplus" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +dependencies = [ + "cc", +] + [[package]] name = "linked-hash-map" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" [[package]] name = "lock_api" -version = "0.4.6" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" dependencies = [ + "autocfg", "scopeguard", ] @@ -2768,8 +2886,8 @@ version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "cfg-if 1.0.0", - "serde 1.0.145", + "cfg-if", + "serde 1.0.160", "value-bag", ] @@ -2781,7 +2899,7 @@ checksum = "c351c75989da23b355226dc188dc2b52538a7f4f218d70fd7393c6b62b110444" dependencies = [ "crossbeam-channel", "log", - "serde 1.0.145", + "serde 1.0.160", "serde_json", ] @@ -2792,7 +2910,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f3734ab1d7d157fc0c45110e06b587c31cd82bea2ccfd6b563cbff0aaeeb1d3" dependencies = [ "bitflags", - "serde 1.0.145", + "serde 1.0.160", "serde_json", "serde_repr", "url", @@ -2813,32 +2931,26 @@ dependencies = [ "regex-automata", ] -[[package]] -name = "matches" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - [[package]] name = "memchr" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.6.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ "autocfg", ] [[package]] name = "memory-stats" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3f458a3076e337e027943b8cb5f4f72a6651714f9258fc7dcd3ae3b51f0276" +checksum = "34f79cf9964c5c9545493acda1263f1912f8d2c56c8a2ffee2606cb960acaacc" dependencies = [ "libc", "winapi", @@ -2846,15 +2958,15 @@ dependencies = [ [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mio" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" +checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" dependencies = [ "libc", "log", @@ -2865,14 +2977,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -2900,7 +3012,7 @@ dependencies = [ "move-ir-to-bytecode", "move-ir-types", "move-symbol-pool", - "rand 0.8.4", + "rand 0.8.5", ] [[package]] @@ -2911,7 +3023,7 @@ dependencies = [ "bcs", "codespan-reporting", "datatest-stable", - "heck 0.3.2", + "heck 0.3.3", "log", "move-binary-format", "move-bytecode-verifier", @@ -2920,7 +3032,7 @@ dependencies = [ "move-model", "move-prover", "move-prover-test-utils", - "serde 1.0.145", + "serde 1.0.160", "tempfile", ] @@ -2929,7 +3041,7 @@ name = "move-analyzer" version = "1.0.0" dependencies = [ "anyhow", - "clap 3.1.8", + "clap 3.2.23", "codespan-reporting", "crossbeam", "derivative", @@ -2943,7 +3055,7 @@ dependencies = [ "move-package", "move-symbol-pool", "petgraph 0.5.1", - "serde 1.0.145", + "serde 1.0.160", "serde_json", "tempfile", "url", @@ -2957,7 +3069,7 @@ dependencies = [ "bcs", "better_any", "datatest-stable", - "itertools 0.10.1", + "itertools", "move-binary-format", "move-command-line-common", "move-compiler", @@ -2978,12 +3090,12 @@ version = "0.0.3" dependencies = [ "anyhow", "arbitrary", + "hashbrown 0.13.2", "move-core-types", - "once_cell", "proptest", "proptest-derive", "ref-cast", - "serde 1.0.145", + "serde 1.0.160", "serde_json", "variant_count", ] @@ -3003,7 +3115,7 @@ dependencies = [ "move-core-types", "move-ir-types", "move-symbol-pool", - "serde 1.0.145", + "serde 1.0.160", ] [[package]] @@ -3023,6 +3135,7 @@ version = "0.1.0" dependencies = [ "anyhow", "fail", + "hashbrown 0.13.2", "hex-literal", "invalid-mutations", "move-binary-format", @@ -3036,7 +3149,7 @@ name = "move-bytecode-viewer" version = "0.1.0" dependencies = [ "anyhow", - "clap 3.1.8", + "clap 3.2.23", "crossterm 0.21.0", "move-binary-format", "move-bytecode-source-map", @@ -3053,13 +3166,13 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "clap 3.1.8", + "clap 3.2.23", "codespan-reporting", "colored", "datatest-stable", "difference", "httpmock", - "itertools 0.10.1", + "itertools", "move-binary-format", "move-bytecode-source-map", "move-bytecode-utils", @@ -3087,11 +3200,11 @@ dependencies = [ "read-write-set", "read-write-set-dynamic", "reqwest", - "serde 1.0.145", + "serde 1.0.160", "serde_json", "serde_yaml", "tempfile", - "toml_edit", + "toml_edit 0.14.4", "walkdir", ] @@ -3104,10 +3217,10 @@ dependencies = [ "dirs-next", "hex", "move-core-types", - "num-bigint 0.4.0", + "num-bigint 0.4.3", "once_cell", - "serde 1.0.145", - "sha2", + "serde 1.0.160", + "sha2 0.9.9", "walkdir", ] @@ -3117,7 +3230,7 @@ version = "0.0.1" dependencies = [ "anyhow", "bcs", - "clap 3.1.8", + "clap 3.2.23", "codespan-reporting", "datatest-stable", "difference", @@ -3132,7 +3245,7 @@ dependencies = [ "move-ir-types", "move-stdlib", "move-symbol-pool", - "num-bigint 0.4.0", + "num-bigint 0.4.3", "once_cell", "petgraph 0.5.1", "regex", @@ -3159,16 +3272,16 @@ dependencies = [ "ethnum", "hex", "num 0.4.0", - "once_cell", "primitive-types 0.10.1", "proptest", "proptest-derive", - "rand 0.8.4", + "rand 0.8.5", "ref-cast", "regex", - "serde 1.0.145", + "serde 1.0.160", "serde_bytes", "serde_json", + "spin", "uint", ] @@ -3178,7 +3291,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "clap 3.1.8", + "clap 3.2.23", "codespan", "colored", "move-binary-format", @@ -3188,7 +3301,7 @@ dependencies = [ "move-ir-types", "once_cell", "petgraph 0.5.1", - "serde 1.0.145", + "serde 1.0.160", ] [[package]] @@ -3196,7 +3309,7 @@ name = "move-disassembler" version = "0.1.0" dependencies = [ "anyhow", - "clap 3.1.8", + "clap 3.2.23", "colored", "move-binary-format", "move-bytecode-source-map", @@ -3216,7 +3329,7 @@ dependencies = [ "codespan", "codespan-reporting", "datatest-stable", - "itertools 0.10.1", + "itertools", "log", "move-compiler", "move-model", @@ -3225,7 +3338,7 @@ dependencies = [ "num 0.4.0", "once_cell", "regex", - "serde 1.0.145", + "serde 1.0.160", "tempfile", ] @@ -3242,7 +3355,7 @@ dependencies = [ "move-core-types", "move-model", "move-prover", - "serde 1.0.145", + "serde 1.0.160", ] [[package]] @@ -3253,7 +3366,7 @@ dependencies = [ "ethabi", "once_cell", "regex", - "serde 1.0.145", + "serde 1.0.160", "serde_json", ] @@ -3262,7 +3375,7 @@ name = "move-explain" version = "0.1.0" dependencies = [ "bcs", - "clap 3.1.8", + "clap 3.2.23", "move-command-line-common", "move-core-types", ] @@ -3273,7 +3386,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "clap 3.1.8", + "clap 3.2.23", "move-binary-format", "move-bytecode-source-map", "move-bytecode-verifier", @@ -3328,12 +3441,14 @@ name = "move-ir-types" version = "0.1.0" dependencies = [ "anyhow", + "hashbrown 0.13.2", "hex", "move-command-line-common", "move-core-types", "move-symbol-pool", - "once_cell", - "serde 1.0.145", + "serde 1.0.160", + "sha2 0.9.9", + "spin", ] [[package]] @@ -3345,7 +3460,7 @@ dependencies = [ "codespan-reporting", "datatest-stable", "internment", - "itertools 0.10.1", + "itertools", "log", "move-binary-format", "move-bytecode-source-map", @@ -3360,7 +3475,7 @@ dependencies = [ "num 0.4.0", "once_cell", "regex", - "serde 1.0.145", + "serde 1.0.160", ] [[package]] @@ -3369,13 +3484,13 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "clap 3.1.8", + "clap 3.2.23", "colored", "datatest-stable", "dirs-next", "evm-exec-utils", "hex", - "itertools 0.10.1", + "itertools", "move-abigen", "move-binary-format", "move-bytecode-source-map", @@ -3393,9 +3508,9 @@ dependencies = [ "ptree", "regex", "reqwest", - "serde 1.0.145", + "serde 1.0.160", "serde_yaml", - "sha2", + "sha2 0.9.9", "tempfile", "termcolor", "toml", @@ -3410,13 +3525,13 @@ dependencies = [ "anyhow", "async-trait", "atty", - "clap 3.1.8", + "clap 3.2.23", "codespan", "codespan-reporting", "datatest-stable", "futures", "hex", - "itertools 0.10.1", + "itertools", "log", "move-abigen", "move-binary-format", @@ -3433,8 +3548,8 @@ dependencies = [ "num 0.4.0", "once_cell", "pretty", - "rand 0.8.4", - "serde 1.0.145", + "rand 0.8.5", + "serde 1.0.160", "serde_json", "shell-words", "simplelog", @@ -3453,7 +3568,7 @@ dependencies = [ "codespan", "codespan-reporting", "futures", - "itertools 0.10.1", + "itertools", "log", "move-binary-format", "move-command-line-common", @@ -3464,9 +3579,9 @@ dependencies = [ "num 0.4.0", "once_cell", "pretty", - "rand 0.8.4", + "rand 0.8.5", "regex", - "serde 1.0.145", + "serde 1.0.160", "serde_json", "tera", "tokio", @@ -3489,7 +3604,7 @@ dependencies = [ "anyhow", "move-binary-format", "move-core-types", - "serde 1.0.145", + "serde 1.0.160", ] [[package]] @@ -3503,7 +3618,7 @@ dependencies = [ "move-bytecode-utils", "move-core-types", "once_cell", - "serde 1.0.145", + "serde 1.0.160", ] [[package]] @@ -3516,7 +3631,7 @@ dependencies = [ "datatest-stable", "ethnum", "im", - "itertools 0.10.1", + "itertools", "log", "move-binary-format", "move-borrow-graph", @@ -3533,7 +3648,7 @@ dependencies = [ "once_cell", "paste", "petgraph 0.5.1", - "serde 1.0.145", + "serde 1.0.160", ] [[package]] @@ -3542,17 +3657,17 @@ version = "0.1.0" dependencies = [ "anyhow", "bytecode-interpreter-crypto", - "clap 3.1.8", + "clap 3.2.23", "codespan-reporting", "datatest-stable", - "itertools 0.10.1", + "itertools", "move-binary-format", "move-core-types", "move-model", "move-prover-test-utils", "move-stackless-bytecode", "num 0.4.0", - "serde 1.0.145", + "serde 1.0.160", ] [[package]] @@ -3576,7 +3691,7 @@ dependencies = [ "move-unit-test", "move-vm-runtime", "move-vm-types", - "sha2", + "sha2 0.9.9", "sha3 0.9.1", "smallvec", "tempfile", @@ -3587,9 +3702,10 @@ dependencies = [ name = "move-symbol-pool" version = "0.1.0" dependencies = [ - "once_cell", - "serde 1.0.145", + "hashbrown 0.13.2", + "serde 1.0.160", "serde_json", + "spin", ] [[package]] @@ -3619,7 +3735,7 @@ version = "0.1.0" dependencies = [ "anyhow", "atty", - "clap 3.1.8", + "clap 3.2.23", "codespan", "codespan-reporting", "datatest-stable", @@ -3627,7 +3743,7 @@ dependencies = [ "evm", "evm-exec-utils", "hex", - "itertools 0.10.1", + "itertools", "log", "maplit", "move-binary-format", @@ -3645,9 +3761,9 @@ dependencies = [ "once_cell", "pretty", "primitive-types 0.10.1", - "rand 0.8.4", + "rand 0.8.5", "regex", - "serde 1.0.145", + "serde 1.0.160", "serde_json", "sha3 0.9.1", "simplelog", @@ -3661,7 +3777,7 @@ name = "move-transactional-test-runner" version = "0.1.0" dependencies = [ "anyhow", - "clap 3.1.8", + "clap 3.2.23", "colored", "datatest-stable", "difference", @@ -3695,14 +3811,14 @@ version = "0.1.0" dependencies = [ "anyhow", "better_any", - "clap 3.1.8", + "clap 3.2.23", "codespan-reporting", "colored", "datatest-stable", "difference", "evm", "evm-exec-utils", - "itertools 0.10.1", + "itertools", "move-binary-format", "move-bytecode-utils", "move-command-line-common", @@ -3759,6 +3875,7 @@ dependencies = [ "anyhow", "better_any", "fail", + "hashbrown 0.13.2", "hex", "move-binary-format", "move-bytecode-verifier", @@ -3766,10 +3883,9 @@ dependencies = [ "move-core-types", "move-ir-compiler", "move-vm-types", - "once_cell", - "parking_lot 0.11.1", "proptest", "sha3 0.9.1", + "spin", "tracing", ] @@ -3783,7 +3899,7 @@ dependencies = [ "move-table-extension", "move-vm-types", "once_cell", - "serde 1.0.145", + "serde 1.0.160", ] [[package]] @@ -3799,11 +3915,11 @@ name = "move-vm-types" version = "0.1.0" dependencies = [ "bcs", + "hashbrown 0.13.2", "move-binary-format", "move-core-types", - "once_cell", "proptest", - "serde 1.0.145", + "serde 1.0.160", "smallvec", ] @@ -3823,9 +3939,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ "lazy_static 1.4.0", "libc", @@ -3859,7 +3975,7 @@ dependencies = [ "camino", "config", "humantime-serde", - "serde 1.0.145", + "serde 1.0.160", "toml", ] @@ -3885,7 +4001,7 @@ dependencies = [ "owo-colors", "quick-junit", "rayon", - "serde 1.0.145", + "serde 1.0.160", "serde_json", "strip-ansi-escapes", "twox-hash", @@ -3897,20 +4013,19 @@ version = "0.1.0" source = "git+https://github.com/diem/diem-devtools?rev=f99a204e3d3f8e503d51d7df42e55c8282b59154#f99a204e3d3f8e503d51d7df42e55c8282b59154" dependencies = [ "camino", - "serde 1.0.145", + "serde 1.0.160", ] [[package]] name = "nix" -version = "0.23.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ "bitflags", - "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", - "memoffset", + "static_assertions", ] [[package]] @@ -3926,10 +4041,20 @@ dependencies = [ [[package]] name = "ntapi" -version = "0.3.6" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +dependencies = [ + "winapi", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" dependencies = [ + "overload", "winapi", ] @@ -3939,12 +4064,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b7a8e9be5e039e2ff869df49155f1c06bd01ade2117ec783e56ab0932b67a8f" dependencies = [ - "num-bigint 0.3.2", + "num-bigint 0.3.3", "num-complex 0.3.1", "num-integer", "num-iter", "num-rational 0.3.2", - "num-traits 0.2.14", + "num-traits 0.2.15", ] [[package]] @@ -3953,34 +4078,34 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" dependencies = [ - "num-bigint 0.4.0", - "num-complex 0.4.0", + "num-bigint 0.4.3", + "num-complex 0.4.3", "num-integer", "num-iter", - "num-rational 0.4.0", - "num-traits 0.2.14", + "num-rational 0.4.1", + "num-traits 0.2.15", ] [[package]] name = "num-bigint" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba" +checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3" dependencies = [ "autocfg", "num-integer", - "num-traits 0.2.14", + "num-traits 0.2.15", ] [[package]] name = "num-bigint" -version = "0.4.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d047c1062aa51e256408c560894e5251f08925980e53cf1aa5bd00eec6512" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ "autocfg", "num-integer", - "num-traits 0.2.14", + "num-traits 0.2.15", ] [[package]] @@ -3989,37 +4114,37 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5" dependencies = [ - "num-traits 0.2.14", + "num-traits 0.2.15", ] [[package]] name = "num-complex" -version = "0.4.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085" +checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" dependencies = [ - "num-traits 0.2.14", + "num-traits 0.2.15", ] [[package]] name = "num-integer" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", - "num-traits 0.2.14", + "num-traits 0.2.15", ] [[package]] name = "num-iter" -version = "0.1.42" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" dependencies = [ "autocfg", "num-integer", - "num-traits 0.2.14", + "num-traits 0.2.15", ] [[package]] @@ -4029,21 +4154,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" dependencies = [ "autocfg", - "num-bigint 0.3.2", + "num-bigint 0.3.3", "num-integer", - "num-traits 0.2.14", + "num-traits 0.2.15", ] [[package]] name = "num-rational" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", - "num-bigint 0.4.0", + "num-bigint 0.4.3", "num-integer", - "num-traits 0.2.14", + "num-traits 0.2.15", ] [[package]] @@ -4052,33 +4177,34 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.14", + "num-traits 0.2.15", ] [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", + "libm", ] [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi", + "hermit-abi 0.2.6", "libc", ] [[package]] name = "once_cell" -version = "1.12.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "oorandom" @@ -4100,12 +4226,12 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.41" +version = "0.10.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0" +checksum = "7e30d8bc91859781f0a943411186324d580f2bbeb71b452fe91ae344806af3f1" dependencies = [ "bitflags", - "cfg-if 1.0.0", + "cfg-if", "foreign-types", "libc", "once_cell", @@ -4115,13 +4241,13 @@ dependencies = [ [[package]] name = "openssl-macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.13", ] [[package]] @@ -4132,11 +4258,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.75" +version = "0.9.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f" +checksum = "0d3d193fb1488ad46ffe3aaabc912cc931d02ee8518fe2959aea8ef52718b0c0" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", @@ -4145,37 +4270,34 @@ dependencies = [ [[package]] name = "ordered-float" -version = "2.1.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "766f840da25490628d8e63e529cd21c014f6600c6b8517add12a6fa6167a6218" +checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" dependencies = [ - "num-traits 0.2.14", + "num-traits 0.2.15", ] [[package]] name = "os_pipe" -version = "0.9.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb233f06c2307e1f5ce2ecad9f8121cffbbee2c95428f44ea85222e460d0d213" +checksum = "a53dbb20faf34b16087a931834cba2d7a73cc74af2b7ef345a4c8324e2409a12" dependencies = [ "libc", - "winapi", + "windows-sys 0.45.0", ] [[package]] name = "os_str_bytes" -version = "6.0.0" +version = "6.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" -dependencies = [ - "memchr", -] +checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" [[package]] name = "ouroboros" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc1f52300b81ac4eeeb6c00c20f7e86556c427d9fb2d92b68fc73c22f331cd15" +checksum = "fbeff60e3e37407a80ead3e9458145b456e978c4068cddbfea6afb48572962ca" dependencies = [ "ouroboros_macro", "stable_deref_trait", @@ -4183,22 +4305,28 @@ dependencies = [ [[package]] name = "ouroboros_macro" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41db02c8f8731cdd7a72b433c7900cce4bf245465b452c364bfd21f4566ab055" +checksum = "03f2cb802b5bdfdf52f1ffa0b54ce105e4d346e91990dd571f86c91321ad49e2" dependencies = [ "Inflector", "proc-macro-error", - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "owo-colors" -version = "3.2.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "parity-scale-codec" @@ -4211,21 +4339,21 @@ dependencies = [ "byte-slice-cast", "impl-trait-for-tuples", "parity-scale-codec-derive 2.3.1", - "serde 1.0.145", + "serde 1.0.160", ] [[package]] name = "parity-scale-codec" -version = "3.1.2" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b44461635bbb1a0300f100a841e571e7d919c81c73075ef5d152ffdb521066" +checksum = "637935964ff85a605d114591d4d2c13c5d1ba2806dae97cea6bf180238a749ac" dependencies = [ "arrayvec 0.7.2", - "bitvec 1.0.0", + "bitvec 1.0.1", "byte-slice-cast", "impl-trait-for-tuples", - "parity-scale-codec-derive 3.1.2", - "serde 1.0.145", + "parity-scale-codec-derive 3.1.4", + "serde 1.0.160", ] [[package]] @@ -4235,38 +4363,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "parity-scale-codec-derive" -version = "3.1.2" +version = "3.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c45ed1f39709f5a89338fab50e59816b2e8815f5bb58276e7ddf9afd495f73f8" +checksum = "86b26a931f824dd4eca30b3e43bb4f31cd5f0d3a403c5f5ff27106b805bfde7b" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "parking" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" [[package]] name = "parking_lot" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core 0.8.3", + "parking_lot_core 0.8.6", ] [[package]] @@ -4276,34 +4404,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.3", + "parking_lot_core 0.9.7", ] [[package]] name = "parking_lot_core" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "instant", "libc", - "redox_syscall 0.2.10", + "redox_syscall 0.2.16", "smallvec", "winapi", ] [[package]] name = "parking_lot_core" -version = "0.9.3" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", - "redox_syscall 0.2.10", + "redox_syscall 0.2.16", "smallvec", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -4317,9 +4445,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.5" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" [[package]] name = "pathdiff" @@ -4332,24 +4460,25 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.1.3" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +checksum = "7b1403e8401ad5dedea73c626b99758535b342502f8d1e361f4a2dd952749122" dependencies = [ + "thiserror", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.1.0" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" +checksum = "be99c4c1d2fc2769b1d00239431d711d08f6efedcecb8b6e30707160aee99c15" dependencies = [ "pest", "pest_generator", @@ -4357,26 +4486,26 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.1.3" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" +checksum = "e56094789873daa36164de2e822b3888c6ae4b4f9da555a1103587658c805b1e" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.13", ] [[package]] name = "pest_meta" -version = "2.1.3" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" +checksum = "6733073c7cff3d8459fda0e42f13a047870242aed8b509fe98000928975f359e" dependencies = [ - "maplit", + "once_cell", "pest", - "sha-1", + "sha2 0.10.6", ] [[package]] @@ -4391,41 +4520,41 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.0" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" dependencies = [ - "fixedbitset 0.4.0", + "fixedbitset 0.4.2", "indexmap", ] [[package]] name = "phf" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" dependencies = [ - "phf_shared", + "phf_shared 0.11.1", ] [[package]] name = "phf_codegen" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" dependencies = [ "phf_generator", - "phf_shared", + "phf_shared 0.11.1", ] [[package]] name = "phf_generator" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" dependencies = [ - "phf_shared", - "rand 0.8.4", + "phf_shared 0.11.1", + "rand 0.8.5", ] [[package]] @@ -4433,6 +4562,15 @@ name = "phf_shared" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" dependencies = [ "siphasher", "uncased", @@ -4446,29 +4584,29 @@ checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" [[package]] name = "pin-project" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78203e83c48cffbe01e4a2d35d566ca4de445d79a85372fc64e378bfc812a260" +checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "710faf75e1b33345361201d36d04e98ac1ed8909151a017ed384700836104c74" +checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "pin-project-lite" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pin-utils" @@ -4478,17 +4616,17 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "plotters" -version = "0.3.0" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca0ae5f169d0917a7c7f5a9c1a3d3d9598f18f529dd2b8373ed988efea307a" +checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" dependencies = [ - "num-traits 0.2.14", + "num-traits 0.2.15", "plotters-backend", "plotters-svg", "wasm-bindgen", @@ -4497,30 +4635,33 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.0" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07fffcddc1cb3a1de753caa4e4df03b79922ba43cf882acc1bdd7e8df9f4590" +checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" [[package]] name = "plotters-svg" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b38a02e23bd9604b842a812063aec4ef702b57989c37b655254bb61c471ad211" +checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" dependencies = [ "plotters-backend", ] [[package]] name = "polling" -version = "2.2.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259" +checksum = "4be1c66a6add46bff50935c313dae30a5030cf8385c5206e8a95e9e9def974aa" dependencies = [ - "cfg-if 1.0.0", + "autocfg", + "bitflags", + "cfg-if", + "concurrent-queue", "libc", "log", - "wepoll-ffi", - "winapi", + "pin-project-lite", + "windows-sys 0.48.0", ] [[package]] @@ -4529,7 +4670,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" dependencies = [ - "cpuid-bool 0.2.0", + "cpuid-bool", "opaque-debug 0.3.0", "universal-hash", ] @@ -4549,16 +4690,16 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597c3287a549da151aca6ada2795ecde089c7527bd5093114e8e0e1c3f0e52b1" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "ppv-lite86" -version = "0.2.10" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "precomputed-hash" @@ -4630,12 +4771,12 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.1.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ - "thiserror", - "toml", + "once_cell", + "toml_edit 0.19.8", ] [[package]] @@ -4645,9 +4786,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", "version_check", ] @@ -4657,23 +4798,11 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.9", + "proc-macro2 1.0.56", + "quote 1.0.26", "version_check", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro-nested" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" - [[package]] name = "proc-macro2" version = "0.4.30" @@ -4685,31 +4814,32 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] [[package]] name = "proptest" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0d9cc07f18492d879586c92b485def06bc850da3118075cd45d50e9c95b0e5" +checksum = "29f1b898011ce9595050a68e60f90bad083ff2987a695a42357134c8381fba70" dependencies = [ "bit-set", "bitflags", "byteorder", "lazy_static 1.4.0", - "num-traits 0.2.14", - "quick-error 2.0.0", - "rand 0.8.4", - "rand_chacha 0.3.0", + "num-traits 0.2.15", + "quick-error 2.0.1", + "rand 0.8.5", + "rand_chacha 0.3.1", "rand_xorshift", "regex-syntax", "rusty-fork", "tempfile", + "unarray", ] [[package]] @@ -4729,10 +4859,10 @@ version = "0.1.0" dependencies = [ "anyhow", "chrono", - "clap 3.1.8", + "clap 3.2.23", "codespan-reporting", "hex", - "itertools 0.10.1", + "itertools", "log", "move-compiler", "move-model", @@ -4740,7 +4870,7 @@ dependencies = [ "move-stackless-bytecode", "num 0.4.0", "plotters", - "serde 1.0.145", + "serde 1.0.160", "serde_json", "simplelog", "z3tracer", @@ -4752,18 +4882,18 @@ version = "0.1.0" dependencies = [ "anyhow", "chrono", - "clap 3.1.8", + "clap 3.2.23", "codespan", "codespan-reporting", "hex", - "itertools 0.10.1", + "itertools", "log", "move-compiler", "move-model", "move-prover", "move-stackless-bytecode", "num 0.4.0", - "serde 1.0.145", + "serde 1.0.160", "serde_json", "simplelog", ] @@ -4778,8 +4908,8 @@ dependencies = [ "atty", "config", "directories", - "petgraph 0.6.0", - "serde 1.0.145", + "petgraph 0.6.3", + "serde 1.0.160", "serde-value", "tint", ] @@ -4792,9 +4922,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quick-error" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ac73b1112776fc109b2e61909bc46c7e1bf0d7f690ffb1676553acce16d5cda" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quick-junit" @@ -4826,11 +4956,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.9" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ - "proc-macro2 1.0.43", + "proc-macro2 1.0.56", ] [[package]] @@ -4861,19 +4991,18 @@ dependencies = [ "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", - "rand_hc 0.2.0", + "rand_hc", ] [[package]] name = "rand" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.0", - "rand_core 0.6.2", - "rand_hc 0.3.0", + "rand_chacha 0.3.1", + "rand_core 0.6.4", ] [[package]] @@ -4888,12 +5017,12 @@ dependencies = [ [[package]] name = "rand_chacha" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.2", + "rand_core 0.6.4", ] [[package]] @@ -4907,11 +5036,11 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.2", + "getrandom 0.2.9", ] [[package]] @@ -4923,22 +5052,13 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_hc" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" -dependencies = [ - "rand_core 0.6.2", -] - [[package]] name = "rand_xorshift" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ - "rand_core 0.6.2", + "rand_core 0.6.4", ] [[package]] @@ -4947,31 +5067,28 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" dependencies = [ - "rand_core 0.6.2", + "rand_core 0.6.4", ] [[package]] name = "rayon" -version = "1.5.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ - "autocfg", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "lazy_static 1.4.0", "num_cpus", ] @@ -5008,9 +5125,18 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "redox_syscall" -version = "0.2.10" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ "bitflags", ] @@ -5028,39 +5154,40 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.2", - "redox_syscall 0.2.10", + "getrandom 0.2.9", + "redox_syscall 0.2.16", + "thiserror", ] [[package]] name = "ref-cast" -version = "1.0.6" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300f2a835d808734ee295d45007adacb9ebb29dd3ae2424acfa17930cae541da" +checksum = "f43faa91b1c8b36841ee70e97188a869d37ae21759da6846d4be66de5bf7b12c" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.6" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2" +checksum = "8d2275aab483050ab2a7364c1a46604865ee7d6906684e08db0f090acf74f9e7" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.13", ] [[package]] name = "regex" -version = "1.5.5" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ "aho-corasick", "memchr", @@ -5069,36 +5196,26 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "byteorder", "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "reqwest" -version = "0.11.11" +version = "0.11.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92" +checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" dependencies = [ - "base64", + "base64 0.21.0", "bytes", "encoding_rs", "futures-core", @@ -5110,13 +5227,13 @@ dependencies = [ "hyper-tls", "ipnet", "js-sys", - "lazy_static 1.4.0", "log", "mime", "native-tls", + "once_cell", "percent-encoding", "pin-project-lite", - "serde 1.0.145", + "serde 1.0.160", "serde_json", "serde_urlencoded", "tokio", @@ -5142,9 +5259,9 @@ dependencies = [ [[package]] name = "rlp" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "999508abb0ae792aabed2460c45b89106d97fe4adac593bdaef433c2605847b5" +checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec" dependencies = [ "bytes", "rustc-hex", @@ -5156,9 +5273,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -5167,7 +5284,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" dependencies = [ - "base64", + "base64 0.13.1", "blake2b_simd", "constant_time_eq", "crossbeam-utils", @@ -5186,19 +5303,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" [[package]] -name = "rustc_version" -version = "0.2.3" +name = "rustix" +version = "0.37.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" dependencies = [ - "semver 0.9.0", + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", ] [[package]] name = "rustversion" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24c8ad4f0c00e1eb5bc7614d236a7f1300e3dbd76b68cac8e06fb00b015ad8d8" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "rusty-fork" @@ -5214,9 +5336,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.5" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "same-file" @@ -5234,7 +5356,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c55b744399c25532d63a0d2789b109df8d46fc93752d46b0782991a931a782f" dependencies = [ "bitvec 0.20.4", - "cfg-if 1.0.0", + "cfg-if", "derive_more", "parity-scale-codec 2.3.1", "scale-info-derive", @@ -5247,19 +5369,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baeb2780690380592f86205aa4ee49815feb2acad8c2f59e6dd207148c3f1fcd" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "schannel" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "lazy_static 1.4.0", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -5268,11 +5389,17 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "scratch" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" + [[package]] name = "security-framework" -version = "2.6.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ "bitflags", "core-foundation", @@ -5283,9 +5410,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.6.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" dependencies = [ "core-foundation-sys", "libc", @@ -5293,28 +5420,13 @@ dependencies = [ [[package]] name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.4" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" dependencies = [ - "serde 1.0.145", + "serde 1.0.160", ] -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - [[package]] name = "serde" version = "0.8.23" @@ -5323,9 +5435,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" [[package]] name = "serde" -version = "1.0.145" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" +checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" dependencies = [ "serde_derive", ] @@ -5348,18 +5460,18 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12c47087018ec281d1cdab673d36aea22d816b54d498264029c05d5fa1910da6" dependencies = [ - "serde 1.0.145", + "serde 1.0.160", "thiserror", ] [[package]] name = "serde-reflection" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167450ba550f903a2b35a81ba3ca387585189e2430e3df6b94b95f3bec2f26bd" +checksum = "f05a5f801ac62a51a49d378fdb3884480041b99aced450b28990673e8ff99895" dependencies = [ "once_cell", - "serde 1.0.145", + "serde 1.0.160", "thiserror", ] @@ -5370,48 +5482,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" dependencies = [ "ordered-float", - "serde 1.0.145", + "serde 1.0.160", ] [[package]] name = "serde_bytes" -version = "0.11.5" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16ae07dd2f88a366f15bd0632ba725227018c69a1c8550a927324f8eb8368bb9" +checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" dependencies = [ - "serde 1.0.145", + "serde 1.0.160", ] [[package]] name = "serde_cbor" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" dependencies = [ "half", - "serde 1.0.145", + "serde 1.0.160", ] [[package]] name = "serde_derive" -version = "1.0.145" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" +checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.13", ] [[package]] name = "serde_json" -version = "1.0.73" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcbd0344bc6533bc7ec56df11d42fb70f1b912351c0825ccb7211b59d8af7cf5" +checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" dependencies = [ - "itoa 1.0.1", + "itoa", "ryu", - "serde 1.0.145", + "serde 1.0.160", ] [[package]] @@ -5421,18 +5533,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf" dependencies = [ "regex", - "serde 1.0.145", + "serde 1.0.160", ] [[package]] name = "serde_repr" -version = "0.1.6" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76" +checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.13", ] [[package]] @@ -5442,20 +5554,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.1", + "itoa", "ryu", - "serde 1.0.145", + "serde 1.0.160", ] [[package]] name = "serde_yaml" -version = "0.8.17" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23" +checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" dependencies = [ - "dtoa", - "linked-hash-map", - "serde 1.0.145", + "indexmap", + "ryu", + "serde 1.0.160", "yaml-rust", ] @@ -5469,28 +5581,27 @@ dependencies = [ ] [[package]] -name = "sha-1" -version = "0.8.2" +name = "sha2" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "fake-simd", - "opaque-debug 0.2.3", + "block-buffer 0.9.0", + "cfg-if", + "cpufeatures", + "digest 0.9.0", + "opaque-debug 0.3.0", ] [[package]] name = "sha2" -version = "0.9.3" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa827a14b29ab7f44778d14a88d3cb76e949c45083f7dbfa507d0cb699dc12de" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpuid-bool 0.1.2", - "digest 0.9.0", - "opaque-debug 0.3.0", + "cfg-if", + "cpufeatures", + "digest 0.10.6", ] [[package]] @@ -5520,28 +5631,28 @@ dependencies = [ [[package]] name = "sha3" -version = "0.10.1" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881bf8156c87b6301fc5ca6b27f11eeb2761224c7081e69b409d5a1951a70c86" +checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" dependencies = [ - "digest 0.10.3", + "digest 0.10.6", "keccak", ] [[package]] name = "sharded-slab" -version = "0.1.1" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79c719719ee05df97490f80a45acfc99e5a30ce98a1e4fb67aee422745ae14e3" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" dependencies = [ "lazy_static 1.4.0", ] [[package]] name = "shared_child" -version = "0.3.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6be9f7d5565b1483af3e72975e2dee33879b3b86bd48c0929fccf6585d79e65a" +checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" dependencies = [ "libc", "winapi", @@ -5549,15 +5660,15 @@ dependencies = [ [[package]] name = "shell-words" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6fa3938c99da4914afedd13bf3d79bcb6c277d1b2c398d23257a304d9e1b074" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" [[package]] name = "signal-hook" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d" +checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" dependencies = [ "libc", "signal-hook-registry", @@ -5565,35 +5676,35 @@ dependencies = [ [[package]] name = "signal-hook-mio" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29fd5867f1c4f2c5be079aee7a2adf1152ebb04a4bc4d341f504b7dece607ed4" +checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" dependencies = [ "libc", - "mio 0.7.13", + "mio 0.7.14", "signal-hook", ] [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] [[package]] name = "signature" -version = "1.3.0" +version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0242b8e50dd9accdd56170e94ca1ebd223b098eb9c83539a6e367d0f36ae68" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" [[package]] name = "similar" -version = "2.1.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e24979f63a11545f5f2c60141afe249d4f19f84581ea2138065e400941d83d3" +checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" [[package]] name = "simplelog" @@ -5624,9 +5735,12 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.4" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] [[package]] name = "slug" @@ -5650,9 +5764,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "smt2parser" @@ -5663,14 +5777,14 @@ dependencies = [ "fst", "num 0.3.1", "pomelo", - "structopt 0.3.25", + "structopt 0.3.26", ] [[package]] name = "socket2" -version = "0.4.4" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -5681,8 +5795,8 @@ name = "spec-flatten" version = "0.1.0" dependencies = [ "anyhow", - "clap 3.1.8", - "itertools 0.10.1", + "clap 3.2.23", + "itertools", "move-compiler", "move-model", "move-prover", @@ -5690,6 +5804,15 @@ dependencies = [ "pretty", ] +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -5704,14 +5827,14 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "string_cache" -version = "0.8.4" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ "new_debug_unreachable", "once_cell", "parking_lot 0.12.1", - "phf_shared", + "phf_shared 0.10.0", "precomputed-hash", ] @@ -5742,17 +5865,17 @@ version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7" dependencies = [ - "clap 2.33.3", + "clap 2.34.0", "structopt-derive 0.2.18", ] [[package]] name = "structopt" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40b9788f4202aa75c240ecc9c15c65185e6a39ccdeb0fd5d008b98825464c87c" +checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" dependencies = [ - "clap 2.33.3", + "clap 2.34.0", "lazy_static 1.4.0", "structopt-derive 0.4.18", ] @@ -5763,7 +5886,7 @@ version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107" dependencies = [ - "heck 0.3.2", + "heck 0.3.3", "proc-macro2 0.4.30", "quote 0.6.13", "syn 0.15.44", @@ -5775,24 +5898,24 @@ version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ - "heck 0.3.2", + "heck 0.3.3", "proc-macro-error", - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "subtle" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "supports-color" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4872ced36b91d47bae8a214a683fe54e7078875b399dfa251df346c9b547d1f9" +checksum = "8ba6faf2ca7ee42fdd458f4347ae0a9bd6bcc445ad7cb57ad82b383f18870d6f" dependencies = [ "atty", "is_ci", @@ -5811,25 +5934,24 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.99" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.9", + "proc-macro2 1.0.56", + "quote 1.0.26", "unicode-ident", ] [[package]] -name = "synstructure" -version = "0.12.4" +name = "syn" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" +checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", - "unicode-xid 0.2.2", + "proc-macro2 1.0.56", + "quote 1.0.26", + "unicode-ident", ] [[package]] @@ -5840,9 +5962,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.2" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9bffcddbc2458fa3e6058414599e3c838a022abae82e5c67b4f7f80298d5bff" +checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" [[package]] name = "target-spec" @@ -5851,29 +5973,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdc03d14ed79a75163d3509ebf1970a2ec67945c5cac68d947d1dddace43cec0" dependencies = [ "cfg-expr", - "serde 1.0.145", + "serde 1.0.160", "target-lexicon", ] [[package]] name = "tempfile" -version = "3.2.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" dependencies = [ - "cfg-if 1.0.0", - "libc", - "rand 0.8.4", - "redox_syscall 0.2.10", - "remove_dir_all", - "winapi", + "cfg-if", + "fastrand", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.45.0", ] [[package]] name = "tera" -version = "1.16.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c9783d6ff395ae80cf17ed9a25360e7ba37742a79fa8fddabb073c5c7c8856d" +checksum = "3df578c295f9ec044ff1c829daf31bb7581d5b3c2a7a3d87419afe1f2531438c" dependencies = [ "chrono", "chrono-tz", @@ -5883,9 +6004,9 @@ dependencies = [ "percent-encoding", "pest", "pest_derive", - "rand 0.8.4", + "rand 0.8.5", "regex", - "serde 1.0.145", + "serde 1.0.160", "serde_json", "slug", "unic-segment", @@ -5915,9 +6036,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" dependencies = [ "winapi-util", ] @@ -5926,11 +6047,11 @@ dependencies = [ name = "test-generation" version = "0.1.0" dependencies = [ - "clap 3.1.8", + "clap 3.2.23", "crossbeam-channel", - "getrandom 0.2.2", + "getrandom 0.2.9", "hex", - "itertools 0.10.1", + "itertools", "module-generation", "move-binary-format", "move-bytecode-verifier", @@ -5942,7 +6063,7 @@ dependencies = [ "move-vm-types", "num_cpus", "once_cell", - "rand 0.8.4", + "rand 0.8.5", "tracing", "tracing-subscriber", ] @@ -5958,44 +6079,54 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.13", ] [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if", "once_cell", ] +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + [[package]] name = "time" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ "libc", "wasi 0.10.0+wasi-snapshot-preview1", @@ -6026,61 +6157,60 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" dependencies = [ - "serde 1.0.145", + "serde 1.0.160", "serde_json", ] [[package]] name = "tinyvec" -version = "1.1.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.19.2" +version = "1.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439" +checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" dependencies = [ + "autocfg", "bytes", "libc", - "memchr", - "mio 0.8.4", + "mio 0.8.6", "num_cpus", - "once_cell", "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "winapi", + "windows-sys 0.45.0", ] [[package]] name = "tokio-macros" -version = "1.8.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.13", ] [[package]] name = "tokio-native-tls" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", "tokio", @@ -6088,9 +6218,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.3" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ "bytes", "futures-core", @@ -6102,14 +6232,20 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "indexmap", - "serde 1.0.145", + "serde 1.0.160", ] +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" + [[package]] name = "toml_edit" version = "0.14.4" @@ -6118,8 +6254,19 @@ checksum = "5376256e44f2443f8896ac012507c19a012df0fe8758b55246ae51a2279db51f" dependencies = [ "combine", "indexmap", - "itertools 0.10.1", - "serde 1.0.145", + "itertools", + "serde 1.0.160", +] + +[[package]] +name = "toml_edit" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", ] [[package]] @@ -6130,11 +6277,11 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.26" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -6143,20 +6290,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.15" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "tracing-core" -version = "0.1.28" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ "once_cell", "valuable", @@ -6174,9 +6321,9 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" dependencies = [ "lazy_static 1.4.0", "log", @@ -6185,12 +6332,12 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b" +checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" dependencies = [ - "ansi_term 0.12.1", "matchers", + "nu-ansi-term", "once_cell", "regex", "sharded-slab", @@ -6213,9 +6360,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "trybuild" @@ -6225,7 +6372,7 @@ checksum = "9d664de8ea7e531ad4c0f5a834f20b8cb2b8e6dfe88d05796ee7887518ed67b9" dependencies = [ "glob", "lazy_static 1.4.0", - "serde 1.0.145", + "serde 1.0.160", "serde_json", "termcolor", "toml", @@ -6246,37 +6393,37 @@ dependencies = [ [[package]] name = "twox-hash" -version = "1.6.2" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "static_assertions", ] [[package]] name = "typed-arena" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0685c84d5d54d1c26f7d3eb96cd41550adb97baed141a761cf335d3d33bcd0ae" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" +checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" [[package]] name = "uint" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a45526d29728d135c2900b0d30573fe3ee79fceb12ef534c7bb30e810a91b601" +checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52" dependencies = [ "byteorder", "crunchy", @@ -6284,6 +6431,12 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "unarray" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" + [[package]] name = "uncased" version = "0.9.7" @@ -6345,39 +6498,36 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.4" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -dependencies = [ - "matches", -] +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.3" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-normalization" -version = "0.1.17" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.7.1" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "unicode-xid" @@ -6387,15 +6537,9 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" [[package]] name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[package]] -name = "unindent" -version = "0.1.7" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "universal-hash" @@ -6403,28 +6547,27 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.7", "subtle", ] [[package]] name = "url" -version = "2.2.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", "idna", - "matches", "percent-encoding", - "serde 1.0.145", + "serde 1.0.160", ] [[package]] name = "utf8parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "valuable" @@ -6448,8 +6591,8 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aae2faf80ac463422992abf4de234731279c058aaf33171ca70277c98406b124" dependencies = [ - "quote 1.0.9", - "syn 1.0.99", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -6466,9 +6609,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "version_check" -version = "0.9.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vte" @@ -6487,8 +6630,8 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.9", + "proc-macro2 1.0.56", + "quote 1.0.26", ] [[package]] @@ -6508,12 +6651,11 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] @@ -6547,36 +6689,36 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.71" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee1280240b7c461d6a0071313e08f34a60b0365f14260362e5a2b17d1d31aa7" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.71" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b7d8b6942b8bb3a9b0e73fc79b98095a27de6fa247615e59d096754a3bc2aa8" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", - "lazy_static 1.4.0", "log", - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "once_cell", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.21" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e67a5806118af01f0d9045915676b22aaebecf4178ae7021bc171dab0b897ab" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -6584,57 +6726,48 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.71" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ac38da8ef716661f0f36c0d8320b89028efe10c7c0afde65baffb496ce0d3b" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ - "quote 1.0.9", + "quote 1.0.26", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.71" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc053ec74d454df287b9374ee8abb36ffd5acb95ba87da3ba5b7d3fe20eb401e" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.71" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d6f8ec44822dd71f5f221a5847fb34acd9060535c1211b70a05844c0f6383b1" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "web-sys" -version = "0.3.48" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec600b26223b2948cedfde2a0aa6756dcf1fef616f43d7b3097aaf53a6c4d92b" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", ] -[[package]] -name = "wepoll-ffi" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" -dependencies = [ - "cc", -] - [[package]] name = "whoami" -version = "1.2.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524b58fa5a20a2fb3014dd6358b70e6579692a56ef6fce928834e488f42f65e8" +checksum = "2c70234412ca409cc04e864e89523cb0fc37f5e1344ebed5a3ebf4192b6b9f68" dependencies = [ "wasm-bindgen", "web-sys", @@ -6677,48 +6810,170 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.0", +] + [[package]] name = "windows-sys" -version = "0.36.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + [[package]] name = "windows_aarch64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.36.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +dependencies = [ + "memchr", +] [[package]] name = "winreg" @@ -6737,9 +6992,9 @@ checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" [[package]] name = "wyz" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] @@ -6752,7 +7007,7 @@ dependencies = [ "camino", "cargo_metadata", "chrono", - "clap 3.1.8", + "clap 3.2.23", "colored-diff", "determinator", "env_logger", @@ -6765,7 +7020,7 @@ dependencies = [ "nextest-runner", "rayon", "regex", - "serde 1.0.145", + "serde 1.0.160", "serde_json", "supports-color", "toml", @@ -6786,7 +7041,7 @@ dependencies = [ "log", "once_cell", "ouroboros", - "serde 1.0.145", + "serde 1.0.160", "toml", ] @@ -6797,7 +7052,7 @@ dependencies = [ "camino", "guppy", "once_cell", - "serde 1.0.145", + "serde 1.0.160", "toml", "x-core", ] @@ -6809,7 +7064,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f3519d56987103ef084eba6ddfc3be45b7eaee08f2d60bc8495cdca30362a32" dependencies = [ "curve25519-dalek-fiat", - "rand_core 0.6.2", + "rand_core 0.6.4", "zeroize", ] @@ -6829,27 +7084,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57b52f3d4b300ffa9400cd78caebaaa6ef5a0189d08ec134624e2b8f3890b6e0" dependencies = [ "smt2parser", - "structopt 0.3.25", + "structopt 0.3.26", "thiserror", ] [[package]] name = "zeroize" -version = "1.2.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a974bcdd357f0dca4d41677db03436324d45a4c9ed2d0b873a5a360ce41c36" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.2.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdff2024a851a322b08f179173ae2ba620445aef1e838f0c196820eade4ae0c7" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.9", - "syn 1.0.99", - "synstructure", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.13", ] diff --git a/Cargo.toml b/Cargo.toml index ef9b55931e..534ada75cb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -100,6 +100,50 @@ default-members = [ # Dependencies that should be kept in sync through the whole workspace [workspace.dependencies] bcs = "0.1.4" +sha3 = "0.9.1" +tracing = "0.1.26" + +petgraph = "0.5.1" + +ref-cast = "1.0.6" +variant_count = "1.1.0" + +serde = { version = "1.0.124", default-features = false, features = ["alloc"]} +serde_bytes = "0.11.5" +hex = "0.4.3" +primitive-types = {version = "0.10.1", features = ["impl-serde"]} +uint = "0.9.4" +num = "0.4.0" +ethnum = "1.0.4" +smallvec = "1.6.1" +hashbrown = "0.13.2" +spin = "0.9.5" + +thiserror = "1.0.24" + +serde_json = "1.0.64" + +#regex = "1.5.5" +num-bigint = "0.4.0" + +sha2 = "0.9.3" + + +# std::error::Error +anyhow = "1.0.52" + +better_any = "0.1.1" # impl Traits for Mutex/RwLock, may not be a problem if not used; +fail = "0.4.0" + +move-vm-runtime = { path = "language/move-vm/runtime"} +move-vm-types = { path = "language/move-vm/types"} +move-binary-format = { path = "language/move-binary-format"} +move-symbol-pool = { path = "language/move-symbol-pool"} +move-ir-types = { path = "language/move-ir/types"} +move-stdlib = { path = "language/move-stdlib/"} +move-core-types = { path = "language/move-core/types"} +move-bytecode-verifier = { path = "language/move-bytecode-verifier"} +move-borrow-graph = { path = "language/move-borrow-graph"} [profile.bench] debug = true diff --git a/language/move-binary-format/Cargo.toml b/language/move-binary-format/Cargo.toml index 36b4253144..e057dc6edd 100644 --- a/language/move-binary-format/Cargo.toml +++ b/language/move-binary-format/Cargo.toml @@ -10,15 +10,16 @@ publish = ["crates-io"] edition = "2021" [dependencies] -anyhow = "1.0.52" -once_cell = "1.7.2" +anyhow.workspace = true +ref-cast.workspace = true +variant_count.workspace = true +serde.workspace = true +hashbrown.workspace = true +arbitrary = { version = "1.1.7", optional = true, features = ["derive"] } proptest = { version = "1.0.0", optional = true } proptest-derive = { version = "0.3.0", optional = true } -ref-cast = "1.0.6" -variant_count = "1.1.0" -move-core-types = { path = "../move-core/types" } -serde = { version = "1.0.124", default-features = false } -arbitrary = { version = "1.1.7", optional = true, features = ["derive"] } + +move-core-types.workspace = true [dev-dependencies] proptest = "1.0.0" diff --git a/language/move-binary-format/src/deserializer.rs b/language/move-binary-format/src/deserializer.rs index 33ca060009..5f243d7fe0 100644 --- a/language/move-binary-format/src/deserializer.rs +++ b/language/move-binary-format/src/deserializer.rs @@ -7,7 +7,8 @@ use move_core_types::{ account_address::AccountAddress, identifier::Identifier, metadata::Metadata, state::VMState, vm_status::StatusCode, }; -use std::{collections::HashSet, convert::TryInto, io::Read}; +use std::{ convert::TryInto, io::Read}; +use hashbrown::HashSet; impl CompiledScript { /// Deserializes a &[u8] slice into a `CompiledScript` instance. diff --git a/language/move-bytecode-verifier/Cargo.toml b/language/move-bytecode-verifier/Cargo.toml index 2b1bab73d0..65e7a8de0c 100644 --- a/language/move-bytecode-verifier/Cargo.toml +++ b/language/move-bytecode-verifier/Cargo.toml @@ -10,13 +10,14 @@ publish = false edition = "2021" [dependencies] -anyhow = "1.0.52" -petgraph = "0.5.1" -fail = "0.4.0" +anyhow.workspace = true +petgraph.workspace = true +fail.workspace = true +hashbrown.workspace = true -move-borrow-graph = { path = "../move-borrow-graph" } -move-binary-format = { path = "../move-binary-format" } -move-core-types = { path = "../move-core/types" } +move-borrow-graph.workspace = true +move-binary-format.workspace = true +move-core-types.workspace = true [dev-dependencies] hex-literal = "0.3.4" diff --git a/language/move-bytecode-verifier/src/absint.rs b/language/move-bytecode-verifier/src/absint.rs index 9945d6f3d7..b27c0aece5 100644 --- a/language/move-bytecode-verifier/src/absint.rs +++ b/language/move-bytecode-verifier/src/absint.rs @@ -9,7 +9,7 @@ use move_binary_format::{ errors::PartialVMResult, file_format::{Bytecode, CodeOffset}, }; -use std::collections::BTreeMap; +use alloc::collections::BTreeMap; /// Trait for finite-height abstract domains. Infinite height domains would require a more complex /// trait with widening and a partial order. diff --git a/language/move-bytecode-verifier/src/acquires_list_verifier.rs b/language/move-bytecode-verifier/src/acquires_list_verifier.rs index 9bad9e5731..2f47abfaa4 100644 --- a/language/move-bytecode-verifier/src/acquires_list_verifier.rs +++ b/language/move-bytecode-verifier/src/acquires_list_verifier.rs @@ -11,7 +11,8 @@ //! - No missing resources (any resource acquired must be present) //! - No additional resources (no extraneous resources not actually acquired) -use std::collections::{BTreeSet, HashMap}; +use alloc::collections::BTreeSet; +use hashbrown::HashMap; use crate::meter::Meter; use move_binary_format::{ diff --git a/language/move-bytecode-verifier/src/check_duplication.rs b/language/move-bytecode-verifier/src/check_duplication.rs index 0847657f7c..08201c83ad 100644 --- a/language/move-bytecode-verifier/src/check_duplication.rs +++ b/language/move-bytecode-verifier/src/check_duplication.rs @@ -9,6 +9,8 @@ //! - struct and field definitions are consistent //! - the handles in struct and function definitions point to the self module index //! - all struct and function handles pointing to the self module index have a definition +use core::hash::Hash; +use hashbrown::HashSet; use move_binary_format::{ access::{ModuleAccess, ScriptAccess}, errors::{verification_error, Location, PartialVMResult, VMResult}, @@ -22,7 +24,6 @@ use move_binary_format::{ use move_core_types::{ account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode, }; -use std::{collections::HashSet, hash::Hash}; pub struct DuplicationChecker<'a> { module: &'a CompiledModule, diff --git a/language/move-bytecode-verifier/src/code_unit_verifier.rs b/language/move-bytecode-verifier/src/code_unit_verifier.rs index 265d86f3c2..ca229c726d 100644 --- a/language/move-bytecode-verifier/src/code_unit_verifier.rs +++ b/language/move-bytecode-verifier/src/code_unit_verifier.rs @@ -26,7 +26,7 @@ use move_binary_format::{ IndexKind, }; use move_core_types::vm_status::StatusCode; -use std::collections::HashMap; +use hashbrown::HashMap; pub struct CodeUnitVerifier<'a> { resolver: BinaryIndexedView<'a>, diff --git a/language/move-bytecode-verifier/src/control_flow.rs b/language/move-bytecode-verifier/src/control_flow.rs index 6012684be1..01f728ecf4 100644 --- a/language/move-bytecode-verifier/src/control_flow.rs +++ b/language/move-bytecode-verifier/src/control_flow.rs @@ -18,6 +18,7 @@ use crate::{ meter::Meter, verifier::VerifierConfig, }; +use alloc::collections::BTreeSet; use move_binary_format::{ access::{ModuleAccess, ScriptAccess}, binary_views::FunctionView, @@ -28,7 +29,6 @@ use move_binary_format::{ CompiledModule, }; use move_core_types::vm_status::StatusCode; -use std::collections::BTreeSet; /// Perform control flow verification on the compiled function, returning its `FunctionView` if /// verification was successful. diff --git a/language/move-bytecode-verifier/src/control_flow_v5.rs b/language/move-bytecode-verifier/src/control_flow_v5.rs index 092fcbf46b..0977fe6593 100644 --- a/language/move-bytecode-verifier/src/control_flow_v5.rs +++ b/language/move-bytecode-verifier/src/control_flow_v5.rs @@ -14,7 +14,8 @@ use move_binary_format::{ safe_unwrap, }; use move_core_types::vm_status::StatusCode; -use std::{collections::HashSet, convert::TryInto}; +use core::{ convert::TryInto}; +use hashbrown::HashSet; pub fn verify( verifier_config: &VerifierConfig, @@ -275,7 +276,7 @@ fn count_loop_depth(labels: &[Label]) -> Vec { count += 1 } counts.push(count); - if last_continues.contains(&idx.try_into().unwrap()) { + if last_continues.contains(&CodeOffset::try_from(idx).unwrap()) { count -= 1; } } diff --git a/language/move-bytecode-verifier/src/cyclic_dependencies.rs b/language/move-bytecode-verifier/src/cyclic_dependencies.rs index ee26611a02..873aa3f93e 100644 --- a/language/move-bytecode-verifier/src/cyclic_dependencies.rs +++ b/language/move-bytecode-verifier/src/cyclic_dependencies.rs @@ -3,13 +3,14 @@ // SPDX-License-Identifier: Apache-2.0 //! This module contains verification of usage of dependencies for modules +use alloc::collections::BTreeSet; use move_binary_format::{ access::ModuleAccess, errors::{Location, PartialVMError, PartialVMResult, VMResult}, file_format::CompiledModule, }; use move_core_types::{language_storage::ModuleId, vm_status::StatusCode}; -use std::collections::BTreeSet; + // This function performs a DFS in the module graph starting from each node in `items_to_explore` // and explores the neighbors of a node using the `immediate_nexts` closure. diff --git a/language/move-bytecode-verifier/src/dependencies.rs b/language/move-bytecode-verifier/src/dependencies.rs index f24b75487f..44da81ed85 100644 --- a/language/move-bytecode-verifier/src/dependencies.rs +++ b/language/move-bytecode-verifier/src/dependencies.rs @@ -16,7 +16,7 @@ use move_binary_format::{ safe_unwrap, IndexKind, }; use move_core_types::{identifier::Identifier, language_storage::ModuleId, vm_status::StatusCode}; -use std::collections::{BTreeMap, BTreeSet}; +use alloc::collections::{BTreeMap, BTreeSet}; struct Context<'a, 'b> { resolver: BinaryIndexedView<'a>, diff --git a/language/move-bytecode-verifier/src/instantiation_loops.rs b/language/move-bytecode-verifier/src/instantiation_loops.rs index 9af7dff237..a72fe11f0c 100644 --- a/language/move-bytecode-verifier/src/instantiation_loops.rs +++ b/language/move-bytecode-verifier/src/instantiation_loops.rs @@ -28,7 +28,7 @@ use petgraph::{ visit::EdgeRef, Graph, }; -use std::collections::{hash_map, HashMap, HashSet}; +use hashbrown::{hash_map, HashMap, HashSet}; /// Data attached to each node. /// Each node corresponds to a type formal of a generic function in the module. diff --git a/language/move-bytecode-verifier/src/lib.rs b/language/move-bytecode-verifier/src/lib.rs index 11fd9eb90d..9f1d393a1f 100644 --- a/language/move-bytecode-verifier/src/lib.rs +++ b/language/move-bytecode-verifier/src/lib.rs @@ -6,6 +6,8 @@ //! Verifies bytecode sanity. +extern crate alloc; + // Bounds checks are implemented in the `vm` crate. pub mod ability_field_requirements; pub mod absint; diff --git a/language/move-bytecode-verifier/src/loop_summary.rs b/language/move-bytecode-verifier/src/loop_summary.rs index 0f56382b83..8045f4e6bd 100644 --- a/language/move-bytecode-verifier/src/loop_summary.rs +++ b/language/move-bytecode-verifier/src/loop_summary.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use move_binary_format::control_flow_graph::{BlockId, ControlFlowGraph, VMControlFlowGraph}; -use std::collections::{btree_map::Entry, BTreeMap, BTreeSet}; +use alloc::collections::{btree_map::Entry, BTreeMap, BTreeSet}; /// Dense index into nodes in the same `LoopSummary` #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] diff --git a/language/move-bytecode-verifier/src/meter.rs b/language/move-bytecode-verifier/src/meter.rs index 2e53fdadd0..c02b596f17 100644 --- a/language/move-bytecode-verifier/src/meter.rs +++ b/language/move-bytecode-verifier/src/meter.rs @@ -4,7 +4,7 @@ use crate::VerifierConfig; use move_binary_format::errors::{PartialVMError, PartialVMResult}; use move_core_types::vm_status::StatusCode; -use std::ops::Mul; +use core::ops::Mul; /// Scope of meterinng #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)] diff --git a/language/move-bytecode-verifier/src/reference_safety/abstract_state.rs b/language/move-bytecode-verifier/src/reference_safety/abstract_state.rs index d2d4172807..706778fb3c 100644 --- a/language/move-bytecode-verifier/src/reference_safety/abstract_state.rs +++ b/language/move-bytecode-verifier/src/reference_safety/abstract_state.rs @@ -18,7 +18,7 @@ use move_binary_format::{ }; use move_borrow_graph::references::RefID; use move_core_types::vm_status::StatusCode; -use std::collections::{BTreeMap, BTreeSet}; +use alloc::collections::{BTreeMap, BTreeSet}; type BorrowGraph = move_borrow_graph::graph::BorrowGraph<(), Label>; @@ -62,8 +62,8 @@ enum Label { } // Needed for debugging with the borrow graph -impl std::fmt::Display for Label { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { +impl alloc::fmt::Display for Label { + fn fmt(&self, f: &mut alloc::fmt::Formatter<'_>) -> alloc::fmt::Result { match self { Label::Local(i) => write!(f, "local#{}", i), Label::Global(i) => write!(f, "resource@{}", i), @@ -324,7 +324,7 @@ impl AbstractState { offset: CodeOffset, local: LocalIndex, ) -> PartialVMResult { - let old_value = std::mem::replace( + let old_value = core::mem::replace( safe_unwrap!(self.locals.get_mut(local as usize)), AbstractValue::NonReference, ); @@ -344,7 +344,7 @@ impl AbstractState { new_value: AbstractValue, ) -> PartialVMResult<()> { let old_value = - std::mem::replace(safe_unwrap!(self.locals.get_mut(local as usize)), new_value); + core::mem::replace(safe_unwrap!(self.locals.get_mut(local as usize)), new_value); match old_value { AbstractValue::Reference(id) => { self.release(id); diff --git a/language/move-bytecode-verifier/src/reference_safety/mod.rs b/language/move-bytecode-verifier/src/reference_safety/mod.rs index 85bcb555a8..7bcf68d81a 100644 --- a/language/move-bytecode-verifier/src/reference_safety/mod.rs +++ b/language/move-bytecode-verifier/src/reference_safety/mod.rs @@ -18,6 +18,8 @@ use crate::{ }, }; use abstract_state::{AbstractState, AbstractValue}; +use alloc::collections::BTreeSet; +use hashbrown::HashMap; use move_binary_format::{ binary_views::{BinaryIndexedView, FunctionView}, errors::{PartialVMError, PartialVMResult}, @@ -28,7 +30,6 @@ use move_binary_format::{ safe_assert, safe_unwrap, }; use move_core_types::vm_status::StatusCode; -use std::collections::{BTreeSet, HashMap}; struct ReferenceSafetyAnalysis<'a> { resolver: &'a BinaryIndexedView<'a>, diff --git a/language/move-bytecode-verifier/src/struct_defs.rs b/language/move-bytecode-verifier/src/struct_defs.rs index 00c9746863..4240c5d783 100644 --- a/language/move-bytecode-verifier/src/struct_defs.rs +++ b/language/move-bytecode-verifier/src/struct_defs.rs @@ -17,7 +17,7 @@ use move_binary_format::{ }; use move_core_types::vm_status::StatusCode; use petgraph::{algo::toposort, graphmap::DiGraphMap}; -use std::collections::{BTreeMap, BTreeSet}; +use alloc::collections::{BTreeMap, BTreeSet}; pub struct RecursiveStructDefChecker<'a> { module: &'a CompiledModule, diff --git a/language/move-core/types/Cargo.toml b/language/move-core/types/Cargo.toml index 3faeb6aa35..1c19c6e561 100644 --- a/language/move-core/types/Cargo.toml +++ b/language/move-core/types/Cargo.toml @@ -10,20 +10,19 @@ publish = ["crates-io"] edition = "2021" [dependencies] -anyhow = "1.0.52" -hex = "0.4.3" -once_cell = "1.7.2" +anyhow.workspace = true +hex.workspace = true +ref-cast.workspace = true +serde.workspace = true +serde_bytes.workspace = true +primitive-types.workspace = true +uint.workspace = true +num.workspace = true +ethnum.workspace = true +spin.workspace = true +arbitrary = { version = "1.1.7", features = [ "derive_arbitrary"], optional = true } proptest = { version = "1.0.0", default-features = false, optional = true } proptest-derive = { version = "0.3.0", default-features = false, optional = true } -rand = "0.8.3" -ref-cast = "1.0.6" -serde = { version = "1.0.124", default-features = false } -serde_bytes = "0.11.5" -primitive-types = {version = "0.10.1", features = ["impl-serde"]} -uint = "0.9.4" -num = "0.4.0" -ethnum = "1.0.4" -arbitrary = { version = "1.1.7", features = [ "derive_arbitrary"], optional = true } bcs.workspace = true @@ -33,6 +32,7 @@ proptest-derive = "0.3.0" regex = "1.5.5" serde_json = "1.0.64" arbitrary = { version = "1.1.7", features = [ "derive_arbitrary"] } +rand = "*" [features] address20 = [] diff --git a/language/move-core/types/src/account_address.rs b/language/move-core/types/src/account_address.rs index 61a4889907..f8fc1e7b13 100644 --- a/language/move-core/types/src/account_address.rs +++ b/language/move-core/types/src/account_address.rs @@ -3,6 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 use hex::FromHex; +#[cfg(test)] use rand::{rngs::OsRng, Rng}; use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer}; use std::{convert::TryFrom, fmt, str::FromStr}; @@ -49,6 +50,7 @@ impl AccountAddress { Self(addr) } + #[cfg(test)] pub fn random() -> Self { let mut rng = OsRng; let buf: [u8; Self::LENGTH] = rng.gen(); diff --git a/language/move-core/types/src/u256.rs b/language/move-core/types/src/u256.rs index fb240326ce..e03789a92d 100644 --- a/language/move-core/types/src/u256.rs +++ b/language/move-core/types/src/u256.rs @@ -5,6 +5,7 @@ use ethnum::U256 as EthnumU256; use num::{bigint::Sign, BigInt}; #[cfg(any(test, feature = "fuzzing"))] use proptest::strategy::BoxedStrategy; +#[cfg(test)] use rand::{ distributions::{ uniform::{SampleUniform, UniformSampler}, @@ -421,6 +422,7 @@ impl U256 { /// Implementation of widenining multiply /// https://github.com/rust-random/rand/blob/master/src/distributions/utils.rs + #[cfg(test)] #[inline(always)] fn wmul(self, b: Self) -> (Self, Self) { let half = 128; @@ -555,6 +557,7 @@ impl TryFrom for u128 { } } +#[cfg(test)] impl Distribution for Standard { #[inline] fn sample(&self, rng: &mut R) -> U256 { @@ -574,10 +577,12 @@ pub struct UniformU256 { z: U256, } +#[cfg(test)] impl SampleUniform for U256 { type Sampler = UniformU256; } +#[cfg(test)] impl UniformSampler for UniformU256 { type X = U256; diff --git a/language/move-core/types/src/vm_status.rs b/language/move-core/types/src/vm_status.rs index 83ca430250..6631ab9ee6 100644 --- a/language/move-core/types/src/vm_status.rs +++ b/language/move-core/types/src/vm_status.rs @@ -336,7 +336,7 @@ pub mod known_locations { language_storage::{ModuleId, CORE_CODE_ADDRESS}, vm_status::AbortLocation, }; - use once_cell::sync::Lazy; + use spin::Lazy; /// The Identifier for the Account module. pub const CORE_ACCOUNT_MODULE_IDENTIFIER: &IdentStr = ident_str!("Account"); diff --git a/language/move-ir/types/Cargo.toml b/language/move-ir/types/Cargo.toml index 3839631e1c..0beef08157 100644 --- a/language/move-ir/types/Cargo.toml +++ b/language/move-ir/types/Cargo.toml @@ -12,11 +12,13 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = "1.0.52" -serde = { version = "1.0.124", features = ["derive"] } -hex = "0.4.3" -once_cell = "1.7.2" +anyhow.workspace = true +serde = { workspace = true, features = ["derive"] } +hex.workspace = true +sha2.workspace = true +spin.workspace = true +hashbrown.workspace = true -move-core-types = { path = "../../move-core/types" } -move-symbol-pool = { path = "../../move-symbol-pool" } +move-core-types.workspace = true +move-symbol-pool.workspace = true move-command-line-common = { path = "../../move-command-line-common" } diff --git a/language/move-ir/types/src/ast.rs b/language/move-ir/types/src/ast.rs index 9368f6cf83..afd9ff74c0 100644 --- a/language/move-ir/types/src/ast.rs +++ b/language/move-ir/types/src/ast.rs @@ -4,19 +4,21 @@ use crate::{ location::*, + no_std::*, spec_language_ast::{Condition, Invariant, SyntheticDefinition}, }; +use alloc::{ + collections::{BTreeSet, VecDeque}, + fmt, +}; +use hashbrown::HashSet; use move_core_types::{ account_address::AccountAddress, identifier::Identifier, language_storage::ModuleId, value::MoveValue, }; use move_symbol_pool::Symbol; -use once_cell::sync::Lazy; use serde::{Deserialize, Serialize}; -use std::{ - collections::{BTreeSet, HashSet, VecDeque}, - fmt, -}; +use spin::Lazy; //************************************************************************************************** // Program diff --git a/language/move-ir/types/src/lib.rs b/language/move-ir/types/src/lib.rs index a64dfadeea..d74ad86fc5 100644 --- a/language/move-ir/types/src/lib.rs +++ b/language/move-ir/types/src/lib.rs @@ -4,6 +4,17 @@ //! Base types for the Move IR. +#![no_std] +#[macro_use] +extern crate alloc; +#[allow(unused_imports)] +pub(crate) mod no_std { + pub use alloc::borrow::ToOwned; + pub use alloc::boxed::Box; + pub use alloc::string::String; + pub use alloc::string::ToString; + pub use alloc::vec::Vec; +} pub mod ast; pub mod location; pub mod spec_language_ast; diff --git a/language/move-ir/types/src/location.rs b/language/move-ir/types/src/location.rs index 3aa31a1b19..85f3796797 100644 --- a/language/move-ir/types/src/location.rs +++ b/language/move-ir/types/src/location.rs @@ -2,14 +2,14 @@ // Copyright (c) The Move Contributors // SPDX-License-Identifier: Apache-2.0 -use move_command_line_common::files::FileHash; -use serde::{Deserialize, Serialize}; -use std::{ +use alloc::fmt; +use core::{ cmp::Ordering, - fmt, hash::{Hash, Hasher}, ops::Range, }; +use move_command_line_common::files::FileHash; +use serde::{Deserialize, Serialize}; //************************************************************************************************** // Loc @@ -135,7 +135,7 @@ impl Ord for Spanned { } impl fmt::Display for Spanned { - fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result { + fn fmt(&self, f: &mut fmt::Formatter) -> alloc::fmt::Result { write!(f, "{}", &self.value) } } diff --git a/language/move-ir/types/src/spec_language_ast.rs b/language/move-ir/types/src/spec_language_ast.rs index 3a67860b1f..27bb13c4e4 100644 --- a/language/move-ir/types/src/spec_language_ast.rs +++ b/language/move-ir/types/src/spec_language_ast.rs @@ -5,6 +5,7 @@ use crate::{ ast::{BinOp, CopyableVal_, Field_, QualifiedStructIdent, Type}, location::*, + no_std::*, }; use move_core_types::account_address::AccountAddress; use move_symbol_pool::Symbol; diff --git a/language/move-symbol-pool/Cargo.toml b/language/move-symbol-pool/Cargo.toml index db132c8990..e1fe5a271a 100644 --- a/language/move-symbol-pool/Cargo.toml +++ b/language/move-symbol-pool/Cargo.toml @@ -10,8 +10,10 @@ publish = false edition = "2021" [dependencies] -once_cell = "1.7.2" -serde = { version = "1.0.124", features = ["derive"] } +spin.workspace = true +hashbrown.workspace = true + +serde = { workspace = true, features = ["derive"] } [dev-dependencies] diff --git a/language/move-symbol-pool/src/lib.rs b/language/move-symbol-pool/src/lib.rs index 68ca506ec4..02d251583a 100644 --- a/language/move-symbol-pool/src/lib.rs +++ b/language/move-symbol-pool/src/lib.rs @@ -21,12 +21,23 @@ //! [servo/string-cache]: https://github.com/servo/string-cache //! [`Symbol`]: crate::Symbol +#![no_std] +#[macro_use] +extern crate alloc; +#[allow(unused_imports)] +pub(crate) mod no_std { + pub use alloc::borrow::ToOwned; + pub use alloc::boxed::Box; + pub use alloc::string::String; + pub use alloc::string::ToString; + pub use alloc::vec::Vec; +} mod pool; pub mod symbol; -use once_cell::sync::Lazy; use pool::Pool; -use std::sync::Mutex; +use spin::Lazy; +use spin::Mutex; pub use symbol::Symbol; diff --git a/language/move-symbol-pool/src/pool.rs b/language/move-symbol-pool/src/pool.rs index d0f61416bf..b4efe0075f 100644 --- a/language/move-symbol-pool/src/pool.rs +++ b/language/move-symbol-pool/src/pool.rs @@ -33,12 +33,14 @@ //! [`HashSet`]: std::collections::HashSet //! [`LinkedList`]: std::collections::LinkedList -use std::{ - borrow::Cow, - collections::hash_map::DefaultHasher, - hash::{Hash, Hasher}, +use crate::no_std::*; +use alloc::borrow::Cow; + +use core::{ + hash::{BuildHasher, Hash, Hasher}, ptr::NonNull, }; +use hashbrown::hash_map::DefaultHashBuilder; /// The number of buckets in the pool's contiguous array. const NB_BUCKETS: usize = 1 << 12; // 4096 @@ -62,7 +64,7 @@ impl Pool { /// Allocates a contiguous array of buckets on the heap. As strings are /// inserted into the pool, buckets in this array are filled with an entry. pub(crate) fn new() -> Self { - let vec = std::mem::ManuallyDrop::new(vec![0_usize; NB_BUCKETS]); + let vec = core::mem::ManuallyDrop::new(vec![0_usize; NB_BUCKETS]); Self(unsafe { Box::from_raw(vec.as_ptr() as *mut [Bucket; NB_BUCKETS]) }) } @@ -71,7 +73,7 @@ impl Pool { /// as well as a scalar value that can be used to quickly check whether /// two strings are not equal. fn hash(string: &str) -> u64 { - let mut hasher = DefaultHasher::new(); + let mut hasher = DefaultHashBuilder::default().build_hasher(); string.hash(&mut hasher); hasher.finish() } diff --git a/language/move-symbol-pool/src/symbol.rs b/language/move-symbol-pool/src/symbol.rs index 301eb1c779..82c83da1ca 100644 --- a/language/move-symbol-pool/src/symbol.rs +++ b/language/move-symbol-pool/src/symbol.rs @@ -2,9 +2,10 @@ // Copyright (c) The Move Contributors // SPDX-License-Identifier: Apache-2.0 -use crate::{pool::Entry, SYMBOL_POOL}; +use crate::{no_std::*, pool::Entry, SYMBOL_POOL}; +use alloc::borrow::Cow; +use core::{cmp::Ordering, fmt, num::NonZeroU64, ops::Deref}; use serde::{de::Deserialize, ser::Serialize}; -use std::{borrow::Cow, cmp::Ordering, fmt, num::NonZeroU64, ops::Deref}; /// Represents a string that has been cached. /// @@ -49,7 +50,7 @@ impl Symbol { impl<'a> From> for Symbol { fn from(s: Cow<'a, str>) -> Self { - let mut pool = SYMBOL_POOL.lock().expect("could not acquire lock on pool"); + let mut pool = SYMBOL_POOL.lock(); let address = pool.insert(s).as_ptr() as u64; Symbol(NonZeroU64::new(address).expect("address of symbol cannot be null")) } diff --git a/language/move-vm/runtime/Cargo.toml b/language/move-vm/runtime/Cargo.toml index fb28ca5964..1cc42046f7 100644 --- a/language/move-vm/runtime/Cargo.toml +++ b/language/move-vm/runtime/Cargo.toml @@ -12,17 +12,17 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -better_any = "0.1.1" -fail = "0.4.0" -once_cell = "1.7.2" -parking_lot = "0.11.1" -sha3 = "0.9.1" -tracing = "0.1.26" +better_any.workspace = true +fail.workspace = true +spin.workspace = true +sha3.workspace = true +tracing.workspace = true +hashbrown.workspace = true -move-bytecode-verifier = { path = "../../move-bytecode-verifier" } -move-core-types = { path = "../../move-core/types" } -move-vm-types = { path = "../types" } -move-binary-format = { path = "../../move-binary-format" } +move-bytecode-verifier.workspace = true +move-core-types.workspace = true +move-vm-types.workspace = true +move-binary-format.workspace = true [dev-dependencies] anyhow = "1.0.52" diff --git a/language/move-vm/runtime/src/data_cache.rs b/language/move-vm/runtime/src/data_cache.rs index 5c1cf4ddd1..acb8b8e825 100644 --- a/language/move-vm/runtime/src/data_cache.rs +++ b/language/move-vm/runtime/src/data_cache.rs @@ -3,7 +3,9 @@ // SPDX-License-Identifier: Apache-2.0 use crate::loader::Loader; +use crate::no_std::*; +use alloc::collections::btree_map::BTreeMap; use move_binary_format::errors::*; use move_core_types::{ account_address::AccountAddress, @@ -20,7 +22,6 @@ use move_vm_types::{ loaded_data::runtime_types::Type, values::{GlobalValue, Value}, }; -use std::collections::btree_map::BTreeMap; pub struct AccountDataCache { data_map: BTreeMap, diff --git a/language/move-vm/runtime/src/debug.rs b/language/move-vm/runtime/src/debug.rs index 9be306b09a..3c883b574e 100644 --- a/language/move-vm/runtime/src/debug.rs +++ b/language/move-vm/runtime/src/debug.rs @@ -5,14 +5,12 @@ use crate::{ interpreter::Interpreter, loader::{Function, Loader}, + no_std::*, }; +use alloc::{collections::BTreeSet, str::FromStr}; use move_binary_format::file_format::Bytecode; use move_vm_types::values::{self, Locals}; -use std::{ - collections::BTreeSet, - io::{self, Write}, - str::FromStr, -}; +use std::io::{self, Write}; #[derive(Debug)] enum DebugCommand { @@ -97,6 +95,7 @@ impl DebugContext { } } + #[cfg(test)] pub(crate) fn debug_loop( &mut self, function_desc: &Function, diff --git a/language/move-vm/runtime/src/interpreter.rs b/language/move-vm/runtime/src/interpreter.rs index 5b1fd9e463..5110d7fcda 100644 --- a/language/move-vm/runtime/src/interpreter.rs +++ b/language/move-vm/runtime/src/interpreter.rs @@ -2,10 +2,12 @@ // Copyright (c) The Move Contributors // SPDX-License-Identifier: Apache-2.0 +#[cfg(test)] +use crate::trace; use crate::{ loader::{Function, Loader, Resolver}, native_functions::NativeContext, - trace, + no_std::*, }; use fail::fail_point; use move_binary_format::{ @@ -31,7 +33,8 @@ use move_vm_types::{ }; use crate::native_extensions::NativeContextExtensions; -use std::{cmp::min, collections::VecDeque, fmt::Write, sync::Arc}; +use alloc::{collections::VecDeque, fmt::Write, sync::Arc}; +use core::cmp::min; use tracing::error; macro_rules! debug_write { @@ -410,13 +413,14 @@ impl Interpreter { ret_vals } NativeResult::Abort { cost, abort_code } => { - gas_meter.charge_native_function(cost, Option::>::None)?; + gas_meter + .charge_native_function(cost, Option::>::None)?; return Err(PartialVMError::new(StatusCode::ABORTED).with_sub_status(abort_code)); } NativeResult::OutOfGas { partial_cost } => { let err = match gas_meter.charge_native_function( partial_cost, - Option::>::None, + Option::>::None, ) { Err(err) if err.major_status() == StatusCode::OUT_OF_GAS => err, Ok(_) | Err(_) => PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message( @@ -977,7 +981,7 @@ impl CallStack { } /// Push a `Frame` on the call stack. - fn push(&mut self, frame: Frame) -> ::std::result::Result<(), Frame> { + fn push(&mut self, frame: Frame) -> ::core::result::Result<(), Frame> { if self.0.len() < CALL_STACK_SIZE_LIMIT { self.0.push(frame); Ok(()) @@ -1669,6 +1673,7 @@ impl Frame { let code = self.function.code(); loop { for instruction in &code[self.pc as usize..] { + #[cfg(test)] trace!( &self.function, &self.locals, diff --git a/language/move-vm/runtime/src/lib.rs b/language/move-vm/runtime/src/lib.rs index 24558c0c51..dce34c264e 100644 --- a/language/move-vm/runtime/src/lib.rs +++ b/language/move-vm/runtime/src/lib.rs @@ -9,6 +9,22 @@ //! It is a design goal for the Move VM to be independent of the Diem blockchain, so that //! other blockchains can use it as well. The VM isn't there yet, but hopefully will be there //! soon. +//! + +#![no_std] +#[macro_use] +extern crate alloc; +#[allow(unused_imports)] +pub(crate) mod no_std { + pub use alloc::borrow::ToOwned; + pub use alloc::boxed::Box; + pub use alloc::string::String; + pub use alloc::string::ToString; + pub use alloc::vec::Vec; +} + +#[cfg(test)] +extern crate std; pub mod data_cache; mod interpreter; @@ -19,12 +35,14 @@ pub mod native_extensions; pub mod native_functions; mod runtime; pub mod session; +#[cfg(test)] #[macro_use] mod tracing; pub mod config; // Only include debugging functionality in debug builds -#[cfg(any(debug_assertions, feature = "debugging"))] +//#[cfg(any(debug_assertions, feature = "debugging"))] +#[cfg(test)] mod debug; #[cfg(test)] diff --git a/language/move-vm/runtime/src/loader.rs b/language/move-vm/runtime/src/loader.rs index 3b43e2d1d7..b6fd888830 100644 --- a/language/move-vm/runtime/src/loader.rs +++ b/language/move-vm/runtime/src/loader.rs @@ -6,8 +6,16 @@ use crate::{ config::VMConfig, logging::expect_no_verification_errors, native_functions::{NativeFunction, NativeFunctions, UnboxedNativeFunction}, + no_std::*, session::LoadedFunctionInstantiation, }; +use alloc::{ + collections::{BTreeMap, BTreeSet}, + fmt::Debug, + sync::Arc, +}; +use core::hash::Hash; +use hashbrown::HashMap; use move_binary_format::{ access::{ModuleAccess, ScriptAccess}, binary_views::BinaryIndexedView, @@ -33,14 +41,8 @@ use move_vm_types::{ data_store::DataStore, loaded_data::runtime_types::{CachedStructIndex, StructType, Type}, }; -use parking_lot::RwLock; use sha3::{Digest, Sha3_256}; -use std::{ - collections::{BTreeMap, BTreeSet, HashMap}, - fmt::Debug, - hash::Hash, - sync::Arc, -}; +use spin::rwlock::RwLock; use tracing::error; type ScriptHash = [u8; 32]; @@ -532,7 +534,7 @@ impl Loader { /// indirect ones, that is all dependencies. pub(crate) fn get_and_clear_module_cache_hits(&self) -> BTreeSet { let mut result = BTreeSet::new(); - let hits: BTreeSet = std::mem::take(&mut self.module_cache_hits.write()); + let hits: BTreeSet = core::mem::take(&mut self.module_cache_hits.write()); for id in hits { self.transitive_dep_closure(&id, &mut result) } diff --git a/language/move-vm/runtime/src/move_vm.rs b/language/move-vm/runtime/src/move_vm.rs index 428e1109d0..dad9efc87d 100644 --- a/language/move-vm/runtime/src/move_vm.rs +++ b/language/move-vm/runtime/src/move_vm.rs @@ -2,7 +2,7 @@ // Copyright (c) The Move Contributors // SPDX-License-Identifier: Apache-2.0 -use std::{collections::BTreeSet, sync::Arc}; +use alloc::{collections::BTreeSet, sync::Arc}; use crate::{ config::VMConfig, data_cache::TransactionDataCache, native_extensions::NativeContextExtensions, diff --git a/language/move-vm/runtime/src/native_extensions.rs b/language/move-vm/runtime/src/native_extensions.rs index e75c50c8d5..3d37f09e48 100644 --- a/language/move-vm/runtime/src/native_extensions.rs +++ b/language/move-vm/runtime/src/native_extensions.rs @@ -2,8 +2,10 @@ // Copyright (c) The Move Contributors // SPDX-License-Identifier: Apache-2.0 +use crate::no_std::*; use better_any::{Tid, TidAble, TidExt}; -use std::{any::TypeId, collections::HashMap}; +use core::any::TypeId; +use hashbrown::HashMap; /// A data type to represent a heterogeneous collection of extensions which are available to /// native functions. A value to this is passed into the session function execution. diff --git a/language/move-vm/runtime/src/native_functions.rs b/language/move-vm/runtime/src/native_functions.rs index 42f7c41437..6cb306eae0 100644 --- a/language/move-vm/runtime/src/native_functions.rs +++ b/language/move-vm/runtime/src/native_functions.rs @@ -4,7 +4,10 @@ use crate::{ interpreter::Interpreter, loader::Resolver, native_extensions::NativeContextExtensions, + no_std::*, }; +use alloc::{collections::VecDeque, fmt::Write, sync::Arc}; +use hashbrown::HashMap; use move_binary_format::errors::{ExecutionState, PartialVMError, PartialVMResult}; use move_core_types::{ account_address::AccountAddress, @@ -18,11 +21,6 @@ use move_vm_types::{ data_store::DataStore, loaded_data::runtime_types::Type, natives::function::NativeResult, values::Value, }; -use std::{ - collections::{HashMap, VecDeque}, - fmt::Write, - sync::Arc, -}; pub type UnboxedNativeFunction = dyn Fn(&mut NativeContext, Vec, VecDeque) -> PartialVMResult + Send diff --git a/language/move-vm/runtime/src/runtime.rs b/language/move-vm/runtime/src/runtime.rs index fe83c6f483..5af80da4e8 100644 --- a/language/move-vm/runtime/src/runtime.rs +++ b/language/move-vm/runtime/src/runtime.rs @@ -9,8 +9,11 @@ use crate::{ loader::{Function, Loader}, native_extensions::NativeContextExtensions, native_functions::{NativeFunction, NativeFunctions}, + no_std::*, session::{LoadedFunctionInstantiation, SerializedReturnValues, Session}, }; +use alloc::{collections::BTreeSet, sync::Arc}; +use core::borrow::Borrow; use move_binary_format::{ access::ModuleAccess, compatibility::Compatibility, @@ -33,7 +36,6 @@ use move_vm_types::{ loaded_data::runtime_types::Type, values::{Locals, Reference, VMValueCast, Value}, }; -use std::{borrow::Borrow, collections::BTreeSet, sync::Arc}; use tracing::warn; /// An instantiation of the MoveVM. @@ -374,7 +376,7 @@ impl VMRuntime { .map_err(|e| e.finish(Location::Undefined))?; // locals should not be dropped until all return values are serialized - std::mem::drop(dummy_locals); + core::mem::drop(dummy_locals); Ok(SerializedReturnValues { mutable_reference_outputs: serialized_mut_ref_outputs, diff --git a/language/move-vm/runtime/src/session.rs b/language/move-vm/runtime/src/session.rs index 7addfdb51b..753f6c413a 100644 --- a/language/move-vm/runtime/src/session.rs +++ b/language/move-vm/runtime/src/session.rs @@ -3,9 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{ - data_cache::TransactionDataCache, native_extensions::NativeContextExtensions, + data_cache::TransactionDataCache, native_extensions::NativeContextExtensions, no_std::*, runtime::VMRuntime, }; +use alloc::sync::Arc; +use core::borrow::Borrow; use move_binary_format::{ compatibility::Compatibility, errors::*, @@ -24,7 +26,6 @@ use move_vm_types::{ gas::GasMeter, loaded_data::runtime_types::{CachedStructIndex, StructType, Type}, }; -use std::{borrow::Borrow, sync::Arc}; pub struct Session<'r, 'l, S> { pub(crate) runtime: &'l VMRuntime, diff --git a/language/move-vm/runtime/src/tracing.rs b/language/move-vm/runtime/src/tracing.rs index b016879c9b..965ad8eaa2 100644 --- a/language/move-vm/runtime/src/tracing.rs +++ b/language/move-vm/runtime/src/tracing.rs @@ -9,7 +9,7 @@ use crate::debug::DebugContext; use ::{ move_binary_format::file_format::Bytecode, move_vm_types::values::Locals, - once_cell::sync::Lazy, + spin::Lazy, std::{ env, fs::{File, OpenOptions}, diff --git a/language/move-vm/types/Cargo.toml b/language/move-vm/types/Cargo.toml index 8a89a92feb..198e984e80 100644 --- a/language/move-vm/types/Cargo.toml +++ b/language/move-vm/types/Cargo.toml @@ -10,15 +10,15 @@ publish = false edition = "2021" [dependencies] -once_cell = "1.7.2" +serde = { workspace = true , features = ["derive", "rc"] } +smallvec.workspace = true proptest = { version = "1.0.0", optional = true } -serde = { version = "1.0.124", features = ["derive", "rc"] } -smallvec = "1.6.1" bcs.workspace = true +hashbrown.workspace = true -move-core-types = { path = "../../move-core/types" } -move-binary-format = { path = "../../move-binary-format" } +move-core-types.workspace = true +move-binary-format.workspace = true [dev-dependencies] proptest = "1.0.0" diff --git a/language/move-vm/types/src/data_store.rs b/language/move-vm/types/src/data_store.rs index 06992e8adb..4c8ebea0bd 100644 --- a/language/move-vm/types/src/data_store.rs +++ b/language/move-vm/types/src/data_store.rs @@ -5,6 +5,7 @@ use crate::{ loaded_data::runtime_types::Type, values::{GlobalValue, Value}, + no_std::*, }; use move_binary_format::errors::{PartialVMResult, VMResult}; use move_core_types::{ diff --git a/language/move-vm/types/src/lib.rs b/language/move-vm/types/src/lib.rs index e90386c0dd..57cdf956ef 100644 --- a/language/move-vm/types/src/lib.rs +++ b/language/move-vm/types/src/lib.rs @@ -3,6 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 #![forbid(unsafe_code)] +#![no_std] macro_rules! debug_write { ($($toks: tt)*) => { @@ -22,6 +23,17 @@ macro_rules! debug_writeln { }; } +#[macro_use] +extern crate alloc; +#[allow(unused_imports)] +pub(crate) mod no_std { + pub use alloc::borrow::ToOwned; + pub use alloc::boxed::Box; + pub use alloc::string::String; + pub use alloc::string::ToString; + pub use alloc::vec::Vec; +} + pub mod data_store; pub mod gas; pub mod loaded_data; diff --git a/language/move-vm/types/src/loaded_data/runtime_types.rs b/language/move-vm/types/src/loaded_data/runtime_types.rs index a8d1addd43..c84077cde0 100644 --- a/language/move-vm/types/src/loaded_data/runtime_types.rs +++ b/language/move-vm/types/src/loaded_data/runtime_types.rs @@ -2,6 +2,7 @@ // Copyright (c) The Move Contributors // SPDX-License-Identifier: Apache-2.0 +use crate::no_std::*; use move_binary_format::{ errors::{PartialVMError, PartialVMResult}, file_format::{AbilitySet, SignatureToken, StructDefinitionIndex, StructTypeParameter}, diff --git a/language/move-vm/types/src/values/values_impl.rs b/language/move-vm/types/src/values/values_impl.rs index 412c1848bd..559b6cd214 100644 --- a/language/move-vm/types/src/values/values_impl.rs +++ b/language/move-vm/types/src/values/values_impl.rs @@ -5,7 +5,13 @@ use crate::{ loaded_data::runtime_types::Type, views::{ValueView, ValueVisitor}, + no_std::*, }; +use alloc::{ + fmt::{self, Debug, Display}, + rc::Rc, +}; +use core::{cell::RefCell, iter}; use move_binary_format::{ errors::*, file_format::{Constant, SignatureToken}, @@ -18,12 +24,6 @@ use move_core_types::{ value::{MoveStructLayout, MoveTypeLayout}, vm_status::{sub_status::NFE_VECTOR_ERROR_BASE, StatusCode}, }; -use std::{ - cell::RefCell, - fmt::{self, Debug, Display}, - iter, - rc::Rc, -}; /*************************************************************************************** * @@ -1007,7 +1007,7 @@ impl Locals { .with_message("moving container with dangling references".to_string())); } } - Ok(Value(std::mem::replace(v, x.0))) + Ok(Value(core::mem::replace(v, x.0))) } None => Err( PartialVMError::new(StatusCode::VERIFIER_INVARIANT_VIOLATION).with_message( @@ -1046,7 +1046,7 @@ impl Locals { } _ => res.push(( idx, - Value(std::mem::replace(&mut locals[idx], ValueImpl::Invalid)), + Value(core::mem::replace(&mut locals[idx], ValueImpl::Invalid)), )), } } @@ -1752,7 +1752,7 @@ impl IntegerValue { match self { U8(x) => Ok(x), U16(x) => { - if x > (std::u8::MAX as u16) { + if x > (core::u8::MAX as u16) { Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR) .with_message(format!("Cannot cast u16({}) to u8", x))) } else { @@ -1760,7 +1760,7 @@ impl IntegerValue { } } U32(x) => { - if x > (std::u8::MAX as u32) { + if x > (core::u8::MAX as u32) { Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR) .with_message(format!("Cannot cast u32({}) to u8", x))) } else { @@ -1768,7 +1768,7 @@ impl IntegerValue { } } U64(x) => { - if x > (std::u8::MAX as u64) { + if x > (core::u8::MAX as u64) { Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR) .with_message(format!("Cannot cast u64({}) to u8", x))) } else { @@ -1776,7 +1776,7 @@ impl IntegerValue { } } U128(x) => { - if x > (std::u8::MAX as u128) { + if x > (core::u8::MAX as u128) { Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR) .with_message(format!("Cannot cast u128({}) to u8", x))) } else { @@ -1784,7 +1784,7 @@ impl IntegerValue { } } U256(x) => { - if x > (u256::U256::from(std::u8::MAX)) { + if x > (u256::U256::from(core::u8::MAX)) { Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR) .with_message(format!("Cannot cast u256({}) to u8", x))) } else { @@ -1801,7 +1801,7 @@ impl IntegerValue { U8(x) => Ok(x as u16), U16(x) => Ok(x), U32(x) => { - if x > (std::u16::MAX as u32) { + if x > (core::u16::MAX as u32) { Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR) .with_message(format!("Cannot cast u32({}) to u16", x))) } else { @@ -1809,7 +1809,7 @@ impl IntegerValue { } } U64(x) => { - if x > (std::u16::MAX as u64) { + if x > (core::u16::MAX as u64) { Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR) .with_message(format!("Cannot cast u64({}) to u16", x))) } else { @@ -1817,7 +1817,7 @@ impl IntegerValue { } } U128(x) => { - if x > (std::u16::MAX as u128) { + if x > (core::u16::MAX as u128) { Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR) .with_message(format!("Cannot cast u128({}) to u16", x))) } else { @@ -1825,7 +1825,7 @@ impl IntegerValue { } } U256(x) => { - if x > (u256::U256::from(std::u16::MAX)) { + if x > (u256::U256::from(core::u16::MAX)) { Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR) .with_message(format!("Cannot cast u256({}) to u16", x))) } else { @@ -1843,7 +1843,7 @@ impl IntegerValue { U16(x) => Ok(x as u32), U32(x) => Ok(x), U64(x) => { - if x > (std::u32::MAX as u64) { + if x > (core::u32::MAX as u64) { Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR) .with_message(format!("Cannot cast u64({}) to u32", x))) } else { @@ -1851,7 +1851,7 @@ impl IntegerValue { } } U128(x) => { - if x > (std::u32::MAX as u128) { + if x > (core::u32::MAX as u128) { Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR) .with_message(format!("Cannot cast u128({}) to u32", x))) } else { @@ -1859,7 +1859,7 @@ impl IntegerValue { } } U256(x) => { - if x > (u256::U256::from(std::u32::MAX)) { + if x > (u256::U256::from(core::u32::MAX)) { Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR) .with_message(format!("Cannot cast u128({}) to u32", x))) } else { @@ -1878,7 +1878,7 @@ impl IntegerValue { U32(x) => Ok(x as u64), U64(x) => Ok(x), U128(x) => { - if x > (std::u64::MAX as u128) { + if x > (core::u64::MAX as u128) { Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR) .with_message(format!("Cannot cast u128({}) to u64", x))) } else { @@ -1886,7 +1886,7 @@ impl IntegerValue { } } U256(x) => { - if x > (u256::U256::from(std::u64::MAX)) { + if x > (u256::U256::from(core::u64::MAX)) { Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR) .with_message(format!("Cannot cast u256({}) to u64", x))) } else { @@ -1906,7 +1906,7 @@ impl IntegerValue { U64(x) => Ok(x as u128), U128(x) => Ok(x), U256(x) => { - if x > (u256::U256::from(std::u128::MAX)) { + if x > (u256::U256::from(core::u128::MAX)) { Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR) .with_message(format!("Cannot cast u256({}) to u128", x))) } else { @@ -2038,7 +2038,7 @@ impl VectorRef { } /// Returns a RefCell reference to the underlying vector of a `&vector` value. - pub fn as_bytes_ref(&self) -> std::cell::Ref<'_, Vec> { + pub fn as_bytes_ref(&self) -> core::cell::Ref<'_, Vec> { let c = self.0.container(); match c { Container::VecU8(r) => r.borrow(), @@ -2300,28 +2300,28 @@ impl Container { Struct::legacy_size_impl(&r.borrow()) } Self::VecU8(r) => { - AbstractMemorySize::new((r.borrow().len() * std::mem::size_of::()) as u64) + AbstractMemorySize::new((r.borrow().len() * core::mem::size_of::()) as u64) } Self::VecU16(r) => { - AbstractMemorySize::new((r.borrow().len() * std::mem::size_of::()) as u64) + AbstractMemorySize::new((r.borrow().len() * core::mem::size_of::()) as u64) } Self::VecU32(r) => { - AbstractMemorySize::new((r.borrow().len() * std::mem::size_of::()) as u64) + AbstractMemorySize::new((r.borrow().len() * core::mem::size_of::()) as u64) } Self::VecU64(r) => { - AbstractMemorySize::new((r.borrow().len() * std::mem::size_of::()) as u64) + AbstractMemorySize::new((r.borrow().len() * core::mem::size_of::()) as u64) } Self::VecU128(r) => { - AbstractMemorySize::new((r.borrow().len() * std::mem::size_of::()) as u64) + AbstractMemorySize::new((r.borrow().len() * core::mem::size_of::()) as u64) } Self::VecU256(r) => AbstractMemorySize::new( - (r.borrow().len() * std::mem::size_of::()) as u64, + (r.borrow().len() * core::mem::size_of::()) as u64, ), Self::VecBool(r) => { - AbstractMemorySize::new((r.borrow().len() * std::mem::size_of::()) as u64) + AbstractMemorySize::new((r.borrow().len() * core::mem::size_of::()) as u64) } Self::VecAddress(r) => AbstractMemorySize::new( - (r.borrow().len() * std::mem::size_of::()) as u64, + (r.borrow().len() * core::mem::size_of::()) as u64, ), } } @@ -2460,11 +2460,11 @@ impl GlobalValueImpl { Self::None | Self::Deleted => { return Err(PartialVMError::new(StatusCode::MISSING_DATA)) } - Self::Fresh { .. } => match std::mem::replace(self, Self::None) { + Self::Fresh { .. } => match core::mem::replace(self, Self::None) { Self::Fresh { fields } => fields, _ => unreachable!(), }, - Self::Cached { .. } => match std::mem::replace(self, Self::Deleted) { + Self::Cached { .. } => match core::mem::replace(self, Self::Deleted) { Self::Cached { fields, .. } => fields, _ => unreachable!(), }, @@ -2719,7 +2719,7 @@ impl Display for Locals { #[allow(dead_code)] pub mod debug { use super::*; - use std::fmt::Write; + use alloc::fmt::Write; fn print_invalid(buf: &mut B) -> PartialVMResult<()> { debug_write!(buf, "-") diff --git a/language/move-vm/types/src/views.rs b/language/move-vm/types/src/views.rs index 29a87e3261..47a47fb330 100644 --- a/language/move-vm/types/src/views.rs +++ b/language/move-vm/types/src/views.rs @@ -4,7 +4,7 @@ use move_core_types::{ account_address::AccountAddress, gas_algebra::AbstractMemorySize, language_storage::TypeTag, }; -use std::mem::size_of; +use core::mem::size_of; /// Trait that provides an abstract view into a Move type. ///