diff --git a/Cargo.lock b/Cargo.lock index a2b5a8c392..cb26eb698e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -21,9 +21,9 @@ dependencies = [ [[package]] name = "adler" -version = "0.2.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "adler32" @@ -111,9 +111,9 @@ dependencies = [ [[package]] name = "ansi_colours" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0f302a81afc6a7f4350c04f0ba7cfab529cc009bca3324b3fb5764e6add8b6" +checksum = "52cb663b84aea8670b4a40368360e29485c11b03d14ff6283261aeccd69d5ce1" dependencies = [ "cc", ] @@ -150,7 +150,7 @@ checksum = "85149eb4159516fbc261f362153822672e4bdb5b3accc863a5777627c6d9fe72" dependencies = [ "clipboard-win", "core-graphics", - "image 0.23.13", + "image 0.23.14", "lazy_static 1.4.0", "libc", "objc", @@ -185,19 +185,19 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "async-attributes" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd3d156917d94862e779f356c5acae312b08fd3121e792c857d7928c8088423" +checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" dependencies = [ - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", ] [[package]] name = "async-channel" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59740d83946db6a5af71ae25ddf9562c2b176b2ca42cf99a455f09f4a220d6b9" +checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" dependencies = [ "concurrent-queue", "event-listener", @@ -232,7 +232,7 @@ dependencies = [ "futures-lite", "num_cpus", "once_cell", - "tokio 0.2.24", + "tokio 0.2.25", ] [[package]] @@ -280,8 +280,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2" dependencies = [ "proc-macro2", - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", ] [[package]] @@ -295,7 +295,7 @@ dependencies = [ "async-global-executor", "async-io", "async-lock", - "crossbeam-utils 0.8.1", + "crossbeam-utils 0.8.3", "futures-channel", "futures-core", "futures-io", @@ -306,10 +306,10 @@ dependencies = [ "memchr", "num_cpus", "once_cell", - "pin-project-lite 0.2.4", + "pin-project-lite 0.2.6", "pin-utils", "slab 0.4.2", - "wasm-bindgen-futures 0.4.19", + "wasm-bindgen-futures 0.4.21", ] [[package]] @@ -320,13 +320,13 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" [[package]] name = "async-trait" -version = "0.1.42" +version = "0.1.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d" +checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf" dependencies = [ "proc-macro2", - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", ] [[package]] @@ -354,14 +354,14 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "backtrace" -version = "0.3.55" +version = "0.3.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598" +checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc" dependencies = [ "addr2line", "cfg-if 1.0.0", "libc", - "miniz_oxide 0.4.3", + "miniz_oxide 0.4.4", "object", "rustc-demangle", ] @@ -392,12 +392,6 @@ dependencies = [ "safemem 0.3.3", ] -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - [[package]] name = "base64" version = "0.13.0" @@ -424,7 +418,7 @@ dependencies = [ "lazy_static 1.4.0", "path_abs", "semver 0.11.0", - "serde 1.0.123", + "serde 1.0.124", "serde_yaml", "shell-words", "syntect", @@ -438,10 +432,10 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc403c26e6b03005522e6e8053384c4e881dfe5b2bf041c0c2c49be33d64a539" dependencies = [ - "num-bigint 0.3.1", + "num-bigint 0.3.2", "num-integer", "num-traits 0.2.14", - "serde 1.0.123", + "serde 1.0.124", ] [[package]] @@ -451,7 +445,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d" dependencies = [ "byteorder", - "serde 1.0.123", + "serde 1.0.124", ] [[package]] @@ -499,7 +493,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1339a1042f5d9f295737ad4d9a6ab6bf81c84a933dba110b9200cd6d1448b814" dependencies = [ "byte-tools", - "generic-array 0.8.3", + "generic-array 0.8.4", ] [[package]] @@ -539,28 +533,28 @@ dependencies = [ "linked-hash-map 0.5.4", "md5 0.6.1", "rand 0.7.3", - "serde 1.0.123", + "serde 1.0.124", "serde_json", - "time 0.1.43", + "time 0.1.44", ] [[package]] name = "bstr" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "473fc6b38233f9af7baa94fb5852dca389e3d95b8e21c8e3719301462c5d9faf" +checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d" dependencies = [ "lazy_static 1.4.0", "memchr", "regex-automata", - "serde 1.0.123", + "serde 1.0.124", ] [[package]] name = "bumpalo" -version = "3.4.0" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" +checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" [[package]] name = "byte-tools" @@ -579,9 +573,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a4bad0c5981acc24bc09e532f35160f952e35422603f0563cd7a73c2c2e65a0" +checksum = "bed57e2090563b83ba8f83366628ce535a7584c9afa4c9fc0612a03925c6df58" [[package]] name = "byteorder" @@ -623,9 +617,9 @@ dependencies = [ [[package]] name = "bzip2-sys" -version = "0.1.9+1.0.8" +version = "0.1.10+1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad3b39a260062fca31f7b0b12f207e8f2590a67d32ec7d59c20484b07ea7285e" +checksum = "17fa3d1ac1ca21c5c4e36a97f3c3eb25084576f6fc47bf0139c1123434216c6c" dependencies = [ "cc", "libc", @@ -649,7 +643,7 @@ dependencies = [ "encoding_rs", "log 0.4.14", "quick-xml 0.19.0", - "serde 1.0.123", + "serde 1.0.124", "zip", ] @@ -661,9 +655,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" [[package]] name = "cc" -version = "1.0.66" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" +checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" dependencies = [ "jobserver", ] @@ -689,8 +683,8 @@ dependencies = [ "libc", "num-integer", "num-traits 0.2.14", - "serde 1.0.123", - "time 0.1.43", + "serde 1.0.124", + "time 0.1.44", "winapi 0.3.9", ] @@ -760,11 +754,11 @@ dependencies = [ [[package]] name = "codespan-reporting" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ce42b8998a383572e0a802d859b1f00c79b7b7474e62fff88ee5c2845d9c13" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" dependencies = [ - "serde 1.0.123", + "serde 1.0.124", "termcolor", "unicode-width", ] @@ -804,7 +798,7 @@ dependencies = [ "lazy_static 1.4.0", "nom 5.1.2", "rust-ini", - "serde 1.0.123", + "serde 1.0.124", "serde-hjson", "serde_json", "toml", @@ -930,7 +924,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.1", + "crossbeam-utils 0.8.3", ] [[package]] @@ -951,8 +945,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" dependencies = [ "cfg-if 1.0.0", - "crossbeam-epoch 0.9.1", - "crossbeam-utils 0.8.1", + "crossbeam-epoch 0.9.3", + "crossbeam-utils 0.8.3", ] [[package]] @@ -972,13 +966,12 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d" +checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12" dependencies = [ "cfg-if 1.0.0", - "const_fn", - "crossbeam-utils 0.8.1", + "crossbeam-utils 0.8.3", "lazy_static 1.4.0", "memoffset 0.6.1", "scopeguard", @@ -1018,9 +1011,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" +checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" dependencies = [ "autocfg", "cfg-if 1.0.0", @@ -1037,7 +1030,7 @@ dependencies = [ "crossterm_winapi 0.6.2", "lazy_static 1.4.0", "libc", - "mio 0.7.7", + "mio 0.7.9", "parking_lot 0.11.1", "signal-hook", "winapi 0.3.9", @@ -1053,7 +1046,7 @@ dependencies = [ "crossterm_winapi 0.7.0", "lazy_static 1.4.0", "libc", - "mio 0.7.7", + "mio 0.7.9", "parking_lot 0.11.1", "signal-hook", "winapi 0.3.9", @@ -1084,7 +1077,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "779015233ac67d65098614aec748ac1c756ab6677fa2e14cf8b37c08dfed1198" dependencies = [ "constant_time_eq", - "generic-array 0.8.3", + "generic-array 0.8.4", ] [[package]] @@ -1109,9 +1102,9 @@ dependencies = [ "matches", "phf", "proc-macro2", - "quote 1.0.8", + "quote 1.0.9", "smallvec 1.6.1", - "syn 1.0.60", + "syn 1.0.62", ] [[package]] @@ -1120,21 +1113,21 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" dependencies = [ - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", ] [[package]] name = "csv" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d58633299b24b515ac72a3f869f8b91306a3cec616a602843a383acd6f9e97" +checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" dependencies = [ "bstr", "csv-core", "itoa", "ryu", - "serde 1.0.123", + "serde 1.0.124", ] [[package]] @@ -1152,8 +1145,8 @@ version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19" dependencies = [ - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", ] [[package]] @@ -1167,19 +1160,19 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.1.7" +version = "3.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b57a92e9749e10f25a171adcebfafe72991d45e7ec2dcb853e8f83d9dafaeb08" +checksum = "c15b8ec3b5755a188c141c1f6a98e76de31b936209bf066b647979e2a84764a9" dependencies = [ - "nix 0.18.0", + "nix 0.20.0", "winapi 0.3.9", ] [[package]] name = "curl" -version = "0.4.34" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e268162af1a5fe89917ae25ba3b0a77c8da752bdc58e7dbb4f15b91fbd33756e" +checksum = "5a872858e9cb9e3b96c80dd78774ad9e32e44d3b05dc31e142b858d14aebc82c" dependencies = [ "curl-sys", "libc", @@ -1192,9 +1185,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.39+curl-7.74.0" +version = "0.4.41+curl-7.75.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07a8ce861e7b68a0b394e814d7ee9f1b2750ff8bd10372c6ad3bacc10e86f874" +checksum = "0ec466abd277c7cab2905948f3e94d10bc4963f1f5d47921c1cc4ffd2028fe65" dependencies = [ "cc", "libc", @@ -1224,9 +1217,9 @@ checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" [[package]] name = "decimal" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6458723bc760383275fbc02f4c769b2e5f3de782abaf5e7e0b9b7f0368a63ed" +checksum = "5a8ab77e91baeb15034c3be91e87bff4665c9036216148e4996d9a9f5792114d" dependencies = [ "bitflags", "cc", @@ -1255,13 +1248,13 @@ dependencies = [ [[package]] name = "derive-new" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71f31892cd5c62e414316f2963c5689242c43d8e7bbcaaeca97e5e28c95d91d9" +checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" dependencies = [ "proc-macro2", - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", ] [[package]] @@ -1282,8 +1275,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c" dependencies = [ "proc-macro2", - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", ] [[package]] @@ -1292,7 +1285,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5b29bf156f3f4b3c4f610a25ff69370616ae6e0657d416de22645483e72af0a" dependencies = [ - "generic-array 0.8.3", + "generic-array 0.8.4", ] [[package]] @@ -1435,9 +1428,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "eml-parser" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9e30d14e24cd200f2351837a02feacf8f043410f2a56441868c93ef33f90239" +checksum = "031fe36712cec8b81c5b76b555666ce855a4dfc2dcc35bb907046bf2ef545578" dependencies = [ "regex 1.4.3", ] @@ -1536,9 +1529,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26ecb66b4bdca6c1409b40fb255eefc2bd4f6d135dab3c3124f80ffa2a9661e" +checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" dependencies = [ "log 0.4.14", "regex 1.4.3", @@ -1586,8 +1579,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ "proc-macro2", - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", "synstructure", ] @@ -1689,9 +1682,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00" +checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" dependencies = [ "matches", "percent-encoding 2.1.0", @@ -1747,15 +1740,15 @@ dependencies = [ [[package]] name = "futures" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7e4c2612746b0df8fed4ce0c69156021b704c9aefa360311c04e6e9e002eed" +checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9052a1a50244d8d5aa9bf55cbc2fb6f357c86cc52e46c62ed390a7180cf150" +checksum = "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163ea14c1" dependencies = [ "futures-channel", "futures-core", @@ -1768,9 +1761,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2d31b7ec7efab6eefc7c57233bb10b847986139d88cc2f5a02a1ae6871a1846" +checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939" dependencies = [ "futures-core", "futures-sink", @@ -1788,9 +1781,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e5145dde8da7d1b3892dad07a9c98fc04bc39892b1ecc9692cf53e2b780a65" +checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94" [[package]] name = "futures-core-preview" @@ -1804,15 +1797,15 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" dependencies = [ - "futures 0.1.30", + "futures 0.1.31", "num_cpus", ] [[package]] name = "futures-executor" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e59fdc009a4b3096bf94f740a0f2424c082521f20a9b08c5c07c48d90fd9b9" +checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1" dependencies = [ "futures-core", "futures-task", @@ -1832,9 +1825,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28be053525281ad8259d47e4de5de657b25e7bac113458555bb4b70bc6870500" +checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59" [[package]] name = "futures-io-preview" @@ -1853,20 +1846,20 @@ dependencies = [ "futures-io", "memchr", "parking", - "pin-project-lite 0.2.4", + "pin-project-lite 0.2.6", "waker-fn", ] [[package]] name = "futures-macro" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c287d25add322d9f9abdcdc5927ca398917996600182178774032e9f8258fedd" +checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7" dependencies = [ "proc-macro-hack", "proc-macro2", - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", ] [[package]] @@ -1885,9 +1878,9 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf5c69029bda2e743fddd0582d1083951d65cc9539aebf8812f36c3491342d6" +checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3" [[package]] name = "futures-sink-preview" @@ -1897,12 +1890,9 @@ checksum = "86f148ef6b69f75bb610d4f9a2336d4fc88c4b5b67129d1a340dd0fd362efeec" [[package]] name = "futures-task" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13de07eb8ea81ae445aca7b69f5f7bf15d7bf4912d8ca37d6645c77ae8a58d86" -dependencies = [ - "once_cell", -] +checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80" [[package]] name = "futures-timer" @@ -1912,11 +1902,11 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632a8cd0f2a4b3fdea1657f08bde063848c3bd00f9bbf6e256b8be78802e624b" +checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1" dependencies = [ - "futures 0.1.30", + "futures 0.1.31", "futures-channel", "futures-core", "futures-io", @@ -1924,7 +1914,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.4", + "pin-project-lite 0.2.6", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -1938,7 +1928,7 @@ version = "0.3.0-alpha.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ce968633c17e5f97936bd2797b6e38fb56cf16a7422319f7ec2e30d3c470e8d" dependencies = [ - "futures 0.1.30", + "futures 0.1.31", "futures-channel-preview", "futures-core-preview", "futures-io-preview", @@ -1956,7 +1946,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce54d63f8b0c75023ed920d46fd71d0cbbb830b0ee012726b5b4f506fb6dea5b" dependencies = [ "bytes 0.5.6", - "futures 0.3.12", + "futures 0.3.13", "memchr", "pin-project 0.4.27", ] @@ -1978,9 +1968,9 @@ checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" [[package]] name = "generic-array" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fceb69994e330afed50c93524be68c42fa898c2d9fd4ee8da03bd7363acd26f2" +checksum = "b2297fb0e3ea512e380da24b52dca3924028f59df5e3a17a18f81d8349ca7ebe" dependencies = [ "nodrop", "typenum", @@ -2015,7 +2005,7 @@ checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi 0.10.1+wasi-snapshot-preview1", + "wasi 0.10.0+wasi-snapshot-preview1", ] [[package]] @@ -2026,8 +2016,8 @@ checksum = "24b328c01a4d71d2d8173daa93562a73ab0fe85616876f02500f53d82948c504" dependencies = [ "proc-macro-error", "proc-macro2", - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", ] [[package]] @@ -2048,9 +2038,9 @@ checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" [[package]] name = "git2" -version = "0.13.15" +version = "0.13.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44f267c9da8a4de3c615b59e23606c75f164f84896e97f4dd6c15a4294de4359" +checksum = "1d250f5f82326884bd39c2853577e70a121775db76818ffa452ed1e80de12986" dependencies = [ "bitflags", "libc", @@ -2105,7 +2095,7 @@ dependencies = [ "http 0.2.3", "indexmap", "slab 0.4.2", - "tokio 0.2.24", + "tokio 0.2.25", "tokio-util", "tracing", "tracing-futures", @@ -2155,9 +2145,9 @@ checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" [[package]] name = "hex" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hkdf" @@ -2177,7 +2167,7 @@ checksum = "7a13f4163aa0c5ca1be584aace0e2212b2e41be5478218d4f657f5f778b2ae2a" dependencies = [ "crypto-mac 0.4.0", "digest 0.6.2", - "generic-array 0.8.3", + "generic-array 0.8.4", ] [[package]] @@ -2209,8 +2199,8 @@ dependencies = [ "mac", "markup5ever", "proc-macro2", - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", ] [[package]] @@ -2253,9 +2243,9 @@ dependencies = [ [[package]] name = "http-client" -version = "6.3.3" +version = "6.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "663563ebc56b0bac7e08722cca7742612fd99d9bd6d05cf904ed9d9212065a34" +checksum = "98c12a6a451357392f3307325e9a15cbd27451abdaad96e74c30ea8786f615c4" dependencies = [ "async-std", "async-trait", @@ -2263,7 +2253,7 @@ dependencies = [ "dashmap", "futures-util", "http-types", - "hyper 0.13.9", + "hyper 0.13.10", "hyper-tls", "isahc 0.9.14", "log 0.4.14", @@ -2283,9 +2273,9 @@ dependencies = [ "futures-lite", "http 0.2.3", "infer", - "pin-project-lite 0.2.4", + "pin-project-lite 0.2.6", "rand 0.7.3", - "serde 1.0.123", + "serde 1.0.124", "serde_json", "serde_qs", "serde_urlencoded 0.7.0", @@ -2294,9 +2284,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.3.4" +version = "1.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" +checksum = "615caabe2c3160b313d52ccc905335f4ed5f10881dd63dc5699d47e90be85691" [[package]] name = "httpdate" @@ -2321,7 +2311,7 @@ checksum = "34a590ca09d341e94cddf8e5af0bbccde205d5fbc2fa3c09dd67c7f85cea59d7" dependencies = [ "base64 0.9.3", "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "futures-cpupool", "httparse", "iovec", @@ -2331,7 +2321,7 @@ dependencies = [ "net2", "percent-encoding 1.0.1", "relay", - "time 0.1.43", + "time 0.1.44", "tokio-core", "tokio-io", "tokio-proto", @@ -2342,9 +2332,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.13.9" +version = "0.13.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf" +checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" dependencies = [ "bytes 0.5.6", "futures-channel", @@ -2356,9 +2346,9 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project 1.0.4", + "pin-project 1.0.5", "socket2", - "tokio 0.2.24", + "tokio 0.2.25", "tower-service", "tracing", "want 0.3.0", @@ -2371,9 +2361,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" dependencies = [ "bytes 0.5.6", - "hyper 0.13.9", + "hyper 0.13.10", "native-tls", - "tokio 0.2.24", + "tokio 0.2.25", "tokio-tls", ] @@ -2394,15 +2384,15 @@ checksum = "ea685d38f1becb4f0a04e6cbff9256c6c2cd5e5905563b251401d1c13d12c654" dependencies = [ "async-std", "cfg-if 0.1.10", - "futures 0.3.12", + "futures 0.3.13", "thiserror", ] [[package]] name = "idna" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" +checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21" dependencies = [ "matches", "unicode-bidi", @@ -2425,9 +2415,9 @@ dependencies = [ [[package]] name = "image" -version = "0.23.13" +version = "0.23.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "293f07a1875fa7e9c5897b51aa68b2d8ed8271b87e1a44cb64b9c3d98aabbc0d" +checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" dependencies = [ "bytemuck", "byteorder", @@ -2441,13 +2431,13 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.6.1" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b" +checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" dependencies = [ "autocfg", "hashbrown", - "serde 1.0.123", + "serde 1.0.124", ] [[package]] @@ -2516,7 +2506,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2948a0ce43e2c2ef11d7edf6816508998d99e13badd1150be0914205df9388a" dependencies = [ "bytes 0.5.6", - "crossbeam-utils 0.8.1", + "crossbeam-utils 0.8.3", "curl", "curl-sys", "flume", @@ -2558,18 +2548,15 @@ dependencies = [ [[package]] name = "jpeg-decoder" -version = "0.1.20" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc797adac5f083b8ff0ca6f6294a999393d76e197c36488e2ef732c4715f6fa3" -dependencies = [ - "byteorder", -] +checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" [[package]] name = "js-sys" -version = "0.3.46" +version = "0.3.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175" +checksum = "dc9f84f9b115ce7843d60706df1422a916680bfdfcbdb0447c5614ff9d7e4d78" dependencies = [ "wasm-bindgen", ] @@ -2619,28 +2606,28 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "lexical-core" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616" +checksum = "21f866863575d0e1d654fbeeabdc927292fdf862873dc3c96c6f753357e13374" dependencies = [ "arrayvec 0.5.2", "bitflags", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "ryu", "static_assertions", ] [[package]] name = "libc" -version = "0.2.82" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929" +checksum = "03b07a082330a35e43f63177cc01689da34fbffa0105e1246cf0311472cac73a" [[package]] name = "libgit2-sys" -version = "0.12.17+1.1.0" +version = "0.12.18+1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ebdf65ca745126df8824688637aa0535a88900b83362d8ca63893bcf4e8841" +checksum = "3da6a42da88fc37ee1ecda212ffa254c25713532980005d5f7c0b0fbe7e6e885" dependencies = [ "cc", "libc", @@ -2650,9 +2637,9 @@ dependencies = [ [[package]] name = "libnghttp2-sys" -version = "0.1.5+1.42.0" +version = "0.1.6+1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9657455ff47889b70ffd37c3e118e8cdd23fd1f9f3293a285f141070621c4c79" +checksum = "0af55541a8827e138d59ec9e5877fb6095ece63fb6f4da45e7491b4fbd262855" dependencies = [ "cc", "libc", @@ -2706,8 +2693,8 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" dependencies = [ - "serde 1.0.123", - "serde_test 1.0.123", + "serde 1.0.124", + "serde_test 1.0.124", ] [[package]] @@ -2771,7 +2758,7 @@ dependencies = [ "log 0.4.14", "phf", "phf_codegen", - "serde 1.0.123", + "serde 1.0.124", "serde_derive", "serde_json", "string_cache", @@ -2864,9 +2851,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" dependencies = [ "adler", "autocfg", @@ -2905,9 +2892,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.7" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e50ae3f04d169fcc9bde0b547d1c205219b7157e07ded9c5aff03e0637cb3ed7" +checksum = "a5dede4e2065b3842b8b0af444119f3aa331cc7cc2dd20388bfb0f5d5a38823a" dependencies = [ "libc", "log 0.4.14", @@ -2969,12 +2956,12 @@ dependencies = [ [[package]] name = "nb-connect" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8123a81538e457d44b933a02faf885d3fe8408806b23fa700e8f01c6c3a98998" +checksum = "670361df1bc2399ee1ff50406a0d422587dd3bb0da596e1978fe8e05dabddf4f" dependencies = [ "libc", - "winapi 0.3.9", + "socket2", ] [[package]] @@ -2986,7 +2973,7 @@ dependencies = [ "bincode", "cfg-if 0.1.10", "log 0.4.14", - "serde 1.0.123", + "serde 1.0.124", "serde_derive", "wasm-bindgen", ] @@ -3045,6 +3032,18 @@ dependencies = [ "libc", ] +[[package]] +name = "nix" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" +dependencies = [ + "bitflags", + "cc", + "cfg-if 1.0.0", + "libc", +] + [[package]] name = "nodrop" version = "0.1.14" @@ -3084,7 +3083,7 @@ dependencies = [ "clap", "ctrlc", "dunce", - "futures 0.3.12", + "futures 0.3.13", "itertools", "log 0.4.14", "nu-cli", @@ -3126,7 +3125,7 @@ version = "0.28.0" dependencies = [ "doc-comment", "regex 1.4.3", - "serde 1.0.123", + "serde 1.0.124", "serde_json", "winapi 0.3.9", ] @@ -3159,7 +3158,7 @@ dependencies = [ "encoding_rs", "filesize", "fs_extra", - "futures 0.3.12", + "futures 0.3.13", "futures-util", "futures_codec", "getset", @@ -3186,7 +3185,7 @@ dependencies = [ "nu-table", "nu-test-support", "nu-value-ext", - "num-bigint 0.3.1", + "num-bigint 0.3.2", "num-format", "num-traits 0.2.14", "parking_lot 0.11.1", @@ -3204,7 +3203,7 @@ dependencies = [ "rusqlite", "rust-embed", "rustyline 6.3.0", - "serde 1.0.123", + "serde 1.0.124", "serde_bytes", "serde_ini", "serde_json", @@ -3261,7 +3260,7 @@ dependencies = [ "encoding_rs", "filesize", "fs_extra", - "futures 0.3.12", + "futures 0.3.13", "futures-util", "futures_codec", "getset", @@ -3288,7 +3287,7 @@ dependencies = [ "nu-table", "nu-test-support", "nu-value-ext", - "num-bigint 0.3.1", + "num-bigint 0.3.2", "num-format", "num-traits 0.2.14", "parking_lot 0.11.1", @@ -3306,7 +3305,7 @@ dependencies = [ "rusqlite", "rust-embed", "rustyline 7.1.0", - "serde 1.0.123", + "serde 1.0.124", "serde_bytes", "serde_ini", "serde_json", @@ -3354,11 +3353,11 @@ dependencies = [ "nu-table", "nu-test-support", "nu-value-ext", - "num-bigint 0.3.1", + "num-bigint 0.3.2", "num-format", "num-traits 0.2.14", "query_interface", - "serde 1.0.123", + "serde 1.0.124", "toml", "users", ] @@ -3370,13 +3369,14 @@ dependencies = [ "async-recursion", "async-trait", "bytes 0.5.6", + "codespan-reporting", "derive-new", "dirs-next 2.0.0", "dunce", "encoding_rs", "filesize", "fs_extra", - "futures 0.3.12", + "futures 0.3.13", "futures-util", "futures_codec", "getset", @@ -3396,7 +3396,7 @@ dependencies = [ "nu-value-ext", "parking_lot 0.11.1", "rayon", - "serde 1.0.123", + "serde 1.0.124", "serde_json", "tempfile", "term_size", @@ -3404,6 +3404,7 @@ dependencies = [ "trash", "umask", "users", + "which", ] [[package]] @@ -3417,9 +3418,9 @@ dependencies = [ "glob", "nu-ansi-term", "nu-source", - "num-bigint 0.3.1", + "num-bigint 0.3.2", "num-traits 0.2.14", - "serde 1.0.123", + "serde 1.0.124", "serde_json", "serde_yaml", "toml", @@ -3435,7 +3436,7 @@ dependencies = [ "nu-test-support", "num-traits 0.2.14", "regex 1.4.3", - "serde 1.0.123", + "serde 1.0.124", "serde_json", ] @@ -3455,9 +3456,9 @@ dependencies = [ "nu-protocol", "nu-source", "nu-test-support", - "num-bigint 0.3.1", + "num-bigint 0.3.2", "num-traits 0.2.14", - "serde 1.0.123", + "serde 1.0.124", "shellexpand", "smart-default", ] @@ -3473,8 +3474,8 @@ dependencies = [ "nu-source", "nu-test-support", "nu-value-ext", - "num-bigint 0.3.1", - "serde 1.0.123", + "num-bigint 0.3.2", + "serde 1.0.124", "serde_json", ] @@ -3491,10 +3492,10 @@ dependencies = [ "log 0.4.14", "nu-errors", "nu-source", - "num-bigint 0.3.1", + "num-bigint 0.3.2", "num-integer", "num-traits 0.2.14", - "serde 1.0.123", + "serde 1.0.124", "serde_bytes", "serde_json", "serde_yaml", @@ -3508,7 +3509,7 @@ dependencies = [ "derive-new", "getset", "pretty", - "serde 1.0.123", + "serde 1.0.124", "termcolor", ] @@ -3516,7 +3517,7 @@ dependencies = [ name = "nu-stream" version = "0.28.0" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "nu-errors", "nu-protocol", "nu-source", @@ -3545,7 +3546,7 @@ dependencies = [ "nu-protocol", "nu-source", "nu-value-ext", - "num-bigint 0.3.1", + "num-bigint 0.3.2", "tempfile", ] @@ -3597,7 +3598,7 @@ name = "nu_plugin_fetch" version = "0.28.0" dependencies = [ "base64 0.13.0", - "futures 0.3.12", + "futures 0.3.13", "mime", "nu-errors", "nu-plugin", @@ -3665,7 +3666,7 @@ name = "nu_plugin_post" version = "0.28.0" dependencies = [ "base64 0.13.0", - "futures 0.3.12", + "futures 0.3.13", "nu-errors", "nu-plugin", "nu-protocol", @@ -3680,13 +3681,13 @@ dependencies = [ name = "nu_plugin_ps" version = "0.28.0" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "futures-timer", "nu-errors", "nu-plugin", "nu-protocol", "nu-source", - "num-bigint 0.3.1", + "num-bigint 0.3.2", "sysinfo", ] @@ -3694,7 +3695,7 @@ dependencies = [ name = "nu_plugin_s3" version = "0.28.0" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "nu-errors", "nu-plugin", "nu-protocol", @@ -3731,13 +3732,13 @@ dependencies = [ name = "nu_plugin_sys" version = "0.28.0" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "futures-util", "nu-errors", "nu-plugin", "nu-protocol", "nu-source", - "num-bigint 0.3.1", + "num-bigint 0.3.2", "sysinfo", ] @@ -3773,7 +3774,7 @@ dependencies = [ name = "nu_plugin_to_sqlite" version = "0.28.0" dependencies = [ - "hex 0.4.2", + "hex 0.4.3", "nu-errors", "nu-plugin", "nu-protocol", @@ -3838,14 +3839,14 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf" +checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba" dependencies = [ "autocfg", "num-integer", "num-traits 0.2.14", - "serde 1.0.123", + "serde 1.0.124", ] [[package]] @@ -3972,15 +3973,15 @@ dependencies = [ [[package]] name = "object" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" +checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" [[package]] name = "once_cell" -version = "1.5.2" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" +checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" [[package]] name = "onig" @@ -4012,10 +4013,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "open" -version = "1.4.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c283bf0114efea9e42f1a60edea9859e8c47528eae09d01df4b29c1e489cc48" +checksum = "b2033f93630dd4b04768ecf5e16bcd3002a89e1e1dbef375bf290dd67e2b7a4d" dependencies = [ + "which", "winapi 0.3.9", ] @@ -4086,7 +4088,7 @@ checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" dependencies = [ "instant", "lock_api 0.4.2", - "parking_lot_core 0.8.2", + "parking_lot_core 0.8.3", ] [[package]] @@ -4106,14 +4108,14 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272" +checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall 0.1.57", + "redox_syscall 0.2.5", "smallvec 1.6.1", "winapi 0.3.9", ] @@ -4129,9 +4131,9 @@ dependencies = [ [[package]] name = "path_abs" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb6b8e6dede0bf94e9300e669f335ba92d5fc9fc8be7f4b1ca8a05206489388c" +checksum = "05ef02f6342ac01d8a93b65f96db53fe68a92a15f41144f97fb00a9e669633c3" dependencies = [ "std_prelude", ] @@ -4214,8 +4216,8 @@ dependencies = [ "phf_shared", "proc-macro-hack", "proc-macro2", - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", ] [[package]] @@ -4238,11 +4240,11 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b70b68509f17aa2857863b6fa00bf21fc93674c7a8893de2f469f6aa7ca2f2" +checksum = "96fa8ebb90271c4477f144354485b8068bd8f6b78b428b01ba892ca26caf0b63" dependencies = [ - "pin-project-internal 1.0.4", + "pin-project-internal 1.0.5", ] [[package]] @@ -4252,32 +4254,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" dependencies = [ "proc-macro2", - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", ] [[package]] name = "pin-project-internal" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caa25a6393f22ce819b0f50e0be89287292fda8d425be38ee0ca14c4931d9e71" +checksum = "758669ae3558c6f74bd2a18b41f7ac0b5a195aea6639d6a9b5e5d1ad5ba24c0b" dependencies = [ "proc-macro2", - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", ] [[package]] name = "pin-project-lite" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" +checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827" +checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" [[package]] name = "pin-utils" @@ -4293,15 +4295,15 @@ checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" [[package]] name = "plist" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b336d94e8e4ce29bf15bba393164629764744c567e8ad306cc1fdd0119967fd" +checksum = "679104537029ed2287c216bfb942bbf723f48ee98f0aef15611634173a74ef21" dependencies = [ - "base64 0.12.3", + "base64 0.13.0", "chrono", "indexmap", "line-wrap", - "serde 1.0.123", + "serde 1.0.124", "xml-rs", ] @@ -4398,8 +4400,8 @@ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", "proc-macro2", - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", "version_check", ] @@ -4410,7 +4412,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2", - "quote 1.0.8", + "quote 1.0.9", "version_check", ] @@ -4446,7 +4448,7 @@ dependencies = [ "config", "directories", "petgraph", - "serde 1.0.123", + "serde 1.0.124", "serde-value", "tint", ] @@ -4500,7 +4502,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" dependencies = [ - "env_logger 0.8.2", + "env_logger 0.8.3", "log 0.4.14", "rand 0.8.3", ] @@ -4512,8 +4514,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" dependencies = [ "proc-macro2", - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", ] [[package]] @@ -4524,9 +4526,9 @@ checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" [[package]] name = "quote" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" dependencies = [ "proc-macro2", ] @@ -4576,7 +4578,7 @@ checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" dependencies = [ "libc", "rand_chacha 0.3.0", - "rand_core 0.6.1", + "rand_core 0.6.2", "rand_hc 0.3.0", ] @@ -4597,7 +4599,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" dependencies = [ "ppv-lite86", - "rand_core 0.6.1", + "rand_core 0.6.2", ] [[package]] @@ -4626,9 +4628,9 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5" +checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" dependencies = [ "getrandom 0.2.2", ] @@ -4648,7 +4650,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" dependencies = [ - "rand_core 0.6.1", + "rand_core 0.6.2", ] [[package]] @@ -4692,7 +4694,7 @@ checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" dependencies = [ "crossbeam-channel 0.5.0", "crossbeam-deque 0.8.0", - "crossbeam-utils 0.8.1", + "crossbeam-utils 0.8.3", "lazy_static 1.4.0", "num_cpus", ] @@ -4720,9 +4722,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "redox_syscall" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570" +checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" dependencies = [ "bitflags", ] @@ -4745,7 +4747,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" dependencies = [ "getrandom 0.2.2", - "redox_syscall 0.2.4", + "redox_syscall 0.2.5", ] [[package]] @@ -4770,7 +4772,7 @@ dependencies = [ "aho-corasick 0.7.15", "memchr", "regex-syntax 0.6.22", - "thread_local 1.1.0", + "thread_local 1.1.3", ] [[package]] @@ -4803,7 +4805,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1576e382688d7e9deecea24417e350d3062d97e32e45d70b1cde65994ff1489a" dependencies = [ - "futures 0.1.30", + "futures 0.1.31", ] [[package]] @@ -4828,7 +4830,7 @@ dependencies = [ "futures-util", "http 0.2.3", "http-body", - "hyper 0.13.9", + "hyper 0.13.10", "hyper-tls", "ipnet", "js-sys", @@ -4838,14 +4840,14 @@ dependencies = [ "mime_guess", "native-tls", "percent-encoding 2.1.0", - "pin-project-lite 0.2.4", - "serde 1.0.123", + "pin-project-lite 0.2.6", + "serde 1.0.124", "serde_urlencoded 0.7.0", - "tokio 0.2.24", + "tokio 0.2.25", "tokio-tls", "url", "wasm-bindgen", - "wasm-bindgen-futures 0.4.19", + "wasm-bindgen-futures 0.4.21", "web-sys", "winreg", ] @@ -4889,7 +4891,7 @@ dependencies = [ "base64 0.13.0", "blake2b_simd", "constant_time_eq", - "crossbeam-utils 0.8.1", + "crossbeam-utils 0.8.3", ] [[package]] @@ -4902,7 +4904,7 @@ dependencies = [ "libc", "rand 0.3.23", "rustc-serialize", - "time 0.1.43", + "time 0.1.44", ] [[package]] @@ -4923,9 +4925,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ed91c41c42ef7bf687384439c312e75e0da9c149b0390889b94de3c7d9d9e66" dependencies = [ "proc-macro2", - "quote 1.0.8", + "quote 1.0.9", "rust-embed-utils", - "syn 1.0.60", + "syn 1.0.62", "walkdir", ] @@ -4953,7 +4955,7 @@ dependencies = [ "byteorder", "lazy_static 1.4.0", "num", - "serde 1.0.123", + "serde 1.0.124", ] [[package]] @@ -5031,9 +5033,9 @@ checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" [[package]] name = "s3handler" -version = "0.6.3" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f740eb9bed00c3c12d4c0595be1771262b5071154291f1483ff44a02b8a36cf4" +checksum = "f85783c5deef12e88b1aa43f450678c1a488e55025a99a19c875d0f46d6d317f" dependencies = [ "async-trait", "base64 0.6.0", @@ -5043,7 +5045,7 @@ dependencies = [ "dyn-clone", "failure", "failure_derive", - "futures 0.3.12", + "futures 0.3.13", "hmac 0.4.2", "hmac-sha1", "http 0.2.3", @@ -5056,11 +5058,11 @@ dependencies = [ "reqwest", "rust-crypto", "rustc-serialize", - "serde 1.0.123", + "serde 1.0.124", "serde_derive", "serde_json", "sha2 0.6.0", - "tokio 0.2.24", + "tokio 0.2.25", "url", ] @@ -5109,9 +5111,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "security-framework" -version = "2.0.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1759c2e3c8580017a484a7ac56d3abc5a6c1feadf88db2f3633f12ae4268c69" +checksum = "d493c5f39e02dfb062cd8f33301f90f9b13b650e8c1b1d0fd75c19dd64bff69d" dependencies = [ "bitflags", "core-foundation", @@ -5122,9 +5124,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b" +checksum = "dee48cdde5ed250b0d3252818f646e174ab414036edb884dde62d80a3ac6082d" dependencies = [ "core-foundation-sys", "libc", @@ -5191,9 +5193,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" [[package]] name = "serde" -version = "1.0.123" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" +checksum = "bd761ff957cb2a45fbb9ab3da6512de9de55872866160b23c25f1a841e99d29f" dependencies = [ "serde_derive", ] @@ -5218,7 +5220,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a65a7291a8a568adcae4c10a677ebcedbc6c9cec91c054dee2ce40b0e3290eb" dependencies = [ "ordered-float", - "serde 1.0.123", + "serde 1.0.124", ] [[package]] @@ -5227,18 +5229,18 @@ version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16ae07dd2f88a366f15bd0632ba725227018c69a1c8550a927324f8eb8368bb9" dependencies = [ - "serde 1.0.123", + "serde 1.0.124", ] [[package]] name = "serde_derive" -version = "1.0.123" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" +checksum = "1800f7693e94e186f5e25a28291ae1570da908aff7d97a095dec1e56ff99069b" dependencies = [ "proc-macro2", - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", ] [[package]] @@ -5248,20 +5250,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb236687e2bb073a7521c021949be944641e671b8505a94069ca37b656c81139" dependencies = [ "result", - "serde 1.0.123", + "serde 1.0.124", "void", ] [[package]] name = "serde_json" -version = "1.0.61" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a" +checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" dependencies = [ "indexmap", "itoa", "ryu", - "serde 1.0.123", + "serde 1.0.124", ] [[package]] @@ -5272,7 +5274,7 @@ checksum = "5af82de3c6549b001bec34961ff2d6a54339a87bab37ce901b693401f27de6cb" dependencies = [ "data-encoding", "percent-encoding 2.1.0", - "serde 1.0.123", + "serde 1.0.124", "thiserror", ] @@ -5287,11 +5289,11 @@ dependencies = [ [[package]] name = "serde_test" -version = "1.0.123" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38145a8510bdf71d9a8cceeb57664049538446e77f24648328bdbcf22dc7e169" +checksum = "61c59238fc0762e8aee0c6ec5f1a2e61d580d94f6274b9fcc91dc51d03fb40ba" dependencies = [ - "serde 1.0.123", + "serde 1.0.124", ] [[package]] @@ -5302,7 +5304,7 @@ checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" dependencies = [ "dtoa", "itoa", - "serde 1.0.123", + "serde 1.0.124", "url", ] @@ -5315,18 +5317,18 @@ dependencies = [ "form_urlencoded", "itoa", "ryu", - "serde 1.0.123", + "serde 1.0.124", ] [[package]] name = "serde_yaml" -version = "0.8.16" +version = "0.8.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdd2af560da3c1fdc02cb80965289254fc35dff869810061e2d8290ee48848ae" +checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23" dependencies = [ "dtoa", "linked-hash-map 0.5.4", - "serde 1.0.123", + "serde 1.0.124", "yaml-rust", ] @@ -5348,8 +5350,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2acd6defeddb41eb60bb468f8825d0cfd0c2a76bc03bfd235b6a1dc4f6a1ad5" dependencies = [ "proc-macro2", - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", ] [[package]] @@ -5384,7 +5386,7 @@ dependencies = [ "byte-tools", "digest 0.6.2", "fake-simd", - "generic-array 0.8.3", + "generic-array 0.8.4", ] [[package]] @@ -5402,9 +5404,9 @@ dependencies = [ [[package]] name = "shadow-rs" -version = "0.5.23" +version = "0.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb054640a4d209cbfcc56fa1d9f4a229d4aef3f9da130e7f5698aba36db1c6ce" +checksum = "c2d24431d84176415baccf1a5f4996365fbe619ed0797131d84627f00f568de2" dependencies = [ "chrono", "git2", @@ -5432,7 +5434,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729" dependencies = [ "libc", - "mio 0.7.7", + "mio 0.7.9", "signal-hook-registry", ] @@ -5513,8 +5515,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6" dependencies = [ "proc-macro2", - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", ] [[package]] @@ -5585,10 +5587,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" dependencies = [ "proc-macro2", - "quote 1.0.8", - "serde 1.0.123", + "quote 1.0.9", + "serde 1.0.124", "serde_derive", - "syn 1.0.60", + "syn 1.0.62", ] [[package]] @@ -5599,12 +5601,12 @@ checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" dependencies = [ "base-x", "proc-macro2", - "quote 1.0.8", - "serde 1.0.123", + "quote 1.0.9", + "serde 1.0.124", "serde_derive", "serde_json", "sha1 0.6.0", - "syn 1.0.60", + "syn 1.0.62", ] [[package]] @@ -5629,7 +5631,7 @@ dependencies = [ "new_debug_unreachable", "phf_shared", "precomputed-hash", - "serde 1.0.123", + "serde 1.0.124", ] [[package]] @@ -5641,7 +5643,7 @@ dependencies = [ "phf_generator", "phf_shared", "proc-macro2", - "quote 1.0.8", + "quote 1.0.9", ] [[package]] @@ -5678,7 +5680,7 @@ dependencies = [ "log 0.4.14", "mime", "mime_guess", - "serde 1.0.123", + "serde 1.0.124", "serde_json", "serde_urlencoded 0.6.1", "url", @@ -5703,8 +5705,8 @@ dependencies = [ "log 0.4.14", "mime_guess", "once_cell", - "pin-project-lite 0.2.4", - "serde 1.0.123", + "pin-project-lite 0.2.6", + "serde 1.0.124", "serde_json", "web-sys", ] @@ -5743,12 +5745,12 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.60" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" +checksum = "123a78a3596b24fee53a6464ce52d8ecbf62241e6294c7e7fe12086cd161f512" dependencies = [ "proc-macro2", - "quote 1.0.8", + "quote 1.0.9", "unicode-xid 0.2.1", ] @@ -5768,8 +5770,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" dependencies = [ "proc-macro2", - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", "unicode-xid 0.2.1", ] @@ -5789,7 +5791,7 @@ dependencies = [ "onig", "plist", "regex-syntax 0.6.22", - "serde 1.0.123", + "serde 1.0.124", "serde_derive", "serde_json", "walkdir", @@ -5798,11 +5800,10 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.16.1" +version = "0.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c14e2f7068e99d8d3e3580787ffc6c7d21ad90393ff5e54523435197ccb43e6" +checksum = "6c280c91abd1aed2e36be1bc8f56fbc7a2acbb2b58fbcac9641510179cc72dd9" dependencies = [ - "cc", "cfg-if 1.0.0", "core-foundation-sys", "doc-comment", @@ -5828,7 +5829,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "rand 0.8.3", - "redox_syscall 0.2.4", + "redox_syscall 0.2.5", "remove_dir_all", "winapi 0.3.9", ] @@ -5902,22 +5903,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146" +checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1" +checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" dependencies = [ "proc-macro2", - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", ] [[package]] @@ -5931,11 +5932,11 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb9bc092d0d51e76b2b19d9d85534ffc9ec2db959a2523cdae0697e2972cd447" +checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" dependencies = [ - "lazy_static 1.4.0", + "once_cell", ] [[package]] @@ -5945,17 +5946,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a53f4706d65497df0c4349241deddf35f84cee19c87ed86ea8ca590f4464437" dependencies = [ "jpeg-decoder", - "miniz_oxide 0.4.3", + "miniz_oxide 0.4.4", "weezl", ] [[package]] name = "time" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", + "wasi 0.10.0+wasi-snapshot-preview1", "winapi 0.3.9", ] @@ -5992,9 +5994,9 @@ checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa" dependencies = [ "proc-macro-hack", "proc-macro2", - "quote 1.0.8", + "quote 1.0.9", "standback", - "syn 1.0.60", + "syn 1.0.62", ] [[package]] @@ -6008,9 +6010,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f" +checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023" dependencies = [ "tinyvec_macros", ] @@ -6038,7 +6040,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "mio 0.6.23", "num_cpus", "tokio-codec", @@ -6057,9 +6059,9 @@ dependencies = [ [[package]] name = "tokio" -version = "0.2.24" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48" +checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" dependencies = [ "bytes 0.5.6", "fnv", @@ -6069,7 +6071,7 @@ dependencies = [ "memchr", "mio 0.6.23", "num_cpus", - "pin-project-lite 0.1.11", + "pin-project-lite 0.1.12", "slab 0.4.2", "tokio-macros", ] @@ -6081,7 +6083,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "tokio-io", ] @@ -6092,7 +6094,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87b1395334443abca552f63d4f61d0486f12377c2ba8b368e523f89e828cffd4" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "iovec", "log 0.4.14", "mio 0.6.23", @@ -6110,7 +6112,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e" dependencies = [ - "futures 0.1.30", + "futures 0.1.31", "tokio-executor", ] @@ -6121,7 +6123,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" dependencies = [ "crossbeam-utils 0.7.2", - "futures 0.1.30", + "futures 0.1.31", ] [[package]] @@ -6130,7 +6132,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4" dependencies = [ - "futures 0.1.30", + "futures 0.1.31", "tokio-io", "tokio-threadpool", ] @@ -6142,7 +6144,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "log 0.4.14", ] @@ -6153,8 +6155,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" dependencies = [ "proc-macro2", - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", ] [[package]] @@ -6163,7 +6165,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fbb47ae81353c63c487030659494b295f6cb6576242f907f203473b191b0389" dependencies = [ - "futures 0.1.30", + "futures 0.1.31", "log 0.3.9", "net2", "rand 0.3.23", @@ -6182,7 +6184,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" dependencies = [ "crossbeam-utils 0.7.2", - "futures 0.1.30", + "futures 0.1.31", "lazy_static 1.4.0", "log 0.4.14", "mio 0.6.23", @@ -6200,7 +6202,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162" dependencies = [ - "futures 0.1.30", + "futures 0.1.31", ] [[package]] @@ -6210,7 +6212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" dependencies = [ "fnv", - "futures 0.1.30", + "futures 0.1.31", ] [[package]] @@ -6220,7 +6222,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "iovec", "mio 0.6.23", "tokio-io", @@ -6236,7 +6238,7 @@ dependencies = [ "crossbeam-deque 0.7.3", "crossbeam-queue", "crossbeam-utils 0.7.2", - "futures 0.1.30", + "futures 0.1.31", "lazy_static 1.4.0", "log 0.4.14", "num_cpus", @@ -6251,7 +6253,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" dependencies = [ "crossbeam-utils 0.7.2", - "futures 0.1.30", + "futures 0.1.31", "slab 0.4.2", "tokio-executor", ] @@ -6263,7 +6265,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio 0.2.24", + "tokio 0.2.25", ] [[package]] @@ -6273,7 +6275,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "log 0.4.14", "mio 0.6.23", "tokio-codec", @@ -6288,7 +6290,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "iovec", "libc", "log 0.4.14", @@ -6309,8 +6311,8 @@ dependencies = [ "futures-core", "futures-sink", "log 0.4.14", - "pin-project-lite 0.1.11", - "tokio 0.2.24", + "pin-project-lite 0.1.12", + "tokio 0.2.25", ] [[package]] @@ -6319,24 +6321,24 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" dependencies = [ - "serde 1.0.123", + "serde 1.0.124", ] [[package]] name = "tower-service" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" +checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.22" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3" +checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f" dependencies = [ "cfg-if 1.0.0", "log 0.4.14", - "pin-project-lite 0.2.4", + "pin-project-lite 0.2.6", "tracing-attributes", "tracing-core", ] @@ -6348,8 +6350,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8a9bd1db7706f2373a190b0d067146caa39350c486f3d455b0e33b431f94c07" dependencies = [ "proc-macro2", - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", ] [[package]] @@ -6363,11 +6365,11 @@ dependencies = [ [[package]] name = "tracing-futures" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project 0.4.27", + "pin-project 1.0.5", "tracing", ] @@ -6455,9 +6457,9 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606" +checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" dependencies = [ "tinyvec", ] @@ -6506,7 +6508,7 @@ dependencies = [ "idna", "matches", "percent-encoding 2.1.0", - "serde 1.0.123", + "serde 1.0.124", ] [[package]] @@ -6639,7 +6641,7 @@ version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a05d9d966753fa4b5c8db73fcab5eed4549cfe0e1e4e66911e5564a0085c35d1" dependencies = [ - "futures 0.1.30", + "futures 0.1.31", "log 0.4.14", "try-lock 0.1.0", ] @@ -6662,34 +6664,34 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.10.1+wasi-snapshot-preview1" +version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93c6c3420963c5c64bca373b25e77acb562081b9bb4dd5bb864187742186cea9" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" -version = "0.2.69" +version = "0.2.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e" +checksum = "7ee1280240b7c461d6a0071313e08f34a60b0365f14260362e5a2b17d1d31aa7" dependencies = [ "cfg-if 1.0.0", - "serde 1.0.123", + "serde 1.0.124", "serde_json", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.69" +version = "0.2.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62" +checksum = "5b7d8b6942b8bb3a9b0e73fc79b98095a27de6fa247615e59d096754a3bc2aa8" dependencies = [ "bumpalo", "lazy_static 1.4.0", "log 0.4.14", "proc-macro2", - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", "wasm-bindgen-shared", ] @@ -6700,7 +6702,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83420b37346c311b9ed822af41ec2e82839bfe99867ec6c54e2da43b7538771c" dependencies = [ "cfg-if 0.1.10", - "futures 0.1.30", + "futures 0.1.31", "futures-channel-preview", "futures-util-preview", "js-sys", @@ -6711,9 +6713,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.19" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35" +checksum = "8e67a5806118af01f0d9045915676b22aaebecf4178ae7021bc171dab0b897ab" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -6723,38 +6725,38 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.69" +version = "0.2.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084" +checksum = "e5ac38da8ef716661f0f36c0d8320b89028efe10c7c0afde65baffb496ce0d3b" dependencies = [ - "quote 1.0.8", + "quote 1.0.9", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.69" +version = "0.2.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549" +checksum = "cc053ec74d454df287b9374ee8abb36ffd5acb95ba87da3ba5b7d3fe20eb401e" dependencies = [ "proc-macro2", - "quote 1.0.8", - "syn 1.0.60", + "quote 1.0.9", + "syn 1.0.62", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.69" +version = "0.2.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158" +checksum = "7d6f8ec44822dd71f5f221a5847fb34acd9060535c1211b70a05844c0f6383b1" [[package]] name = "web-sys" -version = "0.3.46" +version = "0.3.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3" +checksum = "ec600b26223b2948cedfde2a0aa6756dcf1fef616f43d7b3097aaf53a6c4d92b" dependencies = [ "js-sys", "wasm-bindgen", @@ -6762,9 +6764,9 @@ dependencies = [ [[package]] name = "weezl" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2bb9fc8309084dd7cd651336673844c1d47f8ef6d2091ec160b27f5c4aa277" +checksum = "4a32b378380f4e9869b22f0b5177c68a5519f03b3454fde0b291455ddbae266c" [[package]] name = "wepoll-sys" @@ -6899,14 +6901,14 @@ dependencies = [ [[package]] name = "zip" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2896475a242c41366941faa27264df2cb935185a92e059a004d0048feb2ac5" +checksum = "8264fcea9b7a036a4a5103d7153e988dbc2ebbafb34f68a3c2d404b6b82d74b6" dependencies = [ "byteorder", "bzip2", "crc32fast", "flate2", "thiserror", - "time 0.1.43", + "time 0.1.44", ] diff --git a/Cargo.toml b/Cargo.toml index 2b1e8ea97d..6550a387f8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -84,6 +84,7 @@ which-support = [ "nu-cli/which", "nu-command/ichwh", "nu-command/which", + "nu-engine/which" ] default = [ diff --git a/crates/nu-cli/src/cli.rs b/crates/nu-cli/src/cli.rs index 121e01e7d7..c34fb521d2 100644 --- a/crates/nu-cli/src/cli.rs +++ b/crates/nu-cli/src/cli.rs @@ -1,12 +1,11 @@ use crate::line_editor::configure_ctrl_c; use nu_command::commands::default_context::create_default_context; -#[allow(unused_imports)] -use nu_command::maybe_print_errors; -use nu_engine::run_block; -use nu_engine::EvaluationContext; +use nu_engine::{ + print::maybe_print_errors, run_block, script::run_script_standalone, EvaluationContext, +}; #[allow(unused_imports)] -pub(crate) use nu_command::script::{process_script, LineResult}; +pub(crate) use nu_engine::script::{process_script, LineResult}; #[cfg(feature = "rustyline-support")] use crate::line_editor::{ @@ -21,8 +20,6 @@ use nu_stream::InputStream; #[allow(unused_imports)] use std::sync::atomic::Ordering; -use nu_command::script::{print_err, run_script_standalone}; - #[cfg(feature = "rustyline-support")] use rustyline::{self, error::ReadlineError}; @@ -79,7 +76,7 @@ pub async fn run_script_file( syncer.sync_path_vars(ctx); if let Err(reason) = syncer.autoenv(ctx) { - print_err(reason, &Text::from(""), ctx); + ctx.host.lock().print_err(reason, &Text::from("")); } let _ = register_plugins(ctx); @@ -107,7 +104,7 @@ pub async fn cli(mut context: EvaluationContext) -> Result<(), Box> { syncer.sync_path_vars(ctx); if let Err(reason) = syncer.autoenv(ctx) { - print_err(reason, &Text::from(""), ctx); + ctx.host.lock().print_err(reason, &Text::from("")); } let _ = configure_ctrl_c(ctx); @@ -199,14 +196,14 @@ pub async fn cli(mut context: EvaluationContext) -> Result<(), Box> { } } Err(e) => { - crate::cli::print_err(e, &Text::from(prompt_line), &context); + context.host.lock().print_err(e, &Text::from(prompt_line)); context.clear_errors(); "> ".to_string() } }, Err(e) => { - crate::cli::print_err(e, &Text::from(prompt_line), &context); + context.host.lock().print_err(e, &Text::from(prompt_line)); context.clear_errors(); "> ".to_string() @@ -274,7 +271,7 @@ pub async fn cli(mut context: EvaluationContext) -> Result<(), Box> { } if let Err(reason) = syncer.autoenv(ctx) { - print_err(reason, &Text::from(""), ctx); + ctx.host.lock().print_err(reason, &Text::from("")); } let _ = configure_rustyline_editor(&mut rl, config); @@ -296,7 +293,10 @@ pub async fn cli(mut context: EvaluationContext) -> Result<(), Box> { rl.add_history_entry(&line); let _ = rl.save_history(&history_path); - print_err(err, &Text::from(session_text.clone()), &context); + context + .host + .lock() + .print_err(err, &Text::from(session_text.clone())); maybe_print_errors(&context, Text::from(session_text.clone())); } diff --git a/crates/nu-cli/src/line_editor.rs b/crates/nu-cli/src/line_editor.rs index 0ed4272b49..d78a823bd4 100644 --- a/crates/nu-cli/src/line_editor.rs +++ b/crates/nu-cli/src/line_editor.rs @@ -5,7 +5,7 @@ use std::error::Error; use crate::prelude::*; #[allow(unused_imports)] -use nu_command::script::LineResult; +use nu_engine::script::LineResult; #[cfg(feature = "rustyline-support")] use crate::shell::Helper; diff --git a/crates/nu-command/src/commands.rs b/crates/nu-command/src/commands.rs index 6c111b56bd..8603edffbe 100644 --- a/crates/nu-command/src/commands.rs +++ b/crates/nu-command/src/commands.rs @@ -20,7 +20,6 @@ pub(crate) mod chart; pub(crate) mod classified; #[cfg(feature = "clipboard-cli")] pub(crate) mod clip; -pub mod command; pub(crate) mod compact; pub(crate) mod config; pub(crate) mod constants; diff --git a/crates/nu-command/src/commands/classified/external.rs b/crates/nu-command/src/commands/classified/external.rs index 16930a56ae..c6936901d3 100644 --- a/crates/nu-command/src/commands/classified/external.rs +++ b/crates/nu-command/src/commands/classified/external.rs @@ -28,7 +28,7 @@ pub(crate) async fn run_external_command( ) -> Result { trace!(target: "nu::run::external", "-> {}", command.name); - if !did_find_command(&command.name) { + if !context.host.lock().is_external_cmd(&command.name) { return Err(ShellError::labeled_error( "Command not found", "command not found", @@ -443,35 +443,6 @@ fn spawn( } } -pub fn did_find_command(#[allow(unused)] name: &str) -> bool { - #[cfg(not(feature = "which"))] - { - // we can't perform this check, so just assume it can be found - true - } - - #[cfg(all(feature = "which", unix))] - { - which::which(name).is_ok() - } - - #[cfg(all(feature = "which", windows))] - { - if which::which(name).is_ok() { - true - } else { - // Reference: https://ss64.com/nt/syntax-internal.html - let cmd_builtins = [ - "assoc", "break", "color", "copy", "date", "del", "dir", "dpath", "echo", "erase", - "for", "ftype", "md", "mkdir", "mklink", "move", "path", "ren", "rename", "rd", - "rmdir", "start", "time", "title", "type", "ver", "verify", "vol", - ]; - - cmd_builtins.contains(&name) - } - } -} - fn expand_tilde(input: &SI, home_dir: HD) -> std::borrow::Cow where SI: AsRef, diff --git a/crates/nu-command/src/commands/run_external.rs b/crates/nu-command/src/commands/run_external.rs index 1aa2db7653..6b231b6a2b 100644 --- a/crates/nu-command/src/commands/run_external.rs +++ b/crates/nu-command/src/commands/run_external.rs @@ -147,7 +147,7 @@ async fn maybe_autocd_dir<'a>( || (cmd.args.is_empty() && PathBuf::from(name).is_dir() && dunce::canonicalize(name).is_ok() - && !crate::commands::classified::external::did_find_command(&name)) + && !ctx.host.lock().is_external_cmd(&name)) { Some(name) } else { diff --git a/crates/nu-command/src/commands/source.rs b/crates/nu-command/src/commands/source.rs index 43ff400580..09e7c25153 100644 --- a/crates/nu-command/src/commands/source.rs +++ b/crates/nu-command/src/commands/source.rs @@ -1,5 +1,5 @@ use crate::prelude::*; -use nu_engine::WholeStreamCommand; +use nu_engine::{script, WholeStreamCommand}; use nu_errors::ShellError; use nu_parser::expand_path; @@ -50,7 +50,7 @@ pub async fn source(args: CommandArgs) -> Result { let contents = std::fs::read_to_string(expand_path(&filename.item).into_owned()); match contents { Ok(contents) => { - let result = crate::script::run_script_standalone(contents, true, &ctx, false).await; + let result = script::run_script_standalone(contents, true, &ctx, false).await; if let Err(err) = result { ctx.error(err.into()); diff --git a/crates/nu-command/src/commands/table/command.rs b/crates/nu-command/src/commands/table/command.rs index b388357099..47bba0f539 100644 --- a/crates/nu-command/src/commands/table/command.rs +++ b/crates/nu-command/src/commands/table/command.rs @@ -7,7 +7,9 @@ use nu_errors::ShellError; use nu_protocol::{Primitive, Signature, SyntaxShape, UntaggedValue, Value}; use nu_table::{draw_table, Alignment, StyledString, TextStyle}; use std::collections::HashMap; +use std::sync::atomic::Ordering; use std::time::Instant; + #[cfg(feature = "table-pager")] use { futures::future::join, diff --git a/crates/nu-command/src/lib.rs b/crates/nu-command/src/lib.rs index f80b466e0f..d7a5ee6ff5 100644 --- a/crates/nu-command/src/lib.rs +++ b/crates/nu-command/src/lib.rs @@ -8,15 +8,11 @@ extern crate indexmap; mod prelude; pub mod commands; mod futures; -pub mod maybe_print_errors; -pub mod script; pub mod utils; #[cfg(test)] mod examples; -pub use crate::maybe_print_errors::maybe_print_errors; - pub use nu_data::config; pub use nu_data::dict::TaggedListBuilder; pub use nu_data::primitive; diff --git a/crates/nu-command/src/prelude.rs b/crates/nu-command/src/prelude.rs index 10463028e0..8bc256f10d 100644 --- a/crates/nu-command/src/prelude.rs +++ b/crates/nu-command/src/prelude.rs @@ -46,7 +46,6 @@ macro_rules! trace_out_stream { }}; } -pub(crate) use crate::commands::command::RunnableContext; pub(crate) use async_trait::async_trait; pub(crate) use bigdecimal::BigDecimal; pub(crate) use futures::{Stream, StreamExt}; @@ -58,11 +57,12 @@ pub(crate) use nu_engine::EvaluationContext; pub(crate) use nu_engine::Example; pub(crate) use nu_engine::Host; pub(crate) use nu_engine::RawCommandArgs; +pub(crate) use nu_engine::RunnableContext; pub(crate) use nu_engine::ShellManager; pub(crate) use nu_engine::{get_full_help, CommandArgs, Scope, WholeStreamCommand}; pub(crate) use nu_parser::ParserScope; pub(crate) use nu_protocol::{out, row}; -pub(crate) use nu_source::{AnchorLocation, PrettyDebug, Span, SpannedItem, Tag, TaggedItem, Text}; +pub(crate) use nu_source::{AnchorLocation, PrettyDebug, Span, SpannedItem, Tag, TaggedItem}; pub(crate) use nu_stream::ToInputStream; pub(crate) use nu_stream::{InputStream, Interruptible, OutputStream}; pub(crate) use nu_value_ext::ValueExt; @@ -71,7 +71,7 @@ pub(crate) use num_traits::cast::ToPrimitive; pub(crate) use serde::Deserialize; pub(crate) use std::collections::VecDeque; pub(crate) use std::future::Future; -pub(crate) use std::sync::atomic::{AtomicBool, Ordering}; +pub(crate) use std::sync::atomic::AtomicBool; pub(crate) use std::sync::Arc; #[allow(clippy::wrong_self_convention)] diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml index 81595899de..75d6f3a423 100644 --- a/crates/nu-engine/Cargo.toml +++ b/crates/nu-engine/Cargo.toml @@ -18,6 +18,8 @@ nu-value-ext = { version = "0.28.0", path = "../nu-value-ext" } nu-ansi-term = { version = "0.28.0", path = "../nu-ansi-term" } trash = { version = "1.3.0", optional = true } +which = { version = "4.0.2", optional = true } +codespan-reporting = "0.11.0" async-recursion = "0.3.2" async-trait = "0.1.42" bytes = "0.5.6" diff --git a/crates/nu-engine/src/env/basic_host.rs b/crates/nu-engine/src/env/basic_host.rs index 1dd521c5b3..e9cbb14a0e 100644 --- a/crates/nu-engine/src/env/basic_host.rs +++ b/crates/nu-engine/src/env/basic_host.rs @@ -1,5 +1,7 @@ use crate::Host; +use nu_errors::ShellError; use nu_protocol::{errln, outln}; +use nu_source::Text; use std::ffi::OsString; #[derive(Debug)] @@ -20,6 +22,21 @@ impl Host for BasicHost { } } + fn print_err(&mut self, err: ShellError, source: &Text) { + if let Some(diag) = err.into_diagnostic() { + let source = source.to_string(); + let mut files = codespan_reporting::files::SimpleFiles::new(); + files.add("shell", source); + + let writer = termcolor::StandardStream::stderr(termcolor::ColorChoice::Auto); + let config = codespan_reporting::term::Config::default(); + + let _ = std::panic::catch_unwind(move || { + let _ = codespan_reporting::term::emit(&mut writer.lock(), &config, &files, &diag); + }); + } + } + #[allow(unused_variables)] fn vars(&mut self) -> Vec<(String, String)> { #[cfg(not(target_arch = "wasm32"))] @@ -61,14 +78,6 @@ impl Host for BasicHost { } } - fn out_termcolor(&self) -> termcolor::StandardStream { - termcolor::StandardStream::stdout(termcolor::ColorChoice::Auto) - } - - fn err_termcolor(&self) -> termcolor::StandardStream { - termcolor::StandardStream::stderr(termcolor::ColorChoice::Auto) - } - fn width(&self) -> usize { let (mut term_width, _) = term_size::dimensions().unwrap_or((80, 20)); term_width -= 1; @@ -79,4 +88,33 @@ impl Host for BasicHost { let (_, term_height) = term_size::dimensions().unwrap_or((80, 20)); term_height } + + fn is_external_cmd(&self, #[allow(unused)] cmd_name: &str) -> bool { + #[cfg(any(target_arch = "wasm32", not(feature = "which")))] + { + true + } + + #[cfg(all(unix, feature = "which"))] + { + which::which(cmd_name).is_ok() + } + + #[cfg(all(windows, feature = "which"))] + { + if which::which(cmd_name).is_ok() { + true + } else { + // Reference: https://ss64.com/nt/syntax-internal.html + let cmd_builtins = [ + "assoc", "break", "color", "copy", "date", "del", "dir", "dpath", "echo", + "erase", "for", "ftype", "md", "mkdir", "mklink", "move", "path", "ren", + "rename", "rd", "rmdir", "start", "time", "title", "type", "ver", "verify", + "vol", + ]; + + cmd_builtins.contains(&cmd_name) + } + } + } } diff --git a/crates/nu-engine/src/env/host.rs b/crates/nu-engine/src/env/host.rs index f768b38032..9e6fe84e1c 100644 --- a/crates/nu-engine/src/env/host.rs +++ b/crates/nu-engine/src/env/host.rs @@ -1,13 +1,15 @@ use indexmap::IndexMap; +use nu_errors::ShellError; +use nu_source::Text; use std::ffi::OsString; use std::fmt::Debug; -pub trait Host: Debug + Send { - fn out_termcolor(&self) -> termcolor::StandardStream; - fn err_termcolor(&self) -> termcolor::StandardStream; +use super::basic_host::BasicHost; +pub trait Host: Debug + Send { fn stdout(&mut self, out: &str); fn stderr(&mut self, out: &str); + fn print_err(&mut self, err: ShellError, source: &Text); fn vars(&mut self) -> Vec<(String, String)>; fn env_get(&mut self, key: OsString) -> Option; @@ -16,6 +18,8 @@ pub trait Host: Debug + Send { fn width(&self) -> usize; fn height(&self) -> usize; + + fn is_external_cmd(&self, cmd_name: &str) -> bool; } impl Host for Box { @@ -27,6 +31,10 @@ impl Host for Box { (**self).stderr(out) } + fn print_err(&mut self, err: ShellError, source: &Text) { + (**self).print_err(err, source) + } + fn vars(&mut self) -> Vec<(String, String)> { (**self).vars() } @@ -43,14 +51,6 @@ impl Host for Box { (**self).env_rm(key) } - fn out_termcolor(&self) -> termcolor::StandardStream { - (**self).out_termcolor() - } - - fn err_termcolor(&self) -> termcolor::StandardStream { - (**self).err_termcolor() - } - fn width(&self) -> usize { (**self).width() } @@ -58,6 +58,10 @@ impl Host for Box { fn height(&self) -> usize { (**self).height() } + + fn is_external_cmd(&self, name: &str) -> bool { + (**self).is_external_cmd(name) + } } #[derive(Debug)] @@ -90,6 +94,10 @@ impl Host for FakeHost { self.line_written = out.to_string(); } + fn print_err(&mut self, err: ShellError, source: &Text) { + BasicHost {}.print_err(err, source); + } + fn vars(&mut self) -> Vec<(String, String)> { self.env_vars .iter() @@ -118,14 +126,6 @@ impl Host for FakeHost { .shift_remove(&key.into_string().expect("Couldn't convert to string.")); } - fn out_termcolor(&self) -> termcolor::StandardStream { - termcolor::StandardStream::stdout(termcolor::ColorChoice::Auto) - } - - fn err_termcolor(&self) -> termcolor::StandardStream { - termcolor::StandardStream::stderr(termcolor::ColorChoice::Auto) - } - fn width(&self) -> usize { 1 } @@ -133,4 +133,8 @@ impl Host for FakeHost { fn height(&self) -> usize { 1 } + + fn is_external_cmd(&self, _: &str) -> bool { + true + } } diff --git a/crates/nu-engine/src/lib.rs b/crates/nu-engine/src/lib.rs index c6c8f031ec..d06d753215 100644 --- a/crates/nu-engine/src/lib.rs +++ b/crates/nu-engine/src/lib.rs @@ -12,6 +12,9 @@ pub mod filesystem; mod history_path; mod maybe_text_codec; pub mod plugin; +pub mod print; +mod runnable_context; +pub mod script; pub mod shell; mod whole_stream_command; @@ -35,6 +38,7 @@ pub use crate::filesystem::filesystem_shell::FilesystemShell; pub use crate::filesystem::path; pub use crate::history_path::history_path; pub use crate::maybe_text_codec::{MaybeTextCodec, StringOrBinary}; +pub use crate::runnable_context::RunnableContext; pub use crate::shell::help_shell::{command_dict, HelpShell}; pub use crate::shell::painter::Painter; pub use crate::shell::palette::{DefaultPalette, Palette}; diff --git a/crates/nu-command/src/maybe_print_errors.rs b/crates/nu-engine/src/print.rs similarity index 77% rename from crates/nu-command/src/maybe_print_errors.rs rename to crates/nu-engine/src/print.rs index 75e6bb7603..87f36e93a3 100644 --- a/crates/nu-command/src/maybe_print_errors.rs +++ b/crates/nu-engine/src/print.rs @@ -1,6 +1,7 @@ -use nu_engine::EvaluationContext; use nu_source::Text; +use crate::EvaluationContext; + pub fn maybe_print_errors(context: &EvaluationContext, source: Text) -> bool { let errors = context.current_errors.clone(); let mut errors = errors.lock(); @@ -9,7 +10,7 @@ pub fn maybe_print_errors(context: &EvaluationContext, source: Text) -> bool { let error = errors[0].clone(); *errors = vec![]; - crate::script::print_err(error, &source, context); + context.host.lock().print_err(error, &source); true } else { false diff --git a/crates/nu-command/src/commands/command.rs b/crates/nu-engine/src/runnable_context.rs similarity index 69% rename from crates/nu-command/src/commands/command.rs rename to crates/nu-engine/src/runnable_context.rs index 2ff4926dfc..2c6b459f9d 100644 --- a/crates/nu-command/src/commands/command.rs +++ b/crates/nu-engine/src/runnable_context.rs @@ -1,13 +1,14 @@ -use crate::prelude::*; -use nu_engine::Command; +use crate::{Command, Host, Scope, ShellManager}; use nu_errors::ShellError; +use nu_source::Tag; +use nu_stream::InputStream; use parking_lot::Mutex; -use std::sync::atomic::AtomicBool; +use std::sync::{atomic::AtomicBool, Arc}; pub struct RunnableContext { pub input: InputStream, pub shell_manager: ShellManager, - pub host: Arc>>, + pub host: Arc>>, pub ctrl_c: Arc, pub current_errors: Arc>>, pub scope: Scope, diff --git a/crates/nu-command/src/script.rs b/crates/nu-engine/src/script.rs similarity index 84% rename from crates/nu-command/src/script.rs rename to crates/nu-engine/src/script.rs index 1cf192c8a8..2df71e8cfd 100644 --- a/crates/nu-command/src/script.rs +++ b/crates/nu-engine/src/script.rs @@ -1,19 +1,22 @@ -use crate::maybe_print_errors; -use crate::prelude::*; +use crate::run_block; +use crate::{path::canonicalize, print::maybe_print_errors}; +use crate::{MaybeTextCodec, StringOrBinary}; +use futures::StreamExt; use futures_codec::FramedRead; -use nu_engine::path::canonicalize; -use nu_engine::run_block; -use nu_engine::EvaluationContext; -use nu_engine::{MaybeTextCodec, StringOrBinary}; use nu_errors::ShellError; -use nu_protocol::hir::{ClassifiedCommand, Expression, InternalCommand, Literal, NamedArguments}; +use nu_protocol::hir::{ + Call, ClassifiedCommand, Expression, InternalCommand, Literal, NamedArguments, + SpannedExpression, +}; use nu_protocol::{Primitive, ReturnSuccess, UntaggedValue, Value}; -use nu_stream::ToInputStream; +use nu_stream::{InputStream, ToInputStream}; +use crate::EvaluationContext; use log::{debug, trace}; -use std::error::Error; +use nu_source::{Span, Tag, Text}; use std::iter::Iterator; use std::path::Path; +use std::{error::Error, sync::atomic::Ordering}; #[derive(Debug)] pub enum LineResult { @@ -33,21 +36,6 @@ fn chomp_newline(s: &str) -> &str { } } -pub fn print_err(err: ShellError, source: &Text, ctx: &EvaluationContext) { - if let Some(diag) = err.into_diagnostic() { - let source = source.to_string(); - let mut files = codespan_reporting::files::SimpleFiles::new(); - files.add("shell", source); - - let writer = ctx.host.lock().err_termcolor(); - let config = codespan_reporting::term::Config::default(); - - let _ = std::panic::catch_unwind(move || { - let _ = codespan_reporting::term::emit(&mut writer.lock(), &config, &files, &diag); - }); - } -} - /// Process the line by parsing the text to turn it into commands, classify those commands so that we understand what is being called in the pipeline, and then run this pipeline pub async fn process_script( script_text: &str, @@ -113,7 +101,7 @@ pub async fn process_script( .unwrap_or(true) && canonicalize(ctx.shell_manager.path(), name).is_ok() && Path::new(&name).is_dir() - && !crate::commands::classified::external::did_find_command(&name) + && !ctx.host.lock().is_external_cmd(&name) { // Here we work differently if we're in Windows because of the expected Windows behavior #[cfg(windows)] @@ -192,18 +180,24 @@ pub async fn process_script( // values to compute them. use futures::stream::TryStreamExt; - let context = RunnableContext { - input, - shell_manager: ctx.shell_manager.clone(), - host: ctx.host.clone(), - ctrl_c: ctx.ctrl_c.clone(), - current_errors: ctx.current_errors.clone(), - scope: ctx.scope.clone(), - name: Tag::unknown(), - }; + let autoview_cmd = ctx + .get_command("autoview") + .expect("Could not find autoview command"); - if let Ok(mut output_stream) = - crate::commands::autoview::command::autoview(context).await + if let Ok(mut output_stream) = ctx + .run_command( + autoview_cmd, + Tag::unknown(), + Call::new( + Box::new(SpannedExpression::new( + Expression::string("autoview".to_string()), + Span::unknown(), + )), + Span::unknown(), + ), + input, + ) + .await { loop { match output_stream.try_next().await { @@ -257,7 +251,10 @@ pub async fn run_script_standalone( } LineResult::Error(line, err) => { - print_err(err, &Text::from(line.clone()), &context); + context + .host + .lock() + .print_err(err, &Text::from(line.clone())); maybe_print_errors(&context, Text::from(line)); if exit_on_error { @@ -267,6 +264,5 @@ pub async fn run_script_standalone( _ => {} } - Ok(()) }