diff --git a/Cargo.lock b/Cargo.lock index 51bf4d4b51..ec5e02dc6e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,9 +52,9 @@ dependencies = [ [[package]] name = "ansi_term" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ "winapi", ] @@ -67,9 +67,9 @@ checksum = "ee10e43ae4a853c0a3591d4e2ada1719e553be18199d9da9d4a83f5927c2f5c7" [[package]] name = "approx" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "072df7202e63b127ab55acfe16ce97013d5b97bf160489336d3f1840fd78e99e" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" dependencies = [ "num-traits", ] @@ -102,9 +102,9 @@ dependencies = [ [[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" @@ -144,31 +144,22 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "blake2" -version = "0.9.2" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" +checksum = "b9cf849ee05b2ee5fba5e36f97ff8ec2533916700fc0758d40d92136a42f3388" dependencies = [ - "crypto-mac", "digest", - "opaque-debug", ] [[package]] name = "block-buffer" -version = "0.9.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" dependencies = [ - "block-padding", "generic-array", ] -[[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - [[package]] name = "bstr" version = "0.2.17" @@ -235,9 +226,9 @@ dependencies = [ [[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", "atty", @@ -261,13 +252,13 @@ dependencies = [ [[package]] name = "console" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45" +checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31" dependencies = [ "encode_unicode", - "lazy_static 1.4.0", "libc", + "once_cell", "terminal_size", "winapi", ] @@ -284,9 +275,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.7.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ "core-foundation-sys", "libc", @@ -294,9 +285,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.7.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "cpufeatures" @@ -431,9 +422,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ "cfg-if", ] @@ -510,9 +501,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" dependencies = [ "cfg-if", "lazy_static 1.4.0", @@ -525,13 +516,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] -name = "crypto-mac" -version = "0.8.0" +name = "crypto-common" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" +checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" dependencies = [ "generic-array", - "subtle", + "typenum", ] [[package]] @@ -542,7 +533,7 @@ checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" dependencies = [ "bstr", "csv-core", - "itoa", + "itoa 0.4.8", "ryu", "serde", ] @@ -556,17 +547,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "diff" version = "0.1.12" @@ -575,11 +555,13 @@ checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" [[package]] name = "digest" -version = "0.9.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" dependencies = [ - "generic-array", + "block-buffer", + "crypto-common", + "subtle", ] [[package]] @@ -730,9 +712,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af" dependencies = [ "cfg-if", "crc32fast", @@ -774,9 +756,9 @@ dependencies = [ [[package]] name = "gethostname" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e692e296bfac1d2533ef168d0b60ff5897b8b70a4009276834014dd8924cc028" +checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" dependencies = [ "libc", "winapi", @@ -784,9 +766,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.3" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" dependencies = [ "cfg-if", "js-sys", @@ -809,12 +791,9 @@ checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" [[package]] name = "heck" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" [[package]] name = "hermit-abi" @@ -839,9 +818,9 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" [[package]] name = "indexmap" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" dependencies = [ "autocfg", "hashbrown", @@ -849,17 +828,16 @@ dependencies = [ [[package]] name = "insta" -version = "1.8.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15226a375927344c78d39dc6b49e2d5562a5b0705e26a589093c6792e52eed8e" +checksum = "689960f187c43c01650c805fb6bc6f55ab944499d86d4ffe9474ad78991d8e94" dependencies = [ "console", - "lazy_static 1.4.0", + "once_cell", "serde", "serde_json", "serde_yaml", "similar", - "uuid", ] [[package]] @@ -876,9 +854,9 @@ dependencies = [ [[package]] name = "is-macro" -version = "0.1.9" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a322dd16d960e322c3d92f541b4c1a4f0a2e81e1fdeee430d8cecc8b72e8015f" +checksum = "94b2c46692aee0d1b3aad44e781ac0f0e7db42ef27adaa0a877b627040019813" dependencies = [ "Inflector", "pmutil", @@ -889,9 +867,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" +checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" dependencies = [ "either", ] @@ -902,6 +880,12 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" +[[package]] +name = "itoa" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" + [[package]] name = "js-sys" version = "0.3.55" @@ -919,9 +903,9 @@ checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" [[package]] name = "lalrpop" -version = "0.19.6" +version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15174f1c529af5bf1283c3bc0058266b483a67156f79589fab2a25e23cf8988" +checksum = "852b75a095da6b69da8c5557731c3afd06525d4f655a4fc1c799e2ec8bc4dce4" dependencies = [ "ascii-canvas", "atty", @@ -942,9 +926,9 @@ dependencies = [ [[package]] name = "lalrpop-util" -version = "0.19.6" +version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e58cce361efcc90ba8a0a5f982c741ff86b603495bb15a998412e957dcd278" +checksum = "d6d265705249fe209280676d8f68887859fa42e1d34f342fc05bd47726a5e188" dependencies = [ "regex", ] @@ -963,9 +947,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lexical-parse-float" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4d066d004fa762d9da995ed21aa8845bb9f6e4265f540d716fb4b315197bf0e" +checksum = "f518eed87c3be6debe6d26b855c97358d8a11bf05acec137e5f53080f5ad2dd8" dependencies = [ "lexical-parse-integer", "lexical-util", @@ -974,9 +958,9 @@ dependencies = [ [[package]] name = "lexical-parse-integer" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2c92badda8cc0fc4f3d3cc1c30aaefafb830510c8781ce4e8669881f3ed53ac" +checksum = "afc852ec67c6538bbb2b9911116a385b24510e879a69ab516e6a151b15a79168" dependencies = [ "lexical-util", "static_assertions", @@ -984,24 +968,24 @@ dependencies = [ [[package]] name = "lexical-util" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff669ccaae16ee33af90dc51125755efed17f1309626ba5c12052512b11e291" +checksum = "c72a9d52c5c4e62fa2cdc2cb6c694a39ae1382d9c2a17a466f18e272a0930eb1" dependencies = [ "static_assertions", ] [[package]] name = "libc" -version = "0.2.119" +version = "0.2.123" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4" +checksum = "cb691a747a7ab48abc15c5b42066eaafde10dc427e3b6ee2a1cf43db04c763bd" [[package]] name = "libffi" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a1a541960580e84812cac19ec26926e883520bda211397a1f8c223993be6f20" +checksum = "4b05b52bd89490a0b36c56715aef46d8580d25343ed243d01337663b287004bf" dependencies = [ "abort_on_panic", "libc", @@ -1010,18 +994,18 @@ dependencies = [ [[package]] name = "libffi-sys" -version = "1.3.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78a343392242972b1b7ac640de99f9abcb10ca42adcd996f6016514071cdbcc6" +checksum = "7283a0ec88c0064eb8b3e40990d2a49cdca5a207f46f678e79ea7302b335401f" dependencies = [ "cc", ] [[package]] name = "libz-sys" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" +checksum = "6f35facd4a5673cb5a48822be2be1d4236c1c99cb4113cab7061ac720d5bf859" dependencies = [ "cc", "libc", @@ -1037,27 +1021,28 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" [[package]] name = "lock_api" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ + "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.14" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" dependencies = [ "cfg-if", ] [[package]] name = "lz4_flex" -version = "0.9.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177c079243f6867429aca5af5053747f57e329d44f0c58bebca078cd14873ec2" +checksum = "42c51df9d8d4842336c835df1d85ed447c4813baa237d033d95128bf5552ad8a" dependencies = [ "twox-hash", ] @@ -1085,13 +1070,11 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "md-5" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15" +checksum = "658646b21e0b72f7866c7038ab086d3d5e1cd6271f060fd37defb241949d0582" dependencies = [ - "block-buffer", "digest", - "opaque-debug", ] [[package]] @@ -1102,21 +1085,20 @@ checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "memoffset" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ "autocfg", ] [[package]] name = "miniz_oxide" -version = "0.4.4" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" dependencies = [ "adler", - "autocfg", ] [[package]] @@ -1145,22 +1127,9 @@ dependencies = [ [[package]] name = "nix" -version = "0.22.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1e25ee6b412c2a1e3fcb6a4499a5c1bfe7f43e014bdce9a6b6666e5aa2d187" -dependencies = [ - "bitflags", - "cc", - "cfg-if", - "libc", - "memoffset", -] - -[[package]] -name = "nix" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f305c2c2e4c39a82f7bf0bf65fb557f9070ce06781d4f2454295cc34b1c43188" +checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" dependencies = [ "bitflags", "cc", @@ -1224,9 +1193,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ "hermit-abi", "libc", @@ -1234,19 +1203,18 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9bd055fb730c4f8f4f57d45d35cd6b3f0980535b056dc7ff119cee6a66ed6f" +checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" dependencies = [ - "derivative", "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486ea01961c4a818096de679a8b740b26d9033146ac5291b1c98557658f8cdd9" +checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -1256,9 +1224,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" +checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" [[package]] name = "oorandom" @@ -1266,12 +1234,6 @@ version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - [[package]] name = "openssl" version = "0.10.38" @@ -1288,24 +1250,24 @@ dependencies = [ [[package]] name = "openssl-probe" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.0.2+3.0.0" +version = "111.18.0+1.1.1n" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14a760a11390b1a5daf72074d4f6ff1a6e772534ae191f999f57e9ee8146d1fb" +checksum = "7897a926e1e8d00219127dc020130eca4292e5ca666dd592480d72c3eca2ff6c" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.70" +version = "0.9.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6517987b3f8226b5da3661dad65ff7f300cc59fb5ea8333ca191fc65fde3edf" +checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" dependencies = [ "autocfg", "cc", @@ -1329,7 +1291,17 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core", + "parking_lot_core 0.8.5", +] + +[[package]] +name = "parking_lot" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.2", ] [[package]] @@ -1347,10 +1319,23 @@ dependencies = [ ] [[package]] -name = "paste" -version = "1.0.6" +name = "parking_lot_core" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" +checksum = "995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.2.10", + "smallvec", + "windows-sys", +] + +[[package]] +name = "paste" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" [[package]] name = "petgraph" @@ -1364,9 +1349,9 @@ dependencies = [ [[package]] name = "phf" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fc3db1018c4b59d7d582a739436478b6035138b6aecbce989fc91c3e98409f" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" dependencies = [ "phf_macros", "phf_shared 0.10.0", @@ -1496,9 +1481,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.32" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" +checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1" dependencies = [ "unicode-xid", ] @@ -1521,9 +1506,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.10" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" +checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" dependencies = [ "proc-macro2", ] @@ -1546,14 +1531,13 @@ dependencies = [ [[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", "rand_core", - "rand_hc", ] [[package]] @@ -1575,15 +1559,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core", -] - [[package]] name = "rayon" version = "1.5.1" @@ -1777,7 +1752,7 @@ dependencies = [ "num-complex", "num-traits", "once_cell", - "parking_lot", + "parking_lot 0.11.2", "radium", "rand", "siphasher", @@ -1825,7 +1800,7 @@ dependencies = [ "serde_json", "syn", "syn-ext", - "textwrap 0.14.2", + "textwrap 0.15.0", ] [[package]] @@ -1895,7 +1870,7 @@ dependencies = [ "md-5", "memchr", "mt19937", - "nix 0.23.0", + "nix", "num-bigint", "num-complex", "num-integer", @@ -1961,7 +1936,7 @@ dependencies = [ "log", "memchr", "memoffset", - "nix 0.23.0", + "nix", "num-bigint", "num-complex", "num-integer", @@ -1971,7 +1946,7 @@ dependencies = [ "num_enum", "once_cell", "optional", - "parking_lot", + "parking_lot 0.12.0", "paste", "rand", "result-like", @@ -2014,7 +1989,7 @@ version = "0.1.2" dependencies = [ "console_error_panic_hook", "js-sys", - "parking_lot", + "parking_lot 0.11.2", "rustpython-common", "rustpython-parser", "rustpython-vm", @@ -2033,9 +2008,9 @@ checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088" [[package]] name = "rustyline" -version = "9.0.0" +version = "9.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "790487c3881a63489ae77126f57048b42d62d3b2bafbf37453ea19eedb6340d6" +checksum = "db7826789c0e25614b03e5a54a0717a86f9ff6e6e5247f92b369472869320039" dependencies = [ "bitflags", "cfg-if", @@ -2045,7 +2020,7 @@ dependencies = [ "libc", "log", "memchr", - "nix 0.22.0", + "nix", "radix_trie", "scopeguard", "smallvec", @@ -2094,9 +2069,9 @@ checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" [[package]] name = "serde" -version = "1.0.130" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" dependencies = [ "serde_derive", ] @@ -2125,9 +2100,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.130" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" +checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" dependencies = [ "proc-macro2", "quote", @@ -2136,11 +2111,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.69" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e466864e431129c7e0d3476b92f20458e5879919a0596c6472738d9fa2d342f8" +checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" dependencies = [ - "itoa", + "itoa 1.0.1", "ryu", "serde", ] @@ -2159,47 +2134,41 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.9.8" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" +checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" dependencies = [ - "block-buffer", "cfg-if", "cpufeatures", "digest", - "opaque-debug", ] [[package]] name = "sha2" -version = "0.9.8" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" +checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" dependencies = [ - "block-buffer", "cfg-if", "cpufeatures", "digest", - "opaque-debug", ] [[package]] name = "sha3" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" +checksum = "881bf8156c87b6301fc5ca6b27f11eeb2761224c7081e69b409d5a1951a70c86" dependencies = [ - "block-buffer", "digest", "keccak", - "opaque-debug", ] [[package]] name = "similar" -version = "1.3.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad1d488a557b235fc46dae55512ffbfc429d2482b08b4d9435ab07384ca8aec" +checksum = "2e24979f63a11545f5f2c60141afe249d4f19f84581ea2138065e400941d83d3" [[package]] name = "siphasher" @@ -2215,9 +2184,9 @@ checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" [[package]] name = "socket2" -version = "0.4.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" +checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" dependencies = [ "libc", "winapi", @@ -2253,7 +2222,7 @@ checksum = "923f0f39b6267d37d23ce71ae7235602134b250ace715dd2c90421998ddac0c6" dependencies = [ "lazy_static 1.4.0", "new_debug_unreachable", - "parking_lot", + "parking_lot 0.11.2", "phf_shared 0.8.0", "precomputed-hash", ] @@ -2266,19 +2235,20 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "strum" -version = "0.21.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" +checksum = "e96acfc1b70604b8b2f1ffa4c57e59176c7dbb05d556c71ecd2f5498a1dee7f8" [[package]] name = "strum_macros" -version = "0.21.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" +checksum = "6878079b17446e4d3eba6192bb0a2950d5b14f0ed8424b852310e5a94345d0ef" dependencies = [ "heck", "proc-macro2", "quote", + "rustversion", "syn", ] @@ -2290,9 +2260,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.81" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966" +checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d" dependencies = [ "proc-macro2", "quote", @@ -2310,9 +2280,9 @@ dependencies = [ [[package]] name = "system-configuration" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4bc0637a2b8c0b1a5145cca3e21b707865edc7e32285771536af1ade129468" +checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd" dependencies = [ "bitflags", "core-foundation", @@ -2321,9 +2291,9 @@ dependencies = [ [[package]] name = "system-configuration-sys" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "269e271436d8e4bb2621c535a11fe03d5d012f74b19af72f80288f3a72f6180a" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" dependencies = [ "core-foundation-sys", "libc", @@ -2385,9 +2355,9 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.14.2" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80" +checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" [[package]] name = "thiserror" @@ -2422,9 +2392,9 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" dependencies = [ "once_cell", ] @@ -2664,9 +2634,9 @@ checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" [[package]] name = "unicode_names2" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87d6678d7916394abad0d4b19df4d3802e1fd84abd7d701f39b75ee71b9e8cf1" +checksum = "eec8e807a365e5c972debc47b8f06d361b37b94cfd18d48f7adc715fb86404dd" [[package]] name = "utf8parse" @@ -2674,12 +2644,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" - [[package]] name = "vcpkg" version = "0.2.15" @@ -2723,9 +2687,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" -version = "0.2.78" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" +checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2733,9 +2697,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.78" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" +checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4" dependencies = [ "bumpalo", "lazy_static 1.4.0", @@ -2760,9 +2724,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.78" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" +checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2770,9 +2734,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.78" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" +checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" dependencies = [ "proc-macro2", "quote", @@ -2783,9 +2747,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.78" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" +checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744" [[package]] name = "web-sys" @@ -2799,9 +2763,9 @@ dependencies = [ [[package]] name = "which" -version = "4.2.2" +version = "4.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9" +checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" dependencies = [ "either", "lazy_static 1.4.0", @@ -2810,9 +2774,9 @@ dependencies = [ [[package]] name = "widestring" -version = "0.4.3" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" +checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" [[package]] name = "winapi" @@ -2845,6 +2809,49 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825" +dependencies = [ + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" + +[[package]] +name = "windows_i686_gnu" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" + +[[package]] +name = "windows_i686_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" + [[package]] name = "winreg" version = "0.10.1" diff --git a/Cargo.toml b/Cargo.toml index e4884dd449..9bec9d9507 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,28 +31,28 @@ ssl = ["rustpython-stdlib/ssl"] ssl-vendor = ["rustpython-stdlib/ssl-vendor"] [dependencies] -log = "0.4" +log = "0.4.16" env_logger = { version = "0.9.0", default-features = false, features = ["atty", "termcolor"] } -clap = "2.33" +clap = "2.34" rustpython-compiler = { path = "compiler/porcelain", version = "0.1.1" } rustpython-parser = { path = "parser", version = "0.1.1" } rustpython-vm = { path = "vm", version = "0.1.1", default-features = false, features = ["compile-parse"] } rustpython-stdlib = {path = "stdlib", optional = true, default-features = false, features = ["compile-parse"]} dirs = { package = "dirs-next", version = "2.0.0" } -num-traits = "0.2.8" -cfg-if = "1.0" -libc = "0.2" +num-traits = "0.2.14" +cfg-if = "1.0.0" +libc = "0.2.123" -flame = { version = "0.2", optional = true } -flamescope = { version = "0.1", optional = true } +flame = { version = "0.2.2", optional = true } +flamescope = { version = "0.1.2", optional = true } [target.'cfg(not(target_os = "wasi"))'.dependencies] -rustyline = "9" +rustyline = "9.1.2" [dev-dependencies] cpython = "0.7.0" python3-sys = "0.7.0" -criterion = "0.3" +criterion = "0.3.5" [[bench]] name = "execution" diff --git a/ast/Cargo.toml b/ast/Cargo.toml index 1b62c5e88a..8d1db18a8d 100644 --- a/ast/Cargo.toml +++ b/ast/Cargo.toml @@ -11,5 +11,5 @@ fold = [] unparse = ["rustpython-common"] [dependencies] -num-bigint = "0.4.2" +num-bigint = "0.4.3" rustpython-common = { path = "../common", optional = true } diff --git a/bytecode/Cargo.toml b/bytecode/Cargo.toml index 4c4ea81dfc..db83f90100 100644 --- a/bytecode/Cargo.toml +++ b/bytecode/Cargo.toml @@ -10,10 +10,10 @@ license = "MIT" [dependencies] bincode = "1.3.3" -bitflags = "1.2.1" -lz4_flex = "0.9.0" -num-bigint = { version = "0.4.2", features = ["serde"] } +bitflags = "1.3.2" +lz4_flex = "0.9.2" +num-bigint = { version = "0.4.3", features = ["serde"] } num-complex = { version = "0.4.0", features = ["serde"] } -serde = { version = "1.0", features = ["derive"] } -itertools = "0.10.0" -bstr = "0.2" +serde = { version = "1.0.136", features = ["derive"] } +itertools = "0.10.3" +bstr = "0.2.17" diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml index 3a133ab3ef..d2f9a5f029 100644 --- a/compiler/Cargo.toml +++ b/compiler/Cargo.toml @@ -8,15 +8,15 @@ license = "MIT" edition = "2021" [dependencies] -indexmap = "1.7.0" -itertools = "0.10.0" +indexmap = "1.8.1" +itertools = "0.10.3" rustpython-bytecode = { path = "../bytecode", version = "0.1.1" } rustpython-ast = { path = "../ast", features = ["unparse"] } num-complex = { version = "0.4.0", features = ["serde"] } -num-traits = "0.2" -log = "0.4" -ahash = "0.7.2" +num-traits = "0.2.14" +log = "0.4.16" +ahash = "0.7.6" [dev-dependencies] rustpython-parser = { path = "../parser" } -insta = "1.7.0" +insta = "1.14.0" diff --git a/derive/Cargo.toml b/derive/Cargo.toml index 71f1a5ab14..235e07fa2a 100644 --- a/derive/Cargo.toml +++ b/derive/Cargo.toml @@ -11,14 +11,14 @@ edition = "2021" proc-macro = true [dependencies] -syn = { version = "1.0", features = ["full", "extra-traits"] } -syn-ext = { version = "0.3.0", features = ["full"] } -quote = "1.0" -proc-macro2 = "1.0" +syn = { version = "1.0.91", features = ["full", "extra-traits"] } +syn-ext = { version = "0.3.1", features = ["full"] } +quote = "1.0.18" +proc-macro2 = "1.0.37" rustpython-compiler = { path = "../compiler/porcelain", version = "0.1.1" } rustpython-bytecode = { path = "../bytecode", version = "0.1.1" } -maplit = "1.0" -once_cell = "1.8.0" -textwrap = { version = "0.14.2", default-features = false } -indexmap = "^1" -serde_json = "1.0.68" +maplit = "1.0.2" +once_cell = "1.10.0" +textwrap = { version = "0.15.0", default-features = false } +indexmap = "1.8.1" +serde_json = "1.0.79" diff --git a/jit/Cargo.toml b/jit/Cargo.toml index 220310c861..b3e54164e6 100644 --- a/jit/Cargo.toml +++ b/jit/Cargo.toml @@ -19,7 +19,7 @@ rustpython-bytecode = { path = "../bytecode", version = "0.1.2" } thiserror = "1.0" [dev-dependencies] -approx = "0.5.0" +approx = "0.5.1" rustpython-derive = { path = "../derive", version = "0.1.2" } [[test]] diff --git a/parser/Cargo.toml b/parser/Cargo.toml index 5216c434e2..a63fe5d5cf 100644 --- a/parser/Cargo.toml +++ b/parser/Cargo.toml @@ -9,19 +9,19 @@ license = "MIT" edition = "2021" [build-dependencies] -lalrpop = "0.19.6" +lalrpop = "0.19.7" [dependencies] rustpython-ast = { path = "../ast" } -lalrpop-util = "0.19.6" -log = "0.4.1" -num-bigint = "0.4.2" -num-traits = "0.2" -unic-emoji-char = "0.9" -unic-ucd-ident = "0.9" -unicode_names2 = "0.4" -phf = { version = "0.10.0", features = ["macros"] } -ahash = "0.7.2" +lalrpop-util = "0.19.7" +log = "0.4.16" +num-bigint = "0.4.3" +num-traits = "0.2.14" +unic-emoji-char = "0.9.0" +unic-ucd-ident = "0.9.0" +unicode_names2 = "0.5.0" +phf = { version = "0.10.1", features = ["macros"] } +ahash = "0.7.6" [dev-dependencies] -insta = "1.8.0" +insta = "1.14.0" diff --git a/stdlib/Cargo.toml b/stdlib/Cargo.toml index 18d2119ecd..910c474e8d 100644 --- a/stdlib/Cargo.toml +++ b/stdlib/Cargo.toml @@ -12,60 +12,60 @@ rustpython-vm = { path = "../vm" } rustpython-common = { path = "../common" } # random -rand = "0.8" -rand_core = "0.6" -mt19937 = "2.0" +rand = "0.8.5" +rand_core = "0.6.3" +mt19937 = "2.0.1" # Crypto: -digest = "0.9.0" -md-5 = "0.9.1" -sha-1 = "0.9.4" -sha2 = "0.9.3" -sha3 = "0.9.1" -blake2 = "0.9.1" +digest = "0.10.3" +md-5 = "0.10.1" +sha-1 = "0.10.0" +sha2 = "0.10.2" +sha3 = "0.10.1" +blake2 = "0.10.4" ## unicode stuff -unicode_names2 = "0.4" +unicode_names2 = "0.5.0" # TODO: use unic for this; needed for title case: # https://github.com/RustPython/RustPython/pull/832#discussion_r275428939 -unicode-casing = "0.1" +unicode-casing = "0.1.0" # update version all at the same time -unic-char-property = "0.9" -unic-normal = "0.9" -unic-ucd-bidi = "0.9" -unic-ucd-category = "0.9" -unic-ucd-age = "0.9" -unic-ucd-ident = "0.9" +unic-char-property = "0.9.0" +unic-normal = "0.9.0" +unic-ucd-bidi = "0.9.0" +unic-ucd-category = "0.9.0" +unic-ucd-age = "0.9.0" +unic-ucd-ident = "0.9.0" # compression -adler32 = "1.0.3" -crc32fast = "1.2.0" -flate2 = "1.0.20" +adler32 = "1.2.0" +crc32fast = "1.3.2" +flate2 = "1.0.23" num-complex = "0.4.0" -num-bigint = "0.4.2" +num-bigint = "0.4.3" num-integer = "0.1.44" -crossbeam-utils = "0.8.5" -itertools = "0.10.1" -lexical-parse-float = "0.8.0" +crossbeam-utils = "0.8.8" +itertools = "0.10.3" +lexical-parse-float = "0.8.3" num-traits = "0.2.14" -memchr = "2" -base64 = "0.13" -csv-core = "0.1" -hex = "0.4.0" -puruspe = "0.1" -nix = "0.23" -xml-rs = "0.8" -libc = "0.2.102" +memchr = "2.4.1" +base64 = "0.13.0" +csv-core = "0.1.10" +hex = "0.4.3" +puruspe = "0.1.5" +nix = "0.23.1" +xml-rs = "0.8.4" +libc = "0.2.123" cfg-if = "1.0.0" -ahash = "0.7.4" -libz-sys = { version = "1.0", optional = true } -num_enum = "0.5.4" +ahash = "0.7.6" +libz-sys = { version = "1.1.5", optional = true } +num_enum = "0.5.7" ascii = "1.0.0" [target.'cfg(all(unix, not(target_os = "redox")))'.dependencies] -termios = "0.3" +termios = "0.3.3" [features] default = ["compile-parse", "pylib"] @@ -83,21 +83,21 @@ ssl = ["openssl", "openssl-sys", "foreign-types-shared"] ssl-vendor = ["ssl", "openssl/vendored", "openssl-probe"] [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -gethostname = "0.2.0" -socket2 = { version = "0.4.0", features = ["all"] } -dns-lookup = "1.0" -openssl = { version = "0.10.32", optional = true } -openssl-sys = { version = "0.9", optional = true } -openssl-probe = { version = "0.1", optional = true } -foreign-types-shared = { version = "0.1", optional = true } +gethostname = "0.2.3" +socket2 = { version = "0.4.4", features = ["all"] } +dns-lookup = "1.0.8" +openssl = { version = "0.10.38", optional = true } +openssl-sys = { version = "0.9.72", optional = true } +openssl-probe = { version = "0.1.5", optional = true } +foreign-types-shared = { version = "0.1.1", optional = true } [target.'cfg(windows)'.dependencies] -schannel = "0.1" -widestring = "0.4" -paste = "1.0.5" +schannel = "0.1.19" +widestring = "0.5.1" +paste = "1.0.7" [target.'cfg(windows)'.dependencies.winapi] -version = "0.3" +version = "0.3.9" features = [ "winsock2", "handleapi", "ws2def", "std", "winbase", "wincrypt", "fileapi", "processenv", "namedpipeapi", "winnt", "processthreadsapi", "errhandlingapi", "winuser", "synchapi", "wincon", @@ -105,4 +105,4 @@ features = [ ] [target.'cfg(target_os = "macos")'.dependencies] -system-configuration = "0.4" +system-configuration = "0.5.0" diff --git a/stdlib/src/hashlib.rs b/stdlib/src/hashlib.rs index 7534ac72dd..06956a02d6 100644 --- a/stdlib/src/hashlib.rs +++ b/stdlib/src/hashlib.rs @@ -8,7 +8,7 @@ mod hashlib { function::{FuncArgs, OptionalArg}, PyResult, PyValue, VirtualMachine, }; - use blake2::{Blake2b, Blake2s}; + use blake2::{Blake2b512, Blake2s256}; use digest::DynDigest; use md5::Md5; use sha1::Sha1; @@ -326,11 +326,11 @@ mod hashlib { } */ fn blake2b() -> Self { - Self::new(Blake2b::default()) + Self::new(Blake2b512::default()) } fn blake2s() -> Self { - Self::new(Blake2s::default()) + Self::new(Blake2s256::default()) } fn input(&mut self, data: &[u8]) { diff --git a/stdlib/src/socket.rs b/stdlib/src/socket.rs index 7c6c757cf0..b1f2065719 100644 --- a/stdlib/src/socket.rs +++ b/stdlib/src/socket.rs @@ -49,16 +49,17 @@ mod _socket { #[pyattr(name = "has_ipv6")] const HAS_IPV6: bool = true; #[pyattr] + // put IPPROTO_MAX later use c::{ AF_DECnet, AF_APPLETALK, AF_INET, AF_INET6, AF_IPX, AF_UNSPEC, INADDR_ANY, INADDR_LOOPBACK, INADDR_NONE, IPPROTO_AH, IPPROTO_DSTOPTS, IPPROTO_EGP, IPPROTO_ESP, IPPROTO_FRAGMENT, IPPROTO_HOPOPTS, IPPROTO_ICMP, IPPROTO_ICMPV6, IPPROTO_IDP, IPPROTO_IGMP, IPPROTO_IP, - IPPROTO_IP as IPPROTO_IPIP, IPPROTO_IPV6, IPPROTO_MAX, IPPROTO_NONE, IPPROTO_PIM, - IPPROTO_PUP, IPPROTO_RAW, IPPROTO_ROUTING, IPPROTO_TCP, IPPROTO_TCP as SOL_TCP, - IPPROTO_UDP, MSG_CTRUNC, MSG_DONTROUTE, MSG_OOB, MSG_PEEK, MSG_TRUNC, MSG_WAITALL, - NI_DGRAM, NI_MAXHOST, NI_NAMEREQD, NI_NOFQDN, NI_NUMERICHOST, NI_NUMERICSERV, SHUT_RD, - SHUT_RDWR, SHUT_WR, SOCK_DGRAM, SOCK_STREAM, SOL_SOCKET, SO_BROADCAST, SO_ERROR, SO_LINGER, - SO_OOBINLINE, SO_REUSEADDR, SO_TYPE, TCP_NODELAY, + IPPROTO_IP as IPPROTO_IPIP, IPPROTO_IPV6, IPPROTO_NONE, IPPROTO_PIM, IPPROTO_PUP, + IPPROTO_RAW, IPPROTO_ROUTING, IPPROTO_TCP, IPPROTO_TCP as SOL_TCP, IPPROTO_UDP, MSG_CTRUNC, + MSG_DONTROUTE, MSG_OOB, MSG_PEEK, MSG_TRUNC, MSG_WAITALL, NI_DGRAM, NI_MAXHOST, + NI_NAMEREQD, NI_NOFQDN, NI_NUMERICHOST, NI_NUMERICSERV, SHUT_RD, SHUT_RDWR, SHUT_WR, + SOCK_DGRAM, SOCK_STREAM, SOL_SOCKET, SO_BROADCAST, SO_ERROR, SO_LINGER, SO_OOBINLINE, + SO_REUSEADDR, SO_TYPE, TCP_NODELAY, }; #[cfg(unix)] diff --git a/vm/Cargo.toml b/vm/Cargo.toml index cb38eebcae..4c5c619902 100644 --- a/vm/Cargo.toml +++ b/vm/Cargo.toml @@ -23,9 +23,9 @@ parser = ["rustpython-parser", "ast"] [dependencies] num-complex = { version = "0.4.0", features = ["serde"] } -num-bigint = { version = "0.4.2", features = ["serde"] } -num-traits = "0.2.8" -num-integer = "0.1.41" +num-bigint = { version = "0.4.3", features = ["serde"] } +num-traits = "0.2.14" +num-integer = "0.1.44" num-rational = "0.4.0" rustpython-common = { path = "../common" } rustpython-derive = { path = "../derive", version = "0.1.2" } @@ -36,40 +36,40 @@ rustpython-compiler-core = { path = "../compiler", optional = true, version = "0 rustpython-bytecode = { path = "../bytecode", version = "0.1.2" } rustpython-jit = { path = "../jit", optional = true, version = "0.1.2" } rustpython-pylib = { path = "pylib-crate", optional = true, version = "0.1.0" } -rand = "0.8" -getrandom = { version = "0.2", features = ["js"] } -log = "0.4" -serde = { version = "1.0.66", features = ["derive"] } +rand = "0.8.5" +getrandom = { version = "0.2.6", features = ["js"] } +log = "0.4.16" +serde = { version = "1.0.136", features = ["derive"] } caseless = "0.2.1" -chrono = { version = "0.4", features = ["wasmbind"] } -itertools = "0.10.0" -hex = "0.4.0" +chrono = { version = "0.4.19", features = ["wasmbind"] } +itertools = "0.10.3" +hex = "0.4.3" hexf-parse = "0.2.1" -indexmap = "1.0.2" -ahash = "0.7.2" -bitflags = "1.3" -libc = "0.2.119" -nix = "0.23" -paste = "1.0.5" -is-macro = "0.1" +indexmap = "1.8.1" +ahash = "0.7.6" +bitflags = "1.3.2" +libc = "0.2.123" +nix = "0.23.1" +paste = "1.0.7" +is-macro = "0.2.0" result-like = "0.4.2" -num_enum = "0.5" -bstr = "0.2.12" -crossbeam-utils = "0.8" -parking_lot = "0.11" -thread_local = "1.0" -cfg-if = "1.0" -timsort = "0.1" +num_enum = "0.5.7" +bstr = "0.2.17" +crossbeam-utils = "0.8.8" +parking_lot = "0.12.0" +thread_local = "1.1.4" +cfg-if = "1.0.0" +timsort = "0.1.2" thiserror = "1.0" -atty = "0.2" -static_assertions = "1.1" -half = "1.6" -memchr = "2" -adler32 = "1.0.3" -flate2 = "1.0.20" -once_cell = "1" -memoffset = "0.6" -optional = "0.5" +atty = "0.2.14" +static_assertions = "1.1.0" +half = "1.8.2" +memchr = "2.4.1" +adler32 = "1.2.0" +flate2 = "1.0.23" +once_cell = "1.10.0" +memoffset = "0.6.5" +optional = "0.5.0" # RustPython crates implementing functionality based on CPython sre-engine = "0.1.2" @@ -77,14 +77,14 @@ sre-engine = "0.1.2" # sre-engine = { path = "../../sre-engine" } ## unicode stuff -unicode_names2 = "0.4" +unicode_names2 = "0.5.0" # TODO: use unic for this; needed for title case: # https://github.com/RustPython/RustPython/pull/832#discussion_r275428939 -unicode-casing = "0.1" +unicode-casing = "0.1.0" # update version all at the same time -unic-ucd-bidi = "0.9" -unic-ucd-category = "0.9" -unic-ucd-ident = "0.9" +unic-ucd-bidi = "0.9.0" +unic-ucd-category = "0.9.0" +unic-ucd-ident = "0.9.0" flame = { version = "0.2", optional = true } flamer = { version = "0.4", optional = true } @@ -94,23 +94,23 @@ ascii = "1.0.0" [target.'cfg(unix)'.dependencies] exitcode = "1.1.2" uname = "0.1.1" -strum = "0.21" -strum_macros = "0.21" +strum = "0.24.0" +strum_macros = "0.24.0" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] rustyline = "9" -which = "4.0" +which = "4.2.5" [target.'cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))'.dependencies] -num_cpus = "1" +num_cpus = "1.13.1" [target.'cfg(windows)'.dependencies] winreg = "0.10.1" -schannel = "0.1" -widestring = "0.4" +schannel = "0.1.19" +widestring = "0.5.1" [target.'cfg(windows)'.dependencies.winapi] -version = "0.3" +version = "0.3.9" features = [ "winsock2", "handleapi", "ws2def", "std", "winbase", "wincrypt", "fileapi", "processenv", "namedpipeapi", "winnt", "processthreadsapi", "errhandlingapi", "winuser", "synchapi", "wincon", @@ -118,8 +118,8 @@ features = [ ] [target.'cfg(target_arch = "wasm32")'.dependencies] -wasm-bindgen = "0.2" +wasm-bindgen = "0.2.80" [build-dependencies] -itertools = "0.10.0" -rustc_version = "0.4" +itertools = "0.10.3" +rustc_version = "0.4.0"