diff --git a/Cargo.lock b/Cargo.lock index 345ebc5c63..e569e4f0d0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -77,15 +77,6 @@ dependencies = [ "cc", ] -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "ansi_term" version = "0.12.1" @@ -101,33 +92,6 @@ version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28ae2b3dec75a406790005a200b1bd89785afc02517a00ca99ecfe093ee9e6cf" -[[package]] -name = "arboard" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47044a1809e2953fe6d084312b81dcb7d9ffc24fee45aa39e5b938f66f75b8a8" -dependencies = [ - "clipboard-win", - "core-graphics", - "image", - "log", - "objc", - "objc-foundation", - "objc_id", - "once_cell", - "parking_lot", - "scopeguard", - "thiserror", - "winapi 0.3.9", - "x11rb", -] - -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - [[package]] name = "arrayvec" version = "0.4.12" @@ -254,20 +218,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a069bad29696ecaa51ac79d3eb87abe3b65c7808ab2b3836afd9bd6c4009362" dependencies = [ "ansi_colours", - "ansi_term 0.12.1", - "atty", + "ansi_term", "bugreport", - "clap", "clircle", "console", "content_inspector", - "dirs-next", "encoding", "error-chain", "git2", "globset", "grep-cli", - "lazy_static", "path_abs", "semver", "serde", @@ -275,16 +235,15 @@ dependencies = [ "shell-words", "syntect", "unicode-width", - "wild", ] [[package]] -name = "bigdecimal-rs" -version = "0.2.1" +name = "bigdecimal" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85375a908d633fa70ab5b8a217d3d0b6e5c4a9b03786f0c3c969e77f4016b10c" +checksum = "6aaf33151a6429fe9211d1b276eafdf70cdff28b071e76c0b0e1503221ea3744" dependencies = [ - "num-bigint 0.3.3", + "num-bigint 0.4.3", "num-integer", "num-traits", "serde", @@ -329,23 +288,6 @@ dependencies = [ "crunchy", ] -[[package]] -name = "blake2b_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "constant_time_eq", -] - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - [[package]] name = "block-buffer" version = "0.9.0" @@ -563,22 +505,6 @@ dependencies = [ "parse-zoneinfo", ] -[[package]] -name = "clap" -version = "2.33.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" -dependencies = [ - "ansi_term 0.11.0", - "atty", - "bitflags", - "strsim", - "term_size", - "textwrap", - "unicode-width", - "vec_map", -] - [[package]] name = "clipboard-win" version = "4.2.1" @@ -628,6 +554,17 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" +[[package]] +name = "comfy-table" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52a488ea8a8e295a53c7a4514b78a2e54bcff33adf99c15aced97b2a2062d4f8" +dependencies = [ + "crossterm", + "strum", + "strum_macros", +] + [[package]] name = "common-path" version = "1.0.0" @@ -650,10 +587,10 @@ dependencies = [ ] [[package]] -name = "constant_time_eq" -version = "0.1.5" +name = "const-sha1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "fb58b6451e8c2a812ad979ed1d83378caa5e927eef2622017a45f251457c2c9d" [[package]] name = "content_inspector" @@ -686,18 +623,6 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" -[[package]] -name = "core-graphics" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52a67c4378cf203eace8fb6567847eb641fd6ff933c1145a115c6ee820ebb978" -dependencies = [ - "bitflags", - "core-foundation", - "foreign-types", - "libc", -] - [[package]] name = "cpufeatures" version = "0.2.1" @@ -866,7 +791,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "377c9b002a72a0b2c1a18c62e2f3864bdfea4a015e3683a96e24aa45dd6c02d1" dependencies = [ - "nix 0.22.1", + "nix", "winapi 0.3.9", ] @@ -929,17 +854,6 @@ dependencies = [ "dirs-sys-next", ] -[[package]] -name = "dirs" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" -dependencies = [ - "libc", - "redox_users 0.3.5", - "winapi 0.3.9", -] - [[package]] name = "dirs" version = "3.0.2" @@ -966,7 +880,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" dependencies = [ "libc", - "redox_users 0.4.0", + "redox_users", "winapi 0.3.9", ] @@ -977,7 +891,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", - "redox_users 0.4.0", + "redox_users", "winapi 0.3.9", ] @@ -1299,12 +1213,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - [[package]] name = "futf" version = "0.1.4" @@ -1426,12 +1334,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "gcc" -version = "0.3.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" - [[package]] name = "generic-array" version = "0.14.4" @@ -1442,16 +1344,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "gethostname" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e692e296bfac1d2533ef168d0b60ff5897b8b70a4009276834014dd8924cc028" -dependencies = [ - "libc", - "winapi 0.3.9", -] - [[package]] name = "getopts" version = "0.2.21" @@ -1538,9 +1430,9 @@ dependencies = [ [[package]] name = "gjson" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "205c41cae258334004939aa09ae377372968c2b6241bae6266fa1c0589cf0a6e" +checksum = "4599d0e9dce476280e2da1f334811e2b26d63a6b000e13b7b50cc980bae49698" [[package]] name = "glob" @@ -1652,6 +1544,15 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "hermit-abi" version = "0.1.19" @@ -1820,7 +1721,6 @@ dependencies = [ "num-rational 0.3.2", "num-traits", "png", - "tiff", ] [[package]] @@ -1883,6 +1783,12 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" +[[package]] +name = "is_debug" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06d198e9919d9822d5f7083ba8530e04de87841eaf21ead9af8f2304efd57c89" + [[package]] name = "is_executable" version = "1.0.1" @@ -2018,9 +1924,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.101" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21" +checksum = "8521a1b57e76b1ec69af7599e75e38e7b7fad6610f037db8c79b127201b5d119" [[package]] name = "libgit2-sys" @@ -2042,9 +1948,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libsqlite3-sys" -version = "0.22.2" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290b64917f8b0cb885d9de0f9959fe1f775d7fa12f1da2db9001c1c8ab60f89d" +checksum = "abd5850c449b40bacb498b2bbdfaff648b1b055630073ba8db499caf2d0ea9f2" dependencies = [ "cc", "pkg-config", @@ -2344,19 +2250,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "nix" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8e5e343312e7fbeb2a52139114e9e702991ef9c2aea6817ff2440b35647d56" -dependencies = [ - "bitflags", - "cc", - "cfg-if 1.0.0", - "libc", - "memoffset", -] - [[package]] name = "nix" version = "0.22.1" @@ -2475,9 +2368,8 @@ name = "nu-command" version = "0.40.0" dependencies = [ "Inflector", - "arboard", "base64", - "bigdecimal-rs", + "bigdecimal", "calamine", "chrono", "chrono-tz", @@ -2519,7 +2411,7 @@ dependencies = [ "nu-table", "nu-test-support", "nu-value-ext", - "num-bigint 0.3.3", + "num-bigint 0.4.3", "num-format", "num-traits", "parking_lot", @@ -2542,7 +2434,7 @@ dependencies = [ "shadow-rs", "strip-ansi-escapes", "sysinfo", - "term 0.7.0", + "term", "term_size", "thiserror", "titlecase", @@ -2578,7 +2470,7 @@ dependencies = [ name = "nu-data" version = "0.40.0" dependencies = [ - "bigdecimal-rs", + "bigdecimal", "byte-unit", "chrono", "common-path", @@ -2595,7 +2487,7 @@ dependencies = [ "nu-table", "nu-test-support", "nu-value-ext", - "num-bigint 0.3.3", + "num-bigint 0.4.3", "num-format", "num-traits", "serde", @@ -2608,7 +2500,7 @@ dependencies = [ name = "nu-engine" version = "0.40.0" dependencies = [ - "bigdecimal-rs", + "bigdecimal", "bytes 1.1.0", "chrono", "codespan-reporting", @@ -2635,7 +2527,7 @@ dependencies = [ "nu-stream", "nu-test-support", "nu-value-ext", - "num-bigint 0.3.3", + "num-bigint 0.4.3", "parking_lot", "rayon", "serde", @@ -2653,14 +2545,14 @@ dependencies = [ name = "nu-errors" version = "0.40.0" dependencies = [ - "bigdecimal-rs", + "bigdecimal", "codespan-reporting", "derive-new", "getset", "glob", "nu-ansi-term", "nu-source", - "num-bigint 0.3.3", + "num-bigint 0.4.3", "num-traits", "serde", "serde_json", @@ -2686,7 +2578,7 @@ dependencies = [ name = "nu-parser" version = "0.40.0" dependencies = [ - "bigdecimal-rs", + "bigdecimal", "derive-new", "indexmap", "itertools", @@ -2697,7 +2589,7 @@ dependencies = [ "nu-protocol", "nu-source", "nu-test-support", - "num-bigint 0.3.3", + "num-bigint 0.4.3", "smart-default", ] @@ -2736,7 +2628,7 @@ dependencies = [ name = "nu-protocol" version = "0.40.0" dependencies = [ - "bigdecimal-rs", + "bigdecimal", "byte-unit", "chrono", "chrono-humanize", @@ -2746,7 +2638,7 @@ dependencies = [ "log", "nu-errors", "nu-source", - "num-bigint 0.3.3", + "num-bigint 0.4.3", "num-integer", "num-traits", "polars", @@ -2758,7 +2650,7 @@ dependencies = [ name = "nu-serde" version = "0.40.0" dependencies = [ - "bigdecimal-rs", + "bigdecimal", "insta", "nu-protocol", "nu-source", @@ -2801,7 +2693,7 @@ dependencies = [ name = "nu-test-support" version = "0.40.0" dependencies = [ - "bigdecimal-rs", + "bigdecimal", "chrono", "getset", "glob", @@ -2811,7 +2703,7 @@ dependencies = [ "nu-path", "nu-protocol", "nu-source", - "num-bigint 0.3.3", + "num-bigint 0.4.3", "tempfile", ] @@ -2861,7 +2753,7 @@ dependencies = [ name = "nu_plugin_from_bson" version = "0.40.0" dependencies = [ - "bigdecimal-rs", + "bigdecimal", "bson", "nu-errors", "nu-plugin", @@ -2871,7 +2763,7 @@ dependencies = [ [[package]] name = "nu_plugin_from_mp4" -version = "0.1.0" +version = "0.40.0" dependencies = [ "mp4", "nu-errors", @@ -2885,7 +2777,7 @@ dependencies = [ name = "nu_plugin_from_sqlite" version = "0.40.0" dependencies = [ - "bigdecimal-rs", + "bigdecimal", "nu-errors", "nu-plugin", "nu-protocol", @@ -3020,7 +2912,7 @@ dependencies = [ name = "nu_plugin_xpath" version = "0.40.0" dependencies = [ - "bigdecimal-rs", + "bigdecimal", "indexmap", "nu-errors", "nu-plugin", @@ -3051,7 +2943,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" dependencies = [ - "num-bigint 0.4.2", + "num-bigint 0.4.3", "num-complex 0.4.0", "num-integer", "num-iter", @@ -3079,18 +2971,18 @@ dependencies = [ "autocfg", "num-integer", "num-traits", - "serde", ] [[package]] name = "num-bigint" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74e768dff5fb39a41b3bcd30bb25cf989706c90d028d1ad71971987aa309d535" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ "autocfg", "num-integer", "num-traits", + "serde", ] [[package]] @@ -3176,7 +3068,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" dependencies = [ "autocfg", - "num-bigint 0.4.2", + "num-bigint 0.4.3", "num-integer", "num-traits", ] @@ -3210,26 +3102,6 @@ dependencies = [ "malloc_buf", ] -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - [[package]] name = "object" version = "0.26.2" @@ -3245,28 +3117,6 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" -[[package]] -name = "onig" -version = "6.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16fd3c0e73b516af509c13c4ba76ec0c987ce20d78b38cff356b8d01fc6a6c0" -dependencies = [ - "bitflags", - "lazy_static", - "libc", - "onig_sys", -] - -[[package]] -name = "onig_sys" -version = "69.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd9442a09e4fbd08d196ddf419b2c79a43c3a46c800320cc841d45c2449a240" -dependencies = [ - "cc", - "pkg-config", -] - [[package]] name = "opaque-debug" version = "0.3.0" @@ -3351,7 +3201,7 @@ dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall 0.2.10", + "redox_syscall", "smallvec", "winapi 0.3.9", ] @@ -3562,13 +3412,13 @@ dependencies = [ "anyhow", "arrow2", "chrono", + "comfy-table", "hashbrown", "itertools", "lazy_static", "num 0.4.0", "num_cpus", "polars-arrow", - "prettytable-rs", "rand 0.7.3", "rand_distr", "rayon", @@ -3589,7 +3439,7 @@ dependencies = [ "anyhow", "arrow2", "csv-core", - "dirs 3.0.2", + "dirs", "lazy_static", "lexical", "memchr", @@ -3648,20 +3498,6 @@ dependencies = [ "log", ] -[[package]] -name = "prettytable-rs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fd04b170004fa2daccf418a7f8253aaf033c27760b5f225889024cf66d7ac2e" -dependencies = [ - "atty", - "csv", - "encode_unicode", - "lazy_static", - "term 0.5.2", - "unicode-width", -] - [[package]] name = "proc-macro-error" version = "1.0.4" @@ -3709,9 +3545,9 @@ dependencies = [ [[package]] name = "ptree" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb17280503804146233f15c98385d3c65f0330663ce0b602a1e4c9379e96b4d" +checksum = "a0de80796b316aec75344095a6d2ef68ec9b8f573b9e7adc821149ba3598e270" dependencies = [ "serde", ] @@ -3782,29 +3618,6 @@ dependencies = [ "nibble_vec", ] -[[package]] -name = "rand" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" -dependencies = [ - "libc", - "rand 0.4.6", -] - -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi 0.3.9", -] - [[package]] name = "rand" version = "0.7.3" @@ -3851,21 +3664,6 @@ dependencies = [ "rand_core 0.6.3", ] -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - [[package]] name = "rand_core" version = "0.5.1" @@ -3958,27 +3756,12 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "readkey" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86d401b6d6a1725a59f1b4e813275d289dff3ad09c72b373a10a7a8217ba3146" -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - [[package]] name = "redox_syscall" version = "0.2.10" @@ -3988,17 +3771,6 @@ dependencies = [ "bitflags", ] -[[package]] -name = "redox_users" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" -dependencies = [ - "getrandom 0.1.16", - "redox_syscall 0.1.57", - "rust-argon2", -] - [[package]] name = "redox_users" version = "0.4.0" @@ -4006,7 +3778,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" dependencies = [ "getrandom 0.2.3", - "redox_syscall 0.2.10", + "redox_syscall", ] [[package]] @@ -4105,9 +3877,9 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.25.3" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57adcf67c8faaf96f3248c2a7b419a0dbc52ebe36ba83dd57fe83827c1ea4eb3" +checksum = "8a82b0b91fad72160c56bf8da7a549b25d7c31109f52cc1437eac4c0ad2550a7" dependencies = [ "bitflags", "fallible-iterator", @@ -4118,31 +3890,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "rust-argon2" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -dependencies = [ - "base64", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils", -] - -[[package]] -name = "rust-crypto" -version = "0.2.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a" -dependencies = [ - "gcc", - "libc", - "rand 0.3.23", - "rustc-serialize", - "time", -] - [[package]] name = "rust-embed" version = "5.9.0" @@ -4229,7 +3976,7 @@ dependencies = [ "libc", "log", "memchr", - "nix 0.22.1", + "nix", "radix_trie", "scopeguard", "smallvec", @@ -4247,9 +3994,9 @@ checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" [[package]] name = "s3handler" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b7327334dd66eab764647b4df9331a46487e933812351baf8fffdeb8a022711" +checksum = "00b9590f1cae0b8b38aceabab05885c754416b6d33089c244a25441ae997fdb1" dependencies = [ "async-trait", "base64", @@ -4259,6 +4006,7 @@ dependencies = [ "failure", "failure_derive", "futures 0.3.16", + "hex", "hmac", "hmac-sha1", "log", @@ -4267,7 +4015,6 @@ dependencies = [ "quick-xml 0.22.0", "regex", "reqwest", - "rust-crypto", "rustc-serialize", "serde", "serde_derive", @@ -4523,12 +4270,13 @@ dependencies = [ [[package]] name = "shadow-rs" -version = "0.6.13" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34aa4acee547e80ee27be89308f61409058e0b4e9396f59461ed2de11c71e5b6" +checksum = "8935e920eb80ff8f5a5bced990325d12f6cc1015154a3852c6a23cf5bd71c447" dependencies = [ "chrono", "git2", + "is_debug", ] [[package]] @@ -4709,10 +4457,22 @@ dependencies = [ ] [[package]] -name = "strsim" -version = "0.8.0" +name = "strum" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +checksum = "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c" + +[[package]] +name = "strum_macros" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] [[package]] name = "subtle" @@ -4777,7 +4537,6 @@ dependencies = [ "fnv", "lazy_static", "lazycell", - "onig", "plist", "regex-syntax", "serde", @@ -4812,9 +4571,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.20.2" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ef9905d4f98c059046037078f070e66de0f5ac69e5bb63f6bf805b570b3b51" +checksum = "fb6c2c4a6ca462f07ca89841a2618dca6e405304d19ae238997e64915d89f513" dependencies = [ "cfg-if 1.0.0", "core-foundation-sys", @@ -4834,7 +4593,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "rand 0.8.4", - "redox_syscall 0.2.10", + "redox_syscall", "remove_dir_all", "winapi 0.3.9", ] @@ -4850,17 +4609,6 @@ dependencies = [ "utf-8", ] -[[package]] -name = "term" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" -dependencies = [ - "byteorder", - "dirs 1.0.5", - "winapi 0.3.9", -] - [[package]] name = "term" version = "0.7.0" @@ -4901,16 +4649,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "term_size", - "unicode-width", -] - [[package]] name = "thin-slice" version = "0.1.1" @@ -4937,17 +4675,6 @@ dependencies = [ "syn", ] -[[package]] -name = "tiff" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a53f4706d65497df0c4349241deddf35f84cee19c87ed86ea8ca590f4464437" -dependencies = [ - "jpeg-decoder", - "miniz_oxide 0.4.4", - "weezl", -] - [[package]] name = "time" version = "0.1.44" @@ -5084,11 +4811,17 @@ dependencies = [ [[package]] name = "trash" -version = "1.3.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90df96afb154814e214f37eac04920c66886fd95962f22febb4d537b0dacd512" +checksum = "d3ebb6cb2db7947ab9f65dec9f7c5dbe01042b708f564242dcfb6d5cb2957cbc" dependencies = [ - "winapi 0.3.9", + "chrono", + "libc", + "log", + "objc", + "scopeguard", + "url", + "windows", ] [[package]] @@ -5247,12 +4980,6 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "version_check" version = "0.9.3" @@ -5408,12 +5135,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "weezl" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b77fdfd5a253be4ab714e4ffa3c49caf146b4de743e97510c0656cf90f1e8e" - [[package]] name = "which" version = "4.2.2" @@ -5431,15 +5152,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" -[[package]] -name = "wild" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "035793abb854745033f01a07647a79831eba29ec0be377205f2a25b0aa830020" -dependencies = [ - "glob", -] - [[package]] name = "winapi" version = "0.2.8" @@ -5477,21 +5189,42 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "winapi-wsapoll" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "361f3533a83ee1a28c9be59683f40043db02dbedf6479ce8795657386195c97f" +dependencies = [ + "const-sha1", + "windows_gen", + "windows_macros", +] + +[[package]] +name = "windows_gen" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54154dbc515d58723f6b6053c12f1065da7389f733660581b2391bd1af480452" +dependencies = [ + "syn", +] + +[[package]] +name = "windows_macros" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f7794c652845dc466cb8dc1b86c08345707c8144bc53e9086430047c7d33b76" +dependencies = [ + "syn", + "windows_gen", +] + [[package]] name = "winreg" version = "0.7.0" @@ -5511,18 +5244,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "x11rb" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ffb080b3f2f616242a4eb8e7d325035312127901025b0052bc3154a282d0f19" -dependencies = [ - "gethostname", - "nix 0.20.1", - "winapi 0.3.9", - "winapi-wsapoll", -] - [[package]] name = "xml-rs" version = "0.8.4" diff --git a/Cargo.toml b/Cargo.toml index b5d2eb7b0e..fc016e65de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -89,7 +89,6 @@ extra = [ "inc", "tree", "textview", - "clipboard-cli", "trash-support", "uuid-support", "start", @@ -113,7 +112,6 @@ textview = ["nu_plugin_textview"] binaryview = ["nu_plugin_binaryview"] bson = ["nu_plugin_from_bson", "nu_plugin_to_bson"] chart = ["nu_plugin_chart"] -clipboard-cli = ["nu-command/clipboard-cli"] query-json = ["nu_plugin_query_json"] s3 = ["nu_plugin_s3"] selector = ["nu_plugin_selector"] diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml index dfaa3d2750..09d560e3dd 100644 --- a/crates/nu-command/Cargo.toml +++ b/crates/nu-command/Cargo.toml @@ -31,7 +31,6 @@ nu-pretty-hex = { version = "0.40.0", path="../nu-pretty-hex" } url = "2.2.1" mime = "0.3.16" Inflector = "0.11" -arboard = { version = "2.0.1", optional = true } base64 = "0.13.0" bigdecimal = { version = "0.3.0", features = ["serde"] } calamine = "0.18.0" @@ -113,7 +112,6 @@ quickcheck_macros = "1.0.0" hamcrest2 = "0.3.0" [features] -clipboard-cli = ["arboard"] rustyline-support = ["rustyline"] stable = [] trash-support = ["trash"] diff --git a/crates/nu-command/src/commands/core_commands/version.rs b/crates/nu-command/src/commands/core_commands/version.rs index 732bb470c9..dcd08bcf0f 100644 --- a/crates/nu-command/src/commands/core_commands/version.rs +++ b/crates/nu-command/src/commands/core_commands/version.rs @@ -221,11 +221,6 @@ fn features_enabled() -> Vec { names.push("zip".to_string()); } - #[cfg(feature = "clipboard-cli")] - { - names.push("clipboard-cli".to_string()); - } - #[cfg(feature = "trash-support")] { names.push("trash".to_string()); diff --git a/crates/nu-command/src/commands/platform/clip.rs b/crates/nu-command/src/commands/platform/clip.rs deleted file mode 100644 index 8bc9e1c3b4..0000000000 --- a/crates/nu-command/src/commands/platform/clip.rs +++ /dev/null @@ -1,105 +0,0 @@ -use crate::prelude::*; - -use nu_engine::WholeStreamCommand; -use nu_errors::ShellError; -use nu_protocol::{Signature, Value}; - -use arboard::Clipboard; - -pub struct Clip; - -impl WholeStreamCommand for Clip { - fn name(&self) -> &str { - "clip" - } - - fn signature(&self) -> Signature { - Signature::build("clip") - } - - fn usage(&self) -> &str { - "Copy the contents of the pipeline to the copy/paste buffer." - } - - fn run_with_actions(&self, args: CommandArgs) -> Result { - clip(args) - } - - fn examples(&self) -> Vec { - vec![ - Example { - description: "Save text to the clipboard", - example: "echo 'secret value' | clip", - result: None, - }, - Example { - description: "Save numbers to the clipboard", - example: "random integer 10000000..99999999 | clip", - result: None, - }, - ] - } -} - -pub fn clip(args: CommandArgs) -> Result { - let input = args.input; - let name = args.call_info.name_tag; - let values: Vec = input.collect(); - - if let Ok(mut clip_context) = Clipboard::new() { - let mut new_copy_data = String::new(); - - if !values.is_empty() { - let mut first = true; - for i in &values { - if !first { - new_copy_data.push('\n'); - } else { - first = false; - } - - let string: String = i.convert_to_string(); - if string.is_empty() { - return Err(ShellError::labeled_error( - "Unable to convert to string", - "Unable to convert to string", - name, - )); - } - - new_copy_data.push_str(&string); - } - } - - match clip_context.set_text(new_copy_data) { - Ok(_) => {} - Err(_) => { - return Err(ShellError::labeled_error( - "Could not set contents of clipboard", - "could not set contents of clipboard", - name, - )); - } - } - } else { - return Err(ShellError::labeled_error( - "Could not open clipboard", - "could not open clipboard", - name, - )); - } - Ok(ActionStream::empty()) -} - -#[cfg(test)] -mod tests { - use super::Clip; - use super::ShellError; - - #[test] - fn examples_work_as_expected() -> Result<(), ShellError> { - use crate::examples::test as test_examples; - - test_examples(Clip {}) - } -} diff --git a/crates/nu-command/src/commands/platform/mod.rs b/crates/nu-command/src/commands/platform/mod.rs index 9bc0133852..03734919bb 100644 --- a/crates/nu-command/src/commands/platform/mod.rs +++ b/crates/nu-command/src/commands/platform/mod.rs @@ -1,13 +1,9 @@ mod ansi; mod benchmark; mod clear; -#[cfg(feature = "clipboard-cli")] -mod clip; mod du; mod exec; mod kill; -#[cfg(feature = "clipboard-cli")] -mod paste; mod pwd; mod run_external; mod sleep; @@ -17,13 +13,9 @@ mod which_; pub use ansi::*; pub use benchmark::Benchmark; pub use clear::Clear; -#[cfg(feature = "clipboard-cli")] -pub use clip::Clip; pub use du::Du; pub use exec::Exec; pub use kill::Kill; -#[cfg(feature = "clipboard-cli")] -pub use paste::Paste; pub use pwd::Pwd; pub use run_external::RunExternalCommand; pub use sleep::Sleep; diff --git a/crates/nu-command/src/commands/platform/paste.rs b/crates/nu-command/src/commands/platform/paste.rs deleted file mode 100644 index 2927a7eb76..0000000000 --- a/crates/nu-command/src/commands/platform/paste.rs +++ /dev/null @@ -1,61 +0,0 @@ -use crate::prelude::*; - -use nu_engine::WholeStreamCommand; -use nu_errors::ShellError; -use nu_protocol::{Primitive, ReturnSuccess, Signature, UntaggedValue}; - -use arboard::Clipboard; - -pub struct Paste; - -impl WholeStreamCommand for Paste { - fn name(&self) -> &str { - "paste" - } - - fn signature(&self) -> Signature { - Signature::build("paste") - } - - fn usage(&self) -> &str { - "Paste contents from the clipboard" - } - - fn run_with_actions(&self, args: CommandArgs) -> Result { - paste(args) - } - - fn examples(&self) -> Vec { - vec![Example { - description: "Paste text from your clipboard", - example: "echo 'secret value' | clip | paste", - result: Some(vec![UntaggedValue::Primitive(Primitive::String( - "secret value".to_owned(), - )) - .into_value(Tag::default())]), - }] - } -} - -pub fn paste(args: CommandArgs) -> Result { - let name = args.call_info.name_tag; - - if let Ok(mut clip_context) = Clipboard::new() { - match clip_context.get_text() { - Ok(out) => Ok(ActionStream::one(ReturnSuccess::value( - UntaggedValue::Primitive(Primitive::String(out)), - ))), - Err(_) => Err(ShellError::labeled_error( - "Could not get contents of clipboard", - "could not get contents of clipboard", - name, - )), - } - } else { - Err(ShellError::labeled_error( - "Could not open clipboard", - "could not open clipboard", - name, - )) - } -} diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs index 7d814f6162..9d091957ee 100644 --- a/crates/nu-command/src/default_context.rs +++ b/crates/nu-command/src/default_context.rs @@ -366,14 +366,6 @@ pub fn create_default_context(interactive: bool) -> Result ScraperSelector { mod tests { use super::*; - const SIMPLE_LIST: &'static str = r#" + const SIMPLE_LIST: &str = r#"
  • Coffee
  • Tea