From 7fed9992c9ac0aab5f65e75e7283ee7c0c5ec2e0 Mon Sep 17 00:00:00 2001 From: Jonathan Turner Date: Sat, 27 Jun 2020 19:54:31 +1200 Subject: [PATCH] Bump deps and touchup (#2066) --- Cargo.lock | 366 ++++++++++++---------- Cargo.toml | 4 +- crates/nu-build/Cargo.toml | 4 +- crates/nu-cli/Cargo.toml | 32 +- crates/nu-cli/src/commands/autoview.rs | 5 +- crates/nu-cli/src/commands/table.rs | 4 +- crates/nu-cli/src/env/host.rs | 4 +- crates/nu-errors/Cargo.toml | 8 +- crates/nu-parser/Cargo.toml | 10 +- crates/nu-plugin/Cargo.toml | 6 +- crates/nu-protocol/Cargo.toml | 14 +- crates/nu-source/Cargo.toml | 4 +- crates/nu-test-support/Cargo.toml | 4 +- crates/nu-value-ext/Cargo.toml | 4 +- crates/nu_plugin_fetch/Cargo.toml | 2 +- crates/nu_plugin_post/Cargo.toml | 6 +- crates/nu_plugin_textview/Cargo.toml | 2 +- crates/nu_plugin_textview/src/textview.rs | 6 +- 18 files changed, 258 insertions(+), 227 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2ab3219f51..a15c8b84f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,9 +2,9 @@ # It is not intended for manual editing. [[package]] name = "addr2line" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a49806b9dadc843c61e7c97e72490ad7f7220ae249012fbda9ad0609457c0543" +checksum = "602d785912f476e480434627e8732e6766b760c045bbf897d9dfaa9f4fbd399c" dependencies = [ "gimli", ] @@ -17,9 +17,9 @@ checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d" [[package]] name = "aho-corasick" -version = "0.7.10" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" +checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" dependencies = [ "memchr", ] @@ -39,7 +39,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -48,7 +48,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -159,7 +159,7 @@ dependencies = [ "log", "native-tls", "openssl", - "serde 1.0.113", + "serde 1.0.114", "serde_urlencoded", "url", ] @@ -172,7 +172,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi", "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -203,9 +203,9 @@ checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" [[package]] name = "base64" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e223af0dc48c96d4f8342ec01a4974f139df863896b316681efd36742f22cc67" +checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" [[package]] name = "bat" @@ -228,7 +228,7 @@ dependencies = [ "liquid", "path_abs", "semver 0.9.0", - "serde 1.0.113", + "serde 1.0.114", "serde_yaml", "shell-words", "syntect", @@ -250,7 +250,7 @@ dependencies = [ "nix 0.15.0", "num-traits 0.2.12", "uom 0.26.0", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -262,17 +262,17 @@ dependencies = [ "num-bigint", "num-integer", "num-traits 0.2.12", - "serde 1.0.113", + "serde 1.0.114", ] [[package]] name = "bincode" -version = "1.2.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5753e2a71534719bf3f4e57006c3a4f0d2c672a4b676eec84161f763eca87dbf" +checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d" dependencies = [ "byteorder", - "serde 1.0.113", + "serde 1.0.114", ] [[package]] @@ -361,7 +361,7 @@ dependencies = [ "linked-hash-map 0.5.3", "md5", "rand", - "serde 1.0.113", + "serde 1.0.114", "serde_json", "time", ] @@ -375,7 +375,7 @@ dependencies = [ "lazy_static 1.4.0", "memchr", "regex-automata", - "serde 1.0.113", + "serde 1.0.114", ] [[package]] @@ -438,15 +438,15 @@ dependencies = [ "encoding_rs", "log", "quick-xml", - "serde 1.0.113", + "serde 1.0.114", "zip", ] [[package]] name = "cc" -version = "1.0.54" +version = "1.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bbb73db36c1246e9034e307d0fba23f9a2e251faa47ade70c1bd252220c8311" +checksum = "b1be3409f94d7bdceeb5f5fac551039d9b3f00e25da7a74fc4d33400a0d96368" dependencies = [ "jobserver", ] @@ -465,7 +465,7 @@ checksum = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2" dependencies = [ "num-integer", "num-traits 0.2.12", - "serde 1.0.113", + "serde 1.0.114", "time", ] @@ -504,7 +504,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3a093d6fed558e5fe24c3dfc85a68bb68f1c824f440d3ba5aca189e2998786b" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -516,6 +516,15 @@ dependencies = [ "bitflags", ] +[[package]] +name = "cloudabi" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467" +dependencies = [ + "bitflags", +] + [[package]] name = "codepage" version = "0.1.1" @@ -527,11 +536,11 @@ dependencies = [ [[package]] name = "codespan-reporting" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ceface2475f2f57a7ece9ba239b96e06bda8323ee68aa6df539752f13a74f60" +checksum = "6e0762455306b1ed42bc651ef6a2197aabda5e1d4a43c34d5eab5c1a3634e81d" dependencies = [ - "serde 1.0.113", + "serde 1.0.114", "termcolor", "unicode-width", ] @@ -554,7 +563,7 @@ dependencies = [ "lazy_static 1.4.0", "nom 4.2.3", "rust-ini", - "serde 1.0.113", + "serde 1.0.114", "serde-hjson 0.8.2", "serde_json", "toml 0.4.10", @@ -574,7 +583,7 @@ dependencies = [ "terminal_size", "termios", "unicode-width", - "winapi 0.3.8", + "winapi 0.3.9", "winapi-util", ] @@ -712,9 +721,9 @@ dependencies = [ "lazy_static 1.4.0", "libc", "mio", - "parking_lot", + "parking_lot 0.10.2", "signal-hook", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -723,7 +732,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "057b7146d02fb50175fd7dbe5158f6097f33d02831f43b4ee8ae4ddf67b68f5c" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -736,7 +745,7 @@ dependencies = [ "csv-core", "itoa", "ryu", - "serde 1.0.113", + "serde 1.0.114", ] [[package]] @@ -765,14 +774,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a4ba686dff9fa4c1c9636ce1010b0cf98ceb421361b0bb3d6faeec43bd217a7" dependencies = [ "nix 0.17.0", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] name = "curl" -version = "0.4.29" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "762e34611d2d5233a506a79072be944fddd057db2f18e04c0d6fa79e3fd466fd" +checksum = "b0447a642435be046540f042950d874a4907f9fee28c0513a0beb3ba89f91eb7" dependencies = [ "curl-sys", "libc", @@ -780,14 +789,14 @@ dependencies = [ "openssl-sys", "schannel", "socket2", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] name = "curl-sys" -version = "0.4.31+curl-7.70.0" +version = "0.4.32+curl-7.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcd62757cc4f5ab9404bc6ca9f0ae447e729a1403948ce5106bd588ceac6a3b0" +checksum = "834425a2f22fdd621434196965bf99fbfd9eaed96348488e27b7ac40736c560b" dependencies = [ "cc", "libc", @@ -796,7 +805,7 @@ dependencies = [ "openssl-sys", "pkg-config", "vcpkg", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -867,7 +876,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72d337a64190607d4fcca2cb78982c5dd57f4916e19696b48a575fa746b6cb0f" dependencies = [ "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -888,7 +897,7 @@ checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" dependencies = [ "libc", "redox_users", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -919,7 +928,7 @@ checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" dependencies = [ "libc", "redox_users", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -930,7 +939,7 @@ checksum = "9c60f7b8a8953926148223260454befb50c751d3c50e1c178c4fd1ace4083c9a" dependencies = [ "libc", "redox_users", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1064,7 +1073,7 @@ version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ca8b296792113e1500fd935ae487be6e00ce318952a6880555554824d6ebf38" dependencies = [ - "serde 1.0.113", + "serde 1.0.114", ] [[package]] @@ -1128,9 +1137,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.2.4" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64b0126b293b050395b37b10489951590ed024c03d7df4f249d219c8ded7cbf" +checksum = "b90eb1dec02087df472ab9f0db65f27edaa654a746830042688bcc2eaf68090f" [[package]] name = "filesize" @@ -1138,7 +1147,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12d741e2415d4e2e5bd1c1d00409d1a8865a57892c2d689b504365655d237d43" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1377,9 +1386,9 @@ dependencies = [ [[package]] name = "futures_codec" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe8859feb7140742ed1a2a85a07941100ad2b5f98a421b353931d718a34144d1" +checksum = "ce54d63f8b0c75023ed920d46fd71d0cbbb830b0ee012726b5b4f506fb6dea5b" dependencies = [ "bytes 0.5.5", "futures 0.3.5", @@ -1397,7 +1406,7 @@ dependencies = [ "libc", "log", "rustc_version", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1416,7 +1425,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e692e296bfac1d2533ef168d0b60ff5897b8b70a4009276834014dd8924cc028" dependencies = [ "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1524,7 +1533,7 @@ dependencies = [ "nix 0.17.0", "pin-utils", "uom 0.28.0", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1543,7 +1552,7 @@ dependencies = [ "mach 0.3.2", "ntapi", "smol", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1560,7 +1569,7 @@ dependencies = [ "libc", "mach 0.3.2", "widestring", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1578,7 +1587,7 @@ dependencies = [ "mach 0.3.2", "ntapi", "platforms", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1593,7 +1602,7 @@ dependencies = [ "lazy_static 1.4.0", "libc", "mach 0.3.2", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1633,7 +1642,7 @@ dependencies = [ "ntapi", "ordered-float", "smol", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1770,7 +1779,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c398b2b113b55809ceb9ee3e753fcbac793f1956663f3c36549c1346015c2afe" dependencies = [ "autocfg", - "serde 1.0.113", + "serde 1.0.114", ] [[package]] @@ -1782,6 +1791,12 @@ dependencies = [ "adler32", ] +[[package]] +name = "instant" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7777a24a1ce5de49fcdde84ec46efa487c3af49d5b6e6e0a50367cc5c1096182" + [[package]] name = "inventory" version = "0.1.7" @@ -1842,7 +1857,7 @@ dependencies = [ "cfg-if", "libc", "redox_syscall", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1903,7 +1918,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbbc30beb80d56ddf6346e935c7abcba96329ee5c5a4cde8984a4e6b6f18b58e" dependencies = [ - "serde 1.0.113", + "serde 1.0.114", ] [[package]] @@ -2033,7 +2048,7 @@ dependencies = [ "liquid-core", "liquid-derive", "liquid-lib", - "serde 1.0.113", + "serde 1.0.114", ] [[package]] @@ -2050,7 +2065,7 @@ dependencies = [ "num-traits 0.2.12", "pest", "pest_derive", - "serde 1.0.113", + "serde 1.0.114", ] [[package]] @@ -2089,6 +2104,15 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "lock_api" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de302ce1fe7482db13738fbaf2e21cfb06a986b89c0bf38d88abf16681aada4e" +dependencies = [ + "scopeguard", +] + [[package]] name = "log" version = "0.4.8" @@ -2292,7 +2316,7 @@ dependencies = [ "bincode", "cfg-if", "log", - "serde 1.0.113", + "serde 1.0.114", "serde_derive", "wasm-bindgen", ] @@ -2305,7 +2329,7 @@ checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7" dependencies = [ "cfg-if", "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2367,7 +2391,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2401,7 +2425,7 @@ dependencies = [ "nu_plugin_tree", "pretty_env_logger", "semver 0.10.0", - "serde 1.0.113", + "serde 1.0.114", "starship", "syntect", "toml 0.5.6", @@ -2413,7 +2437,7 @@ name = "nu-build" version = "0.15.1" dependencies = [ "lazy_static 1.4.0", - "serde 1.0.113", + "serde 1.0.114", "serde_json", "toml 0.5.6", ] @@ -2426,7 +2450,7 @@ dependencies = [ "app_dirs", "async-recursion", "async-trait", - "base64 0.12.2", + "base64 0.12.3", "bigdecimal", "bson", "byte-unit", @@ -2472,7 +2496,7 @@ dependencies = [ "nu-value-ext", "num-bigint", "num-traits 0.2.12", - "parking_lot", + "parking_lot 0.11.0", "pin-utils", "pretty-hex", "pretty_env_logger", @@ -2486,7 +2510,7 @@ dependencies = [ "roxmltree", "rusqlite", "rustyline", - "serde 1.0.113", + "serde 1.0.114", "serde-hjson 0.9.1", "serde_bytes", "serde_ini", @@ -2498,8 +2522,8 @@ dependencies = [ "strip-ansi-escapes", "tempfile", "term", + "term_size", "termcolor", - "textwrap", "toml 0.5.6", "trash", "typetag", @@ -2524,7 +2548,7 @@ dependencies = [ "nu-source", "num-bigint", "num-traits 0.2.12", - "serde 1.0.113", + "serde 1.0.114", "serde_json", "serde_yaml", "toml 0.5.6", @@ -2544,8 +2568,8 @@ dependencies = [ "nu-source", "num-bigint", "num-traits 0.2.12", - "parking_lot", - "serde 1.0.113", + "parking_lot 0.11.0", + "serde 1.0.114", "shellexpand", ] @@ -2561,7 +2585,7 @@ dependencies = [ "nu-source", "nu-value-ext", "num-bigint", - "serde 1.0.113", + "serde 1.0.114", "serde_json", ] @@ -2586,7 +2610,7 @@ dependencies = [ "num-bigint", "num-traits 0.2.12", "query_interface", - "serde 1.0.113", + "serde 1.0.114", "serde_bytes", "serde_json", "serde_yaml", @@ -2603,7 +2627,7 @@ dependencies = [ "getset", "nu-build", "pretty", - "serde 1.0.113", + "serde 1.0.114", "termcolor", ] @@ -2666,7 +2690,7 @@ dependencies = [ name = "nu_plugin_fetch" version = "0.15.1" dependencies = [ - "base64 0.12.2", + "base64 0.12.3", "futures 0.3.5", "nu-build", "nu-errors", @@ -2707,7 +2731,7 @@ dependencies = [ name = "nu_plugin_post" version = "0.15.1" dependencies = [ - "base64 0.12.2", + "base64 0.12.3", "futures 0.3.5", "nu-build", "nu-errors", @@ -2777,7 +2801,7 @@ dependencies = [ "nu-protocol", "nu-source", "syntect", - "textwrap", + "term_size", "url", ] @@ -2803,7 +2827,7 @@ dependencies = [ "autocfg", "num-integer", "num-traits 0.2.12", - "serde 1.0.113", + "serde 1.0.114", ] [[package]] @@ -2951,14 +2975,14 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c283bf0114efea9e42f1a60edea9859e8c47528eae09d01df4b29c1e489cc48" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] name = "openssl" -version = "0.10.29" +version = "0.10.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd" +checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" dependencies = [ "bitflags", "cfg-if", @@ -3009,15 +3033,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67cc1fe7b45f7e51f755195fd86b0483dbae30fdcf831a3254438d29118d12c4" dependencies = [ "log", - "serde 1.0.113", - "winapi 0.3.8", + "serde 1.0.114", + "winapi 0.3.9", ] [[package]] name = "parking" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a7fad362df89617628a7508b3e9d588ade1b0ac31aa25de168193ad999c2dd4" +checksum = "c4029bc3504a62d92e42f30b9095fdef73b8a0b2a06aa41ce2935143b05a1a06" [[package]] name = "parking_lot" @@ -3025,8 +3049,19 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" dependencies = [ - "lock_api", - "parking_lot_core", + "lock_api 0.3.4", + "parking_lot_core 0.7.2", +] + +[[package]] +name = "parking_lot" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733" +dependencies = [ + "instant", + "lock_api 0.4.0", + "parking_lot_core 0.8.0", ] [[package]] @@ -3036,11 +3071,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" dependencies = [ "cfg-if", - "cloudabi", + "cloudabi 0.0.3", "libc", "redox_syscall", "smallvec", - "winapi 0.3.8", + "winapi 0.3.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b" +dependencies = [ + "cfg-if", + "cloudabi 0.1.0", + "instant", + "libc", + "redox_syscall", + "smallvec", + "winapi 0.3.9", ] [[package]] @@ -3149,18 +3199,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "piper" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01608bfa680dafb103f9207fa944facf572e4e3e708d10de19a0d0c3d36e5f18" -dependencies = [ - "crossbeam-utils 0.7.2", - "futures-io", - "futures-sink", - "futures-util", -] - [[package]] name = "pkg-config" version = "0.3.17" @@ -3179,11 +3217,11 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b336d94e8e4ce29bf15bba393164629764744c567e8ad306cc1fdd0119967fd" dependencies = [ - "base64 0.12.2", + "base64 0.12.3", "chrono", "indexmap", "line-wrap", - "serde 1.0.113", + "serde 1.0.114", "xml-rs", ] @@ -3238,9 +3276,9 @@ dependencies = [ [[package]] name = "proc-macro-error" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98e9e4b82e0ef281812565ea4751049f1bdcdfccda7d3f459f2e138a40c08678" +checksum = "fc175e9777c3116627248584e8f8b3e2987405cabe1c0adf7d1dd28f09dc7880" dependencies = [ "proc-macro-error-attr", "proc-macro2", @@ -3251,9 +3289,9 @@ dependencies = [ [[package]] name = "proc-macro-error-attr" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f5444ead4e9935abd7f27dc51f7e852a0569ac888096d5ec2499470794e2e53" +checksum = "3cc9795ca17eb581285ec44936da7fc2335a3f34f2ddd13118b6f4d515435c50" dependencies = [ "proc-macro2", "quote", @@ -3318,7 +3356,7 @@ dependencies = [ "directories 1.0.2", "isatty", "petgraph", - "serde 1.0.113", + "serde 1.0.114", "serde-value", "serde_derive", "tint", @@ -3438,7 +3476,7 @@ checksum = "33ec17a493dcb820725c002bc253f6f3ba4e4dc635e72c238540691b05e43897" dependencies = [ "readkey", "user32-sys", - "winapi 0.3.8", + "winapi 0.3.9", "x11", ] @@ -3523,7 +3561,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -3534,9 +3572,9 @@ checksum = "194d8e591e405d1eecf28819740abed6d719d1a2db87fc0bcdedee9a26d55560" [[package]] name = "roxmltree" -version = "0.11.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0278075f8c72d2a96dfd214591b14d5a3b46ab5c2f80f806c538011f34f8bf0c" +checksum = "17dfc6c39f846bfc7d2ec442ad12055d79608d501380789b965d22f9354451f2" dependencies = [ "xmlparser", ] @@ -3581,7 +3619,7 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" dependencies = [ - "serde 1.0.113", + "serde 1.0.114", "serde_derive", ] @@ -3616,7 +3654,7 @@ dependencies = [ "unicode-segmentation", "unicode-width", "utf8parse 0.2.0", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -3647,7 +3685,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" dependencies = [ "lazy_static 1.4.0", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -3729,9 +3767,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" [[package]] name = "serde" -version = "1.0.113" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6135c78461981c79497158ef777264c51d9d0f4f3fc3a4d22b915900e42dac6a" +checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" dependencies = [ "serde_derive", ] @@ -3769,7 +3807,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a663f873dedc4eac1a559d4c6bc0d0b2c34dc5ac4702e105014b8281489e44f" dependencies = [ "ordered-float", - "serde 1.0.113", + "serde 1.0.114", ] [[package]] @@ -3778,14 +3816,14 @@ version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16ae07dd2f88a366f15bd0632ba725227018c69a1c8550a927324f8eb8368bb9" dependencies = [ - "serde 1.0.113", + "serde 1.0.114", ] [[package]] name = "serde_derive" -version = "1.0.113" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93c5eaa17d0954cb481cdcfffe9d84fcfa7a1a9f2349271e678677be4c26ae31" +checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" dependencies = [ "proc-macro2", "quote", @@ -3799,7 +3837,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb236687e2bb073a7521c021949be944641e671b8505a94069ca37b656c81139" dependencies = [ "result", - "serde 1.0.113", + "serde 1.0.114", "void", ] @@ -3812,7 +3850,7 @@ dependencies = [ "indexmap", "itoa", "ryu", - "serde 1.0.113", + "serde 1.0.114", ] [[package]] @@ -3832,7 +3870,7 @@ checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" dependencies = [ "dtoa", "itoa", - "serde 1.0.113", + "serde 1.0.114", "url", ] @@ -3844,7 +3882,7 @@ checksum = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5" dependencies = [ "dtoa", "linked-hash-map 0.5.3", - "serde 1.0.113", + "serde 1.0.114", "yaml-rust", ] @@ -3931,9 +3969,9 @@ checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4" [[package]] name = "smol" -version = "0.1.14" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f50d21240d7045d848746d6244762b8cb96449b586b4200519719784859ef50" +checksum = "620cbb3c6e34da57d3a248cda0cd01cd5848164dc062e764e65d06fe3ea7aed5" dependencies = [ "async-task", "blocking", @@ -3943,11 +3981,11 @@ dependencies = [ "futures-util", "libc", "once_cell", - "piper", "scoped-tls 1.0.0", "slab", "socket2", - "wepoll-binding", + "wepoll-sys-stjepang", + "winapi 0.3.9", ] [[package]] @@ -3959,14 +3997,14 @@ dependencies = [ "cfg-if", "libc", "redox_syscall", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] name = "starship" -version = "0.42.0" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5fbb7eefc575ca97af2adcd9176933d28b0fc9357af45bac5d653c0e922342" +checksum = "8ae08e37c960a62130af61e37bf1f6c4703f277a42dcf0cdeea4955c8d049a6e" dependencies = [ "ansi_term 0.12.1", "attohttpc", @@ -3974,7 +4012,7 @@ dependencies = [ "byte-unit", "chrono", "clap", - "dirs 2.0.2", + "dirs-next", "gethostname", "git2", "log", @@ -4051,7 +4089,7 @@ dependencies = [ "log", "mime", "mime_guess", - "serde 1.0.113", + "serde 1.0.114", "serde_json", "serde_urlencoded", "url", @@ -4062,9 +4100,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.31" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5304cfdf27365b7585c25d4af91b35016ed21ef88f17ced89c7093b43dba8b6" +checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd" dependencies = [ "proc-macro2", "quote", @@ -4110,7 +4148,7 @@ dependencies = [ "onig", "plist", "regex-syntax", - "serde 1.0.113", + "serde 1.0.114", "serde_derive", "serde_json", "walkdir", @@ -4129,7 +4167,7 @@ dependencies = [ "ntapi", "once_cell", "rayon", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -4143,7 +4181,7 @@ dependencies = [ "rand", "redox_syscall", "remove_dir_all", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -4154,7 +4192,7 @@ checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" dependencies = [ "byteorder", "dirs 1.0.5", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -4164,7 +4202,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" dependencies = [ "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -4183,7 +4221,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8038f95fc7a6f351163f4b964af631bd26c9e828f7db085f2a84aca56f70d13b" dependencies = [ "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -4241,7 +4279,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" dependencies = [ "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -4276,7 +4314,7 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" dependencies = [ - "serde 1.0.113", + "serde 1.0.114", ] [[package]] @@ -4286,7 +4324,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" dependencies = [ "indexmap", - "serde 1.0.113", + "serde 1.0.114", ] [[package]] @@ -4295,7 +4333,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3d3efa66f2eb71069c3ba9582361e823626067b728ec882490e68c9c43b5e32" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -4319,7 +4357,7 @@ dependencies = [ "erased-serde", "inventory", "lazy_static 1.4.0", - "serde 1.0.113", + "serde 1.0.114", "typetag-impl", ] @@ -4387,9 +4425,9 @@ checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" [[package]] name = "unicode-xid" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" +checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" [[package]] name = "uom" @@ -4538,7 +4576,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" dependencies = [ "same-file", - "winapi 0.3.8", + "winapi 0.3.9", "winapi-util", ] @@ -4641,20 +4679,10 @@ dependencies = [ ] [[package]] -name = "wepoll-binding" -version = "2.0.2" +name = "wepoll-sys-stjepang" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374fff4ff9701ff8b6ad0d14bacd3156c44063632d8c136186ff5967d48999a7" -dependencies = [ - "bitflags", - "wepoll-sys", -] - -[[package]] -name = "wepoll-sys" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9082a777aed991f6769e2b654aa0cb29f1c3d615daf009829b07b66c7aff6a24" +checksum = "6fd319e971980166b53e17b1026812ad66c6b54063be879eb182342b55284694" dependencies = [ "cc", ] @@ -4692,9 +4720,9 @@ checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" [[package]] name = "winapi" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" dependencies = [ "winapi-i686-pc-windows-gnu", "winapi-x86_64-pc-windows-gnu", @@ -4718,7 +4746,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index ee9983f637..210f12e8e9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,11 +43,11 @@ url = { version = "2.1.1", optional = true } clap = "2.33.1" ctrlc = "3.1.4" -dunce = "1.0.0" +dunce = "1.0.1" futures = { version = "0.3", features = ["compat", "io-compat"] } log = "0.4.8" pretty_env_logger = "0.4.0" -starship = "0.42.0" +starship = "0.43.0" [dev-dependencies] nu-test-support = { version = "0.15.1", path = "./crates/nu-test-support" } diff --git a/crates/nu-build/Cargo.toml b/crates/nu-build/Cargo.toml index 516c0f4808..2d06317d4a 100644 --- a/crates/nu-build/Cargo.toml +++ b/crates/nu-build/Cargo.toml @@ -10,7 +10,7 @@ license = "MIT" doctest = false [dependencies] -serde = { version = "1.0.110", features = ["derive"] } +serde = { version = "1.0.114", features = ["derive"] } lazy_static = "1.4.0" -serde_json = "1.0.53" +serde_json = "1.0.55" toml = "0.5.6" diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml index 9a8792596f..dad677339c 100644 --- a/crates/nu-cli/Cargo.toml +++ b/crates/nu-cli/Cargo.toml @@ -22,13 +22,13 @@ nu-table = {version = "0.15.1", path = "../nu-table"} ansi_term = "0.12.1" app_dirs = "1.2.1" async-recursion = "0.3.1" -async-trait = "0.1.31" +async-trait = "0.1.36" directories = "2.0.2" -base64 = "0.12.1" +base64 = "0.12.3" bigdecimal = { version = "0.1.2", features = ["serde"] } bson = { version = "0.14.1", features = ["decimal128"] } byte-unit = "3.1.3" -bytes = "0.5.4" +bytes = "0.5.5" calamine = "0.16" cfg-if = "0.1" chrono = { version = "0.4.11", features = ["serde"] } @@ -37,7 +37,7 @@ csv = "1.1" ctrlc = "3.1.4" derive-new = "0.5.8" dirs = "2.0.2" -dunce = "1.0.0" +dunce = "1.0.1" eml-parser = "0.1.0" filesize = "0.2.0" futures = { version = "0.3", features = ["compat", "io-compat"] } @@ -50,15 +50,15 @@ hex = "0.4" htmlescape = "0.3.1" ical = "0.6.*" ichwh = "0.3.4" -indexmap = { version = "1.3.2", features = ["serde-1"] } +indexmap = { version = "1.4.0", features = ["serde-1"] } itertools = "0.9.0" -codespan-reporting = "0.9.4" +codespan-reporting = "0.9.5" log = "0.4.8" meval = "0.2" natural = "0.5.0" num-bigint = { version = "0.2.6", features = ["serde"] } num-traits = "0.2.11" -parking_lot = "0.10.2" +parking_lot = "0.11.0" pin-utils = "0.1.0" pretty-hex = "0.1.1" pretty_env_logger = "0.4.0" @@ -66,13 +66,13 @@ ptree = {version = "0.2" } query_interface = "0.3.5" rand = "0.7" regex = "1" -roxmltree = "0.11.0" +roxmltree = "0.13.0" rustyline = "6.2.0" -serde = { version = "1.0.110", features = ["derive"] } +serde = { version = "1.0.114", features = ["derive"] } serde-hjson = "0.9.1" -serde_bytes = "0.11.4" +serde_bytes = "0.11.5" serde_ini = "0.2.0" -serde_json = "1.0.53" +serde_json = "1.0.55" serde_urlencoded = "0.6.1" serde_yaml = "0.8" shellexpand = "2.0.0" @@ -80,18 +80,18 @@ strip-ansi-escapes = "0.1.0" tempfile = "3.1.0" term = "0.5.2" termcolor = "1.1.0" -textwrap = {version = "0.11.0", features = ["term_size"]} +term_size = "0.3.2" toml = "0.5.6" -typetag = "0.1.4" +typetag = "0.1.5" umask = "1.0.0" -unicode-xid = "0.2.0" +unicode-xid = "0.2.1" uuid_crate = { package = "uuid", version = "0.8.1", features = ["v4"] } which = "4.0.1" trash = { version = "1.0.1", optional = true } clipboard = { version = "0.5", optional = true } -starship = "0.42.0" -rayon = "1.3.0" +starship = "0.43.0" +rayon = "1.3.1" encoding_rs = "0.8.23" [target.'cfg(unix)'.dependencies] diff --git a/crates/nu-cli/src/commands/autoview.rs b/crates/nu-cli/src/commands/autoview.rs index eac2317a67..417d75e5e3 100644 --- a/crates/nu-cli/src/commands/autoview.rs +++ b/crates/nu-cli/src/commands/autoview.rs @@ -106,6 +106,7 @@ pub async fn autoview(context: RunnableContext) -> Result Result textwrap::termwidth()) => + > term_width) => { let mut entries = vec![]; for (key, value) in row.entries.iter() { @@ -286,7 +287,7 @@ pub async fn autoview(context: RunnableContext) -> Result Result = VecDeque::new(); @@ -294,7 +294,7 @@ async fn table(args: CommandArgs, registry: &CommandRegistry) -> Result usize { - std::cmp::max(textwrap::termwidth(), 20) + let (mut term_width, _) = term_size::dimensions().unwrap_or_else(|| (20, 20)); + term_width -= 1; + std::cmp::max(term_width, 20) } } diff --git a/crates/nu-errors/Cargo.toml b/crates/nu-errors/Cargo.toml index b6005c1358..bd97fde30c 100644 --- a/crates/nu-errors/Cargo.toml +++ b/crates/nu-errors/Cargo.toml @@ -15,16 +15,16 @@ nu-source = { path = "../nu-source", version = "0.15.1" } ansi_term = "0.12.1" bigdecimal = { version = "0.1.2", features = ["serde"] } derive-new = "0.5.8" -codespan-reporting = { version = "0.9.4", features = ["serialization"]} +codespan-reporting = { version = "0.9.5", features = ["serialization"]} num-bigint = { version = "0.2.6", features = ["serde"] } -num-traits = "0.2.11" -serde = { version = "1.0.110", features = ["derive"] } +num-traits = "0.2.12" +serde = { version = "1.0.114", features = ["derive"] } getset = "0.1.1" # implement conversions serde_yaml = "0.8" toml = "0.5.6" -serde_json = "1.0.53" +serde_json = "1.0.55" glob = "0.3.0" [build-dependencies] diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml index 24cc680bee..f0daa5ee16 100644 --- a/crates/nu-parser/Cargo.toml +++ b/crates/nu-parser/Cargo.toml @@ -11,12 +11,12 @@ license = "MIT" [dependencies] num-bigint = { version = "0.2.6", features = ["serde"] } bigdecimal = { version = "0.1.2", features = ["serde"] } -indexmap = { version = "1.3.2", features = ["serde-1"] } -parking_lot = "0.10.2" -num-traits = "0.2.11" +indexmap = { version = "1.4.0", features = ["serde-1"] } +parking_lot = "0.11.0" +num-traits = "0.2.12" derive-new = "0.5.8" -serde = "1.0.110" -codespan-reporting = "0.9.4" +serde = "1.0.114" +codespan-reporting = "0.9.5" log = "0.4.8" shellexpand = "2.0.0" diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml index cc4c84f191..f61659c40e 100644 --- a/crates/nu-plugin/Cargo.toml +++ b/crates/nu-plugin/Cargo.toml @@ -15,10 +15,10 @@ nu-source = { path = "../nu-source", version = "0.15.1" } nu-errors = { path = "../nu-errors", version = "0.15.1" } nu-value-ext = { path = "../nu-value-ext", version = "0.15.1" } -indexmap = { version = "1.3.2", features = ["serde-1"] } -serde = { version = "1.0.110", features = ["derive"] } +indexmap = { version = "1.4.0", features = ["serde-1"] } +serde = { version = "1.0.114", features = ["derive"] } num-bigint = { version = "0.2.6", features = ["serde"] } -serde_json = "1.0.53" +serde_json = "1.0.55" bigdecimal = { version = "0.1.2", features = ["serde"] } [build-dependencies] diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml index 804c92130d..d9677d561d 100644 --- a/crates/nu-protocol/Cargo.toml +++ b/crates/nu-protocol/Cargo.toml @@ -13,18 +13,18 @@ doctest = false nu-source = { path = "../nu-source", version = "0.15.1" } nu-errors = { path = "../nu-errors", version = "0.15.1" } -serde = { version = "1.0.110", features = ["derive"] } -indexmap = { version = "1.3.2", features = ["serde-1"] } +serde = { version = "1.0.114", features = ["derive"] } +indexmap = { version = "1.4.0", features = ["serde-1"] } num-bigint = { version = "0.2.6", features = ["serde"] } bigdecimal = { version = "0.1.2", features = ["serde"] } chrono = { version = "0.4.11", features = ["serde"] } -num-traits = "0.2.11" -serde_bytes = "0.11.4" +num-traits = "0.2.12" +serde_bytes = "0.11.5" getset = "0.1.1" derive-new = "0.5.8" ansi_term = "0.12.1" -codespan-reporting = "0.9.4" -typetag = "0.1.4" +codespan-reporting = "0.9.5" +typetag = "0.1.5" query_interface = "0.3.5" byte-unit = "3.1.3" natural = "0.5.0" @@ -34,7 +34,7 @@ itertools = "0.9.0" # implement conversions serde_yaml = "0.8" toml = "0.5.6" -serde_json = "1.0.53" +serde_json = "1.0.55" [build-dependencies] nu-build = { version = "0.15.1", path = "../nu-build" } diff --git a/crates/nu-source/Cargo.toml b/crates/nu-source/Cargo.toml index 06946cc725..d957fb2952 100644 --- a/crates/nu-source/Cargo.toml +++ b/crates/nu-source/Cargo.toml @@ -10,10 +10,10 @@ license = "MIT" doctest = false [dependencies] -serde = { version = "1.0.110", features = ["derive"] } +serde = { version = "1.0.114", features = ["derive"] } derive-new = "0.5.8" getset = "0.1.1" -codespan-reporting = "0.9.4" +codespan-reporting = "0.9.5" termcolor = "1.1.0" pretty = "0.5.2" diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml index d9244c7e35..d560dfc52e 100644 --- a/crates/nu-test-support/Cargo.toml +++ b/crates/nu-test-support/Cargo.toml @@ -15,11 +15,11 @@ nu-source = { path = "../nu-source", version = "0.15.1" } nu-protocol = { path = "../nu-protocol", version = "0.15.1" } directories = "2.0.2" -dunce = "1.0.0" +dunce = "1.0.1" getset = "0.1.1" glob = "0.3.0" tempfile = "3.1.0" -indexmap = { version = "1.3.2", features = ["serde-1"] } +indexmap = { version = "1.4.0", features = ["serde-1"] } [build-dependencies] nu-build = { version = "0.15.1", path = "../nu-build" } diff --git a/crates/nu-value-ext/Cargo.toml b/crates/nu-value-ext/Cargo.toml index 1aae285a4a..d011fecfd7 100644 --- a/crates/nu-value-ext/Cargo.toml +++ b/crates/nu-value-ext/Cargo.toml @@ -15,9 +15,9 @@ nu-errors = { path = "../nu-errors", version = "0.15.1" } nu-parser = { path = "../nu-parser", version = "0.15.1" } nu-protocol = { path = "../nu-protocol", version = "0.15.1" } -num-traits = "0.2.11" +num-traits = "0.2.12" itertools = "0.9.0" -indexmap = { version = "1.3.2", features = ["serde-1"] } +indexmap = { version = "1.4.0", features = ["serde-1"] } [build-dependencies] nu-build = { version = "0.15.1", path = "../nu-build" } diff --git a/crates/nu_plugin_fetch/Cargo.toml b/crates/nu_plugin_fetch/Cargo.toml index ea525b5a35..115ce74a4d 100644 --- a/crates/nu_plugin_fetch/Cargo.toml +++ b/crates/nu_plugin_fetch/Cargo.toml @@ -17,7 +17,7 @@ nu-errors = { path = "../nu-errors", version = "0.15.1" } futures = { version = "0.3", features = ["compat", "io-compat"] } surf = "1.0.3" url = "2.1.1" -base64 = "0.12.1" +base64 = "0.12.3" [build-dependencies] nu-build = { version = "0.15.1", path = "../nu-build" } diff --git a/crates/nu_plugin_post/Cargo.toml b/crates/nu_plugin_post/Cargo.toml index 12f71d5a1c..1f8f505315 100644 --- a/crates/nu_plugin_post/Cargo.toml +++ b/crates/nu_plugin_post/Cargo.toml @@ -17,9 +17,9 @@ nu-errors = { path = "../nu-errors", version = "0.15.1" } futures = { version = "0.3", features = ["compat", "io-compat"] } surf = "1.0.3" url = "2.1.1" -serde_json = "1.0.53" -base64 = "0.12.1" -num-traits = "0.2.11" +serde_json = "1.0.55" +base64 = "0.12.3" +num-traits = "0.2.12" [build-dependencies] nu-build = { version = "0.15.1", path = "../nu-build" } diff --git a/crates/nu_plugin_textview/Cargo.toml b/crates/nu_plugin_textview/Cargo.toml index 7e4ae79417..ca29c6a34e 100644 --- a/crates/nu_plugin_textview/Cargo.toml +++ b/crates/nu_plugin_textview/Cargo.toml @@ -21,7 +21,7 @@ syntect = { version = "4.2", default-features = false, features = ["default-fanc ansi_term = "0.12.1" url = "2.1.1" bat = "0.15.4" -textwrap = {version = "0.11.0", features = ["term_size"]} +term_size = "0.3.2" [build-dependencies] nu-build = { version = "0.15.1", path = "../nu-build" } diff --git a/crates/nu_plugin_textview/src/textview.rs b/crates/nu_plugin_textview/src/textview.rs index a1a5dedd0f..598bd7c435 100644 --- a/crates/nu_plugin_textview/src/textview.rs +++ b/crates/nu_plugin_textview/src/textview.rs @@ -13,7 +13,7 @@ impl TextView { #[allow(clippy::cognitive_complexity)] pub fn view_text_value(value: &Value) { - let mut term_width: u64 = textwrap::termwidth() as u64; + let (mut term_width, _) = term_size::dimensions().unwrap_or_else(|| (20, 20)); let mut tab_width: u64 = 4; let mut colored_output = true; let mut true_color = true; @@ -38,8 +38,8 @@ pub fn view_text_value(value: &Value) { match idx.as_ref() { "term_width" => { term_width = match value.as_u64() { - Ok(n) => n, - _ => textwrap::termwidth() as u64, + Ok(n) => n as usize, + _ => term_width as usize, } } "tab_width" => {