From 18076db8f004d70340a7a4317e0ac14c2ca56dee Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Sat, 7 Mar 2020 15:51:23 -0500 Subject: [PATCH] upgrade rust dependencies (#4270) --- Cargo.lock | 417 +++++++++++++++++------------------ cli/Cargo.toml | 44 ++-- cli/op_error.rs | 50 ++--- core/Cargo.toml | 12 +- deno_typescript/Cargo.toml | 2 +- test_plugin/Cargo.toml | 2 +- tools/hyper_hello/Cargo.toml | 4 +- 7 files changed, 255 insertions(+), 276 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 16b00365a3..f8471f4e37 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -26,9 +26,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743ad5a418686aad3b87fd14c43badd828cf26e214a00f92a384291cf22e1811" +checksum = "d5e63fd144e18ba274ae7095c0197a870a7b9468abc801dd62f190d80817d2ec" dependencies = [ "memchr", ] @@ -57,12 +57,6 @@ dependencies = [ "winapi 0.3.8", ] -[[package]] -name = "anyhow" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c" - [[package]] name = "anymap" version = "0.12.1" @@ -95,17 +89,17 @@ checksum = "7d96b5937e2a8b8dd9eac561c192f7fef2ab0cbc06c445e67b9e637ab158c52b" dependencies = [ "darling", "pmutil", - "proc-macro2 1.0.8", - "quote 1.0.2", + "proc-macro2 1.0.9", + "quote 1.0.3", "swc_macros_common", - "syn 1.0.14", + "syn 1.0.16", ] [[package]] name = "async-compression" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670843da104a1339d46c967382f78d9debb1713aee20e09ba1b25445076f40f4" +checksum = "9d37ca0ddff0c8afe8307cd4cc3636c19f0fa09ecfc642344b1597d08a19d1a2" dependencies = [ "brotli", "bytes 0.5.4", @@ -140,9 +134,9 @@ checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" [[package]] name = "backtrace" -version = "0.3.44" +version = "0.3.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4036b9bf40f3cf16aba72a3d65e8a520fc4bafcdc7079aea8f848c58c5b5536" +checksum = "ad235dabf00f36301792cfe82499880ba54c6486be094d1047b02bacb67c14e8" dependencies = [ "backtrace-sys", "cfg-if", @@ -152,9 +146,9 @@ dependencies = [ [[package]] name = "backtrace-sys" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" +checksum = "e17b52e737c40a7d75abca20b29a19a0eb7ba9fc72c5a72dd282a0a3c2c0dc35" dependencies = [ "cc", "libc", @@ -330,9 +324,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "core-foundation" -version = "0.6.4" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" +checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" dependencies = [ "core-foundation-sys", "libc", @@ -340,9 +334,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" +checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" [[package]] name = "crc32fast" @@ -355,20 +349,21 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c" +checksum = "cced8691919c02aac3cb0a1bc2e9b73d89e832bf9a06fc579d4e71b68a2da061" dependencies = [ "crossbeam-utils", + "maybe-uninit", ] [[package]] name = "crossbeam-utils" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" +checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ - "autocfg 0.1.7", + "autocfg 1.0.0", "cfg-if", "lazy_static", ] @@ -400,10 +395,10 @@ checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.8", - "quote 1.0.2", + "proc-macro2 1.0.9", + "quote 1.0.3", "strsim 0.9.3", - "syn 1.0.14", + "syn 1.0.16", ] [[package]] @@ -413,20 +408,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" dependencies = [ "darling_core", - "quote 1.0.2", - "syn 1.0.14", + "quote 1.0.3", + "syn 1.0.16", ] [[package]] name = "dashmap" -version = "3.4.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fc2bebacc83d7ff26f697f347fa70d4973219f87a4ad2dd3690f4129b157b7" +checksum = "93b8a57df1b6a3f0a96df85297d506a871b31252df23f969b9837ccb5d07455c" dependencies = [ "ahash 0.3.2", "cfg-if", "num_cpus", - "qadapt-spin", ] [[package]] @@ -470,11 +464,11 @@ dependencies = [ "termcolor", "tokio", "tokio-rustls", - "url", + "url 2.1.1", "utime", "walkdir", "webpki", - "webpki-roots", + "webpki-roots 0.19.0", "winapi 0.3.8", ] @@ -491,7 +485,7 @@ dependencies = [ "rusty_v8", "serde_json", "tokio", - "url", + "url 2.1.1", ] [[package]] @@ -615,9 +609,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e57153e35187d51f08471d5840459ff29093473e7bedd004a1414985aab92f3" dependencies = [ "pmutil", - "proc-macro2 1.0.8", + "proc-macro2 1.0.9", "swc_macros_common", - "syn 1.0.14", + "syn 1.0.16", ] [[package]] @@ -633,9 +627,9 @@ dependencies = [ [[package]] name = "failure" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" +checksum = "b8529c2421efa3066a5cbd8063d2244603824daccb6936b079010bb2aa89464b" dependencies = [ "backtrace", ] @@ -677,9 +671,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "039885ad6579a86b94ad8df696cce8c530da496bf7b07b12fec8d6c4cd654bb9" dependencies = [ "pmutil", - "proc-macro2 1.0.8", + "proc-macro2 1.0.9", "swc_macros_common", - "syn 1.0.14", + "syn 1.0.16", ] [[package]] @@ -785,9 +779,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7" dependencies = [ "proc-macro-hack", - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", + "proc-macro2 1.0.9", + "quote 1.0.3", + "syn 1.0.16", ] [[package]] @@ -861,9 +855,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "h2" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9433d71e471c1736fd5a61b671fc0b148d7a2992f666c958d03cd8feb3b88d1" +checksum = "9d5c295d1c0c68e4e42003d75f908f5e16a1edd1cbe0b0d02e4dc2006a384f47" dependencies = [ "bytes 0.5.4", "fnv", @@ -888,20 +882,11 @@ dependencies = [ "autocfg 0.1.7", ] -[[package]] -name = "heck" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "hermit-abi" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2c55f143919fbc0bc77e427fe2d74cf23786d7c1875666f2fde3ac3c659bb67" +checksum = "1010591b26bbfe835e9faeabeb11866061cc7dcebffd56ad7d0942d0e61aefd8" dependencies = [ "libc", ] @@ -935,9 +920,9 @@ checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" [[package]] name = "hyper" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa1c527bbc634be72aa7ba31e4e4def9bbb020f5416916279b7c705cd838893e" +checksum = "e7b15203263d1faa615f9337d79c1d37959439dc46c2b4faab33286fadc2a1c5" dependencies = [ "bytes 0.5.4", "futures-channel", @@ -959,14 +944,15 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ea6215c7314d450ee45970ab8b3851ab447a0e6bafdd19e31b20a42dbb7faf" +checksum = "ac965ea399ec3a25ac7d13b8affd4b8f39325cca00858ddf5eb29b79e6b14b08" dependencies = [ "bytes 0.5.4", "ct-logs", "futures-util", "hyper", + "log", "rustls", "rustls-native-certs", "tokio", @@ -988,6 +974,17 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +[[package]] +name = "idna" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "idna" version = "0.2.0" @@ -999,6 +996,12 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "if_chain" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bac95d9aa0624e7b78187d6fb8ab012b41d9f6f54b1bcb61e61c4845f8357ec" + [[package]] name = "indexmap" version = "1.3.2" @@ -1045,9 +1048,9 @@ checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" [[package]] name = "js-sys" -version = "0.3.35" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7889c7c36282151f6bf465be4700359318aef36baa951462382eae49e9577cf9" +checksum = "1cb931d43e71f560c81badb0191596562bafad2be06a3f9025b845c847c60df5" dependencies = [ "wasm-bindgen", ] @@ -1086,7 +1089,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" dependencies = [ - "owning_ref 0.4.0", + "owning_ref 0.4.1", "scopeguard", ] @@ -1113,9 +1116,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "memchr" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53445de381a1f436797497c61d851644d0e8e88e6140f22872ad33a704933978" +checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" [[package]] name = "mime" @@ -1125,9 +1128,9 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" [[package]] name = "mime_guess" -version = "2.0.1" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a0ed03949aef72dbdf3116a383d7b38b4768e6f960528cd6a6044aa9ed68599" +checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212" dependencies = [ "mime", "unicase", @@ -1248,16 +1251,6 @@ dependencies = [ "void", ] -[[package]] -name = "nom" -version = "4.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" -dependencies = [ - "memchr", - "version_check 0.1.5", -] - [[package]] name = "notify" version = "5.0.0-pre.2" @@ -1353,9 +1346,9 @@ dependencies = [ [[package]] name = "owning_ref" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" +checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce" dependencies = [ "stable_deref_trait", ] @@ -1405,6 +1398,12 @@ dependencies = [ "winapi 0.3.8", ] +[[package]] +name = "percent-encoding" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" + [[package]] name = "percent-encoding" version = "2.1.0" @@ -1445,9 +1444,9 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "385322a45f2ecf3410c68d2a549a4a2685e8051d0f278e39743ff4e451cb9b3f" dependencies = [ - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", + "proc-macro2 1.0.9", + "quote 1.0.3", + "syn 1.0.16", ] [[package]] @@ -1468,9 +1467,9 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004" dependencies = [ - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", + "proc-macro2 1.0.9", + "quote 1.0.3", + "syn 1.0.16", ] [[package]] @@ -1491,9 +1490,9 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" dependencies = [ - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", + "proc-macro2 1.0.9", + "quote 1.0.3", + "syn 1.0.16", ] [[package]] @@ -1513,9 +1512,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548" +checksum = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435" dependencies = [ "unicode-xid 0.2.0", ] @@ -1530,12 +1529,6 @@ dependencies = [ "libc", ] -[[package]] -name = "qadapt-spin" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f611c8f8569fbe485c26a15f2fbcc4c1c95577081b361766fe97beece56b16f" - [[package]] name = "quote" version = "0.6.13" @@ -1547,11 +1540,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" +checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f" dependencies = [ - "proc-macro2 1.0.8", + "proc-macro2 1.0.9", ] [[package]] @@ -1764,9 +1757,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.14" +version = "0.6.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28dfe3fe9badec5dbf0a79a9cccad2cfc2ab5484bdb3e44cbd1ae8b3ba2be06" +checksum = "1132f845907680735a84409c3bebc64d1364a5683ffbce899550cd09d5eaefc1" [[package]] name = "remove_dir_all" @@ -1779,9 +1772,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.10.2" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae3fc32eacd4a5200c6b34bd6c057b07fb64f5a1e55bb67d624cc1393354621" +checksum = "02b81e49ddec5109a9dcfc5f2a317ff53377c915e9ae9d4f2fb50914b85614e2" dependencies = [ "async-compression", "base64 0.11.0", @@ -1798,7 +1791,7 @@ dependencies = [ "log", "mime", "mime_guess", - "percent-encoding", + "percent-encoding 2.1.0", "pin-project-lite", "rustls", "serde", @@ -1806,11 +1799,11 @@ dependencies = [ "time", "tokio", "tokio-rustls", - "url", + "url 2.1.1", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", + "webpki-roots 0.18.0", "winreg", ] @@ -1858,11 +1851,11 @@ dependencies = [ [[package]] name = "rustls" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b25a18b1bf7387f0145e7f8324e700805aade3842dd3db2e74e4cdeb4677c09e" +checksum = "c0d4a31f5d68413404705d6982529b0e11a9aacd4839d1d6222ee3b8cb4015e1" dependencies = [ - "base64 0.10.1", + "base64 0.11.0", "log", "ring", "sct", @@ -1871,9 +1864,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ffebdbb48c14f84eba0b715197d673aff1dd22cc1007ca647e28483bbcc307" +checksum = "a75ffeb84a6bd9d014713119542ce415db3a3e4748f0bfce1e1416cd224a23a5" dependencies = [ "openssl-probe", "rustls", @@ -1896,9 +1889,9 @@ dependencies = [ [[package]] name = "rustyline" -version = "5.0.6" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a23cb19702a8d6afb6edb3c842386e680d4883760e0df74e6848e23c2a87a635" +checksum = "de64be8eecbe428b6924f1d8430369a01719fbb182c26fa431ddbb0a95f5315d" dependencies = [ "cfg-if", "dirs", @@ -1961,23 +1954,24 @@ dependencies = [ [[package]] name = "security-framework" -version = "0.3.4" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df" +checksum = "97bbedbe81904398b6ebb054b3e912f99d55807125790f3198ac990d98def5b0" dependencies = [ + "bitflags", "core-foundation", "core-foundation-sys", - "libc", "security-framework-sys", ] [[package]] name = "security-framework-sys" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895" +checksum = "06fd2f23e31ef68dd2328cc383bd493142e46107a3a0e24f7d734e3f3b80fe4c" dependencies = [ "core-foundation-sys", + "libc", ] [[package]] @@ -2010,9 +2004,9 @@ version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" dependencies = [ - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", + "proc-macro2 1.0.9", + "quote 1.0.3", + "syn 1.0.16", ] [[package]] @@ -2036,7 +2030,7 @@ dependencies = [ "dtoa", "itoa", "serde", - "url", + "url 2.1.1", ] [[package]] @@ -2099,10 +2093,20 @@ dependencies = [ ] [[package]] -name = "sourcefile" -version = "0.1.4" +name = "sourcemap" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" +checksum = "8fd57aa9e5cea41b4a3c26a61039fad5585e2154ffe057a2656540a21b03a2d2" +dependencies = [ + "base64 0.10.1", + "if_chain", + "lazy_static", + "regex", + "rustc_version", + "serde", + "serde_json", + "url 1.7.2", +] [[package]] name = "spin" @@ -2137,8 +2141,8 @@ checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97" dependencies = [ "phf_generator", "phf_shared", - "proc-macro2 1.0.8", - "quote 1.0.2", + "proc-macro2 1.0.9", + "quote 1.0.3", ] [[package]] @@ -2148,10 +2152,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94fdb6536756cfd35ee18b9a9972ab2a699d405cc57e0ad0532022960f30d581" dependencies = [ "pmutil", - "proc-macro2 1.0.8", - "quote 1.0.2", + "proc-macro2 1.0.9", + "quote 1.0.3", "swc_macros_common", - "syn 1.0.14", + "syn 1.0.16", ] [[package]] @@ -2178,9 +2182,9 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.5.3" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66390c6f5d8846eba68c0cfc599872c55df2f34ee69294f7ec6d61f1ea1f6a5" +checksum = "86a1c880706ee78c309cf5764d3f43d3eb0c50357b9d1f36b93568dfb5c0e30e" dependencies = [ "ast_node", "atty", @@ -2194,6 +2198,7 @@ dependencies = [ "parking_lot 0.7.1", "scoped-tls", "serde", + "sourcemap", "string_cache", "termcolor", "unicode-width", @@ -2215,9 +2220,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.19.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449c59d6588e09488e4ad5cfb794268f4c1c21961b6cfa1743478b6b801f463a" +checksum = "8f072a5c584394782744909232beac07fd95e605a39e64b38b4d0856e02d82b7" dependencies = [ "either", "enum_kind", @@ -2241,22 +2246,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b3ae6f346378d597ff91095bb1b926e3e1f3504babd30968b939c96d2529b2a" dependencies = [ "pmutil", - "proc-macro2 1.0.8", - "quote 1.0.2", + "proc-macro2 1.0.9", + "quote 1.0.3", "swc_macros_common", - "syn 1.0.14", + "syn 1.0.16", ] [[package]] name = "swc_macros_common" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1638e13581d32a5ef0ea74fadb9d2325b30f3fdb17ac8d38cb6da5f83f1b92b" +checksum = "18a9f27d290938370597d363df9a77ba4be8e2bc99f32f69eb5245cdeed3c512" dependencies = [ "pmutil", - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", + "proc-macro2 1.0.9", + "quote 1.0.3", + "syn 1.0.16", ] [[package]] @@ -2272,12 +2277,12 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5" +checksum = "123bd9499cfb380418d509322d7a6d52e5315f064fe4b3ad18a53d6b92c07859" dependencies = [ - "proc-macro2 1.0.8", - "quote 1.0.2", + "proc-macro2 1.0.9", + "quote 1.0.3", "unicode-xid 0.2.0", ] @@ -2354,9 +2359,9 @@ dependencies = [ [[package]] name = "tokio" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fdd17989496f49cdc57978c96f0c9fe5e4a58a8bddc6813c449a4624f6a030b" +checksum = "0fa5e81d6bc4e67fe889d5783bd2a128ab2e0cfa487e0be16b6a8d177b101616" dependencies = [ "bytes 0.5.4", "fnv", @@ -2389,20 +2394,20 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4b1e7ed7d5d4c2af3d999904b0eebe76544897cdbfb2b9684bed2174ab20f7c" +checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389" dependencies = [ - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", + "proc-macro2 1.0.9", + "quote 1.0.3", + "syn 1.0.16", ] [[package]] name = "tokio-rustls" -version = "0.12.2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141afec0978abae6573065a48882c6bae44c5cc61db9b511ac4abf6a09bfd9cc" +checksum = "4adb8b3e5f86b707f1b54e7c15b6de52617a823608ccda98a15d3a24222f265a" dependencies = [ "futures-core", "rustls", @@ -2442,7 +2447,7 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" dependencies = [ - "version_check 0.9.1", + "version_check", ] [[package]] @@ -2493,15 +2498,26 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60369ef7a31de49bcb3f6ca728d4ba7300d9a1658f94c727d4cab8c8d9f4aece" +[[package]] +name = "url" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" +dependencies = [ + "idna 0.1.5", + "matches", + "percent-encoding 1.0.1", +] + [[package]] name = "url" version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" dependencies = [ - "idna", + "idna 0.2.0", "matches", - "percent-encoding", + "percent-encoding 2.1.0", ] [[package]] @@ -2527,12 +2543,6 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" -[[package]] -name = "version_check" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" - [[package]] name = "version_check" version = "0.9.1" @@ -2580,9 +2590,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasm-bindgen" -version = "0.2.58" +version = "0.2.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5205e9afdf42282b192e2310a5b463a6d1c1d774e30dc3c791ac37ab42d2616c" +checksum = "3557c397ab5a8e347d434782bcd31fc1483d927a6826804cec05cc792ee2519d" dependencies = [ "cfg-if", "serde", @@ -2592,24 +2602,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.58" +version = "0.2.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11cdb95816290b525b32587d76419facd99662a07e59d3cdb560488a819d9a45" +checksum = "e0da9c9a19850d3af6df1cb9574970b566d617ecfaf36eb0b706b6f3ef9bd2f8" dependencies = [ "bumpalo", "lazy_static", "log", - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", + "proc-macro2 1.0.9", + "quote 1.0.3", + "syn 1.0.16", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bbdd49e3e28b40dec6a9ba8d17798245ce32b019513a845369c641b275135d9" +checksum = "457414a91863c0ec00090dba537f88ab955d93ca6555862c29b6d860990b8a8a" dependencies = [ "cfg-if", "js-sys", @@ -2619,60 +2629,41 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.58" +version = "0.2.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "574094772ce6921576fb6f2e3f7497b8a76273b6db092be18fc48a082de09dc3" +checksum = "0f6fde1d36e75a714b5fe0cffbb78978f222ea6baebb726af13c78869fdb4205" dependencies = [ - "quote 1.0.2", + "quote 1.0.3", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.58" +version = "0.2.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e85031354f25eaebe78bb7db1c3d86140312a911a106b2e29f9cc440ce3e7668" +checksum = "25bda4168030a6412ea8a047e27238cadf56f0e53516e1e83fec0a8b7c786f6d" dependencies = [ - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", + "proc-macro2 1.0.9", + "quote 1.0.3", + "syn 1.0.16", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.58" +version = "0.2.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5e7e61fc929f4c0dddb748b102ebf9f632e2b8d739f2016542b4de2965a9601" - -[[package]] -name = "wasm-bindgen-webidl" -version = "0.2.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef012a0d93fc0432df126a8eaf547b2dce25a8ce9212e1d3cbeef5c11157975d" -dependencies = [ - "anyhow", - "heck", - "log", - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", - "wasm-bindgen-backend", - "weedle", -] +checksum = "fc9f36ad51f25b0219a3d4d13b90eb44cd075dff8b6280cca015775d7acaddd8" [[package]] name = "web-sys" -version = "0.3.35" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf97caf6aa8c2b1dac90faf0db529d9d63c93846cca4911856f78a83cebf53b" +checksum = "721c6263e2c66fd44501cc5efbfa2b7dfa775d13e4ea38c46299646ed1f9c70a" dependencies = [ - "anyhow", "js-sys", - "sourcefile", "wasm-bindgen", - "wasm-bindgen-webidl", ] [[package]] @@ -2687,20 +2678,20 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a262ae37dd9d60f60dd473d1158f9fbebf110ba7b6a5051c8160460f6043718b" +checksum = "91cd5736df7f12a964a5067a12c62fa38e1bd8080aff1f80bc29be7c80d19ab4" dependencies = [ "webpki", ] [[package]] -name = "weedle" -version = "0.10.0" +name = "webpki-roots" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bb43f70885151e629e2a19ce9e50bd730fd436cfd4b666894c9ce4de9141164" +checksum = "f8eff4b7516a57307f9349c64bf34caa34b940b66fed4b2fb3136cb7386e5739" dependencies = [ - "nom", + "webpki", ] [[package]] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 0115938f7b..2318699f10 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -26,41 +26,41 @@ deno_typescript = { path = "../deno_typescript", version = "0.35.0" } deno_core = { path = "../core", version = "0.35.0" } deno_typescript = { path = "../deno_typescript", version = "0.35.0" } -atty = "0.2.13" +atty = "0.2.14" base64 = "0.11.0" -bytes = "0.5.3" -byteorder = "1.3.2" +bytes = "0.5.4" +byteorder = "1.3.4" clap = "2.33.0" dirs = "2.0.2" dlopen = "0.1.8" dprint-plugin-typescript = "0.7.0" -futures = { version = "0.3.1", features = [ "compat", "io-compat" ] } +futures = { version = "0.3.4", features = [ "compat", "io-compat" ] } glob = "0.3.0" http = "0.2.0" -indexmap = "1.3.0" +indexmap = "1.3.2" lazy_static = "1.4.0" -libc = "0.2.66" +libc = "0.2.67" log = "0.4.8" -notify = { version = "5.0.0-pre.2" } -rand = "0.7.2" -regex = "1.3.1" +notify = "5.0.0-pre.2" +rand = "0.7.3" +regex = "1.3.4" remove_dir_all = "0.5.2" -reqwest = { version = "0.10.2", default-features = false, features = ["rustls-tls", "stream", "gzip", "brotli"] } -ring = "0.16.9" -rustyline = "5.0.6" +reqwest = { version = "0.10.4", default-features = false, features = ["rustls-tls", "stream", "gzip", "brotli"] } +ring = "0.16.11" +rustyline = "6.0.0" serde = { version = "1.0.104", features = ["derive"] } serde_derive = "1.0.104" -serde_json = { version = "1.0.44", features = [ "preserve_order" ] } +serde_json = { version = "1.0.48", features = [ "preserve_order" ] } source-map-mappings = "0.5.0" -sys-info = "=0.5.8" # 0.5.9 seems to be broken on windows. +sys-info = "=0.5.8" # 0.5.9 and 0.5.10 are broken on windows. tempfile = "3.1.0" -termcolor = "1.0.5" -tokio = { version = "0.2", features = ["rt-core", "tcp", "udp", "process", "fs", "blocking", "sync", "io-std", "macros", "time"] } -tokio-rustls = "0.12.1" -url = "2.1.0" +termcolor = "1.1.0" +tokio = { version = "0.2.13", features = ["rt-core", "tcp", "udp", "process", "fs", "blocking", "sync", "io-std", "macros", "time"] } +tokio-rustls = "0.13.0" +url = "2.1.1" utime = "0.2.1" -webpki = "0.21.0" -webpki-roots = "0.17.0" +webpki = "0.21.2" +webpki-roots = "0.19.0" walkdir = "2.3.1" [target.'cfg(windows)'.dependencies] @@ -68,10 +68,10 @@ winapi = "0.3.8" fwdansi = "1.1.0" [target.'cfg(unix)'.dependencies] -nix = "0.14.1" +nix = "0.14" # rustyline depends on 0.14, to avoid duplicates we do too. [dev-dependencies] os_pipe = "0.9.1" [target.'cfg(unix)'.dev-dependencies] -pty = "0.2" +pty = "0.2.2" diff --git a/cli/op_error.rs b/cli/op_error.rs index d35c998953..a2cf03a661 100644 --- a/cli/op_error.rs +++ b/cli/op_error.rs @@ -261,11 +261,11 @@ impl From<&ReadlineError> for OpError { fn from(error: &ReadlineError) -> Self { use ReadlineError::*; let kind = match error { - Io(err) => return err.into(), + Io(err) => return OpError::from(err), Eof => ErrorKind::UnexpectedEof, Interrupted => ErrorKind::Interrupted, #[cfg(unix)] - Errno(err) => return err.into(), + Errno(err) => return (*err).into(), _ => unimplemented!(), }; @@ -300,35 +300,23 @@ impl From<&serde_json::error::Error> for OpError { } #[cfg(unix)] -mod unix { - use super::{ErrorKind, OpError}; - use nix::errno::Errno::*; - pub use nix::Error; - use nix::Error::Sys; +impl From for OpError { + fn from(error: nix::Error) -> Self { + use nix::errno::Errno::*; + let kind = match error { + nix::Error::Sys(EPERM) => ErrorKind::PermissionDenied, + nix::Error::Sys(EINVAL) => ErrorKind::TypeError, + nix::Error::Sys(ENOENT) => ErrorKind::NotFound, + nix::Error::Sys(UnknownErrno) => unreachable!(), + nix::Error::Sys(_) => unreachable!(), + nix::Error::InvalidPath => ErrorKind::TypeError, + nix::Error::InvalidUtf8 => ErrorKind::InvalidData, + nix::Error::UnsupportedOperation => unreachable!(), + }; - impl From for OpError { - fn from(error: Error) -> Self { - OpError::from(&error) - } - } - - impl From<&Error> for OpError { - fn from(error: &Error) -> Self { - let kind = match error { - Sys(EPERM) => ErrorKind::PermissionDenied, - Sys(EINVAL) => ErrorKind::TypeError, - Sys(ENOENT) => ErrorKind::NotFound, - Sys(UnknownErrno) => unreachable!(), - Sys(_) => unreachable!(), - Error::InvalidPath => ErrorKind::TypeError, - Error::InvalidUtf8 => ErrorKind::InvalidData, - Error::UnsupportedOperation => unreachable!(), - }; - - Self { - kind, - msg: error.to_string(), - } + Self { + kind, + msg: error.to_string(), } } } @@ -361,7 +349,7 @@ impl From for OpError { fn from(error: ErrBox) -> Self { #[cfg(unix)] fn unix_error_kind(err: &ErrBox) -> Option { - err.downcast_ref::().map(|e| e.into()) + err.downcast_ref::().map(|e| (*e).into()) } #[cfg(not(unix))] diff --git a/core/Cargo.toml b/core/Cargo.toml index 97b9c64555..57da2a5360 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -15,13 +15,13 @@ path = "lib.rs" [dependencies] downcast-rs = "1.1.1" -futures = { version = "0.3.1", features = [ "thread-pool", "compat" ] } +futures = { version = "0.3.4", features = [ "thread-pool", "compat" ] } lazy_static = "1.4.0" -libc = "0.2.66" +libc = "0.2.67" log = "0.4.8" -serde_json = "1.0.44" -url = "2.1.0" -rusty_v8 = "=0.3.4" +serde_json = "1.0.48" +url = "2.1.1" +rusty_v8 = "0.3.4" [[example]] name = "deno_core_http_bench" @@ -30,4 +30,4 @@ path = "examples/http_bench.rs" # These dependendencies are only used for deno_core_http_bench. [dev-dependencies] derive_deref = "1.1.0" -tokio = { version = "0.2", features = ["rt-core", "tcp"] } +tokio = { version = "0.2.13", features = ["rt-core", "tcp"] } diff --git a/deno_typescript/Cargo.toml b/deno_typescript/Cargo.toml index b79888bd26..98663df05c 100644 --- a/deno_typescript/Cargo.toml +++ b/deno_typescript/Cargo.toml @@ -20,5 +20,5 @@ path = "lib.rs" [dependencies] deno_core = { path = "../core", version = "0.35.0" } -serde_json = "1.0.44" +serde_json = "1.0.48" serde = { version = "1.0.104", features = ["derive"] } diff --git a/test_plugin/Cargo.toml b/test_plugin/Cargo.toml index d9dce04345..5dcfb61edc 100644 --- a/test_plugin/Cargo.toml +++ b/test_plugin/Cargo.toml @@ -9,6 +9,6 @@ publish = false crate-type = ["cdylib"] [dependencies] -futures = "0.3.1" +futures = "0.3.4" deno_core = { path = "../core" } deno = { path = "../cli" } diff --git a/tools/hyper_hello/Cargo.toml b/tools/hyper_hello/Cargo.toml index af0b7333bf..2b8da4cfca 100644 --- a/tools/hyper_hello/Cargo.toml +++ b/tools/hyper_hello/Cargo.toml @@ -4,8 +4,8 @@ version = "0.0.1" edition = "2018" [dependencies] -hyper = "0.13.1" -tokio = { version = "0.2.6", features = ["full"] } +hyper = "0.13.3" +tokio = { version = "0.2.13", features = ["full"] } [[bin]] name = "hyper_hello"