From 59440d35c0c766ffcabf359a2157a591082ffade Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Mar 2022 13:06:29 +0000 Subject: [PATCH 1/5] build(deps): bump clap from 3.0.10 to 3.1.6 Bumps [clap](https://github.com/clap-rs/clap) from 3.0.10 to 3.1.6. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v3.0.10...v3.1.6) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 219 +++++++++++++++++++----------------- Cargo.toml | 2 +- src/uu/arch/Cargo.toml | 2 +- src/uu/base32/Cargo.toml | 2 +- src/uu/basename/Cargo.toml | 2 +- src/uu/basenc/Cargo.toml | 2 +- src/uu/cat/Cargo.toml | 2 +- src/uu/chcon/Cargo.toml | 2 +- src/uu/chgrp/Cargo.toml | 2 +- src/uu/chmod/Cargo.toml | 2 +- src/uu/chown/Cargo.toml | 2 +- src/uu/chroot/Cargo.toml | 2 +- src/uu/cksum/Cargo.toml | 2 +- src/uu/comm/Cargo.toml | 2 +- src/uu/cp/Cargo.toml | 2 +- src/uu/csplit/Cargo.toml | 2 +- src/uu/cut/Cargo.toml | 2 +- src/uu/date/Cargo.toml | 2 +- src/uu/dd/Cargo.toml | 2 +- src/uu/df/Cargo.toml | 2 +- src/uu/dircolors/Cargo.toml | 2 +- src/uu/dirname/Cargo.toml | 2 +- src/uu/du/Cargo.toml | 2 +- src/uu/echo/Cargo.toml | 2 +- src/uu/env/Cargo.toml | 2 +- src/uu/expand/Cargo.toml | 2 +- src/uu/expr/Cargo.toml | 2 +- src/uu/factor/Cargo.toml | 2 +- src/uu/false/Cargo.toml | 2 +- src/uu/fmt/Cargo.toml | 2 +- src/uu/fold/Cargo.toml | 2 +- src/uu/groups/Cargo.toml | 2 +- src/uu/hashsum/Cargo.toml | 2 +- src/uu/head/Cargo.toml | 2 +- src/uu/hostid/Cargo.toml | 2 +- src/uu/hostname/Cargo.toml | 2 +- src/uu/id/Cargo.toml | 2 +- src/uu/install/Cargo.toml | 2 +- src/uu/join/Cargo.toml | 2 +- src/uu/kill/Cargo.toml | 2 +- src/uu/link/Cargo.toml | 2 +- src/uu/ln/Cargo.toml | 2 +- src/uu/logname/Cargo.toml | 2 +- src/uu/ls/Cargo.toml | 2 +- src/uu/mkdir/Cargo.toml | 2 +- src/uu/mkfifo/Cargo.toml | 2 +- src/uu/mknod/Cargo.toml | 2 +- src/uu/mktemp/Cargo.toml | 2 +- src/uu/more/Cargo.toml | 2 +- src/uu/mv/Cargo.toml | 2 +- src/uu/nice/Cargo.toml | 2 +- src/uu/nl/Cargo.toml | 2 +- src/uu/nohup/Cargo.toml | 2 +- src/uu/nproc/Cargo.toml | 2 +- src/uu/numfmt/Cargo.toml | 2 +- src/uu/od/Cargo.toml | 2 +- src/uu/paste/Cargo.toml | 2 +- src/uu/pathchk/Cargo.toml | 2 +- src/uu/pinky/Cargo.toml | 2 +- src/uu/pr/Cargo.toml | 2 +- src/uu/printenv/Cargo.toml | 2 +- src/uu/printf/Cargo.toml | 2 +- src/uu/ptx/Cargo.toml | 2 +- src/uu/pwd/Cargo.toml | 2 +- src/uu/readlink/Cargo.toml | 2 +- src/uu/realpath/Cargo.toml | 2 +- src/uu/relpath/Cargo.toml | 2 +- src/uu/rm/Cargo.toml | 2 +- src/uu/rmdir/Cargo.toml | 2 +- src/uu/runcon/Cargo.toml | 2 +- src/uu/seq/Cargo.toml | 2 +- src/uu/shred/Cargo.toml | 2 +- src/uu/shuf/Cargo.toml | 2 +- src/uu/sleep/Cargo.toml | 2 +- src/uu/sort/Cargo.toml | 2 +- src/uu/split/Cargo.toml | 2 +- src/uu/stat/Cargo.toml | 2 +- src/uu/stdbuf/Cargo.toml | 2 +- src/uu/sum/Cargo.toml | 2 +- src/uu/sync/Cargo.toml | 2 +- src/uu/tac/Cargo.toml | 2 +- src/uu/tail/Cargo.toml | 2 +- src/uu/tee/Cargo.toml | 2 +- src/uu/test/Cargo.toml | 2 +- src/uu/timeout/Cargo.toml | 2 +- src/uu/touch/Cargo.toml | 2 +- src/uu/tr/Cargo.toml | 2 +- src/uu/true/Cargo.toml | 2 +- src/uu/truncate/Cargo.toml | 2 +- src/uu/tsort/Cargo.toml | 2 +- src/uu/tty/Cargo.toml | 2 +- src/uu/uname/Cargo.toml | 2 +- src/uu/unexpand/Cargo.toml | 2 +- src/uu/uniq/Cargo.toml | 2 +- src/uu/unlink/Cargo.toml | 2 +- src/uu/uptime/Cargo.toml | 2 +- src/uu/users/Cargo.toml | 2 +- src/uu/wc/Cargo.toml | 2 +- src/uu/who/Cargo.toml | 2 +- src/uu/whoami/Cargo.toml | 2 +- src/uu/yes/Cargo.toml | 2 +- src/uucore/Cargo.toml | 4 +- 102 files changed, 216 insertions(+), 207 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a4e46ba9934..a944712b971 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -280,9 +280,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.0.10" +version = "3.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a30c3bf9ff12dfe5dae53f0a96e0febcd18420d1c0e7fad77796d9d5c4b5375" +checksum = "d8c93436c21e4698bacadf42917db28b23017027a4deccb35dbe47a7e7840123" dependencies = [ "atty", "bitflags", @@ -292,7 +292,7 @@ dependencies = [ "strsim 0.10.0", "termcolor", "terminal_size", - "textwrap 0.14.2", + "textwrap 0.15.0", ] [[package]] @@ -301,7 +301,7 @@ version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d044e9db8cd0f68191becdeb5246b7462e4cf0c069b19ae00d1bf3fa9889498d" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", ] [[package]] @@ -331,7 +331,7 @@ version = "0.0.12" dependencies = [ "atty", "chrono", - "clap 3.0.10", + "clap 3.1.6", "clap_complete", "conv", "filetime", @@ -2122,6 +2122,15 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "textwrap" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" +dependencies = [ + "terminal_size", +] + [[package]] name = "thiserror" version = "1.0.30" @@ -2307,7 +2316,7 @@ checksum = "7cf7d77f457ef8dfa11e4cd5933c5ddb5dc52a94664071951219a97710f0a32b" name = "uu_arch" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "platform-info", "uucore", ] @@ -2316,7 +2325,7 @@ dependencies = [ name = "uu_base32" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -2332,7 +2341,7 @@ dependencies = [ name = "uu_basename" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -2340,7 +2349,7 @@ dependencies = [ name = "uu_basenc" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uu_base32", "uucore", ] @@ -2350,7 +2359,7 @@ name = "uu_cat" version = "0.0.12" dependencies = [ "atty", - "clap 3.0.10", + "clap 3.1.6", "nix 0.23.1", "thiserror", "unix_socket", @@ -2362,7 +2371,7 @@ dependencies = [ name = "uu_chcon" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "fts-sys", "libc", "selinux", @@ -2374,7 +2383,7 @@ dependencies = [ name = "uu_chgrp" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -2382,7 +2391,7 @@ dependencies = [ name = "uu_chmod" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "uucore", ] @@ -2391,7 +2400,7 @@ dependencies = [ name = "uu_chown" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -2399,7 +2408,7 @@ dependencies = [ name = "uu_chroot" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -2407,7 +2416,7 @@ dependencies = [ name = "uu_cksum" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "uucore", ] @@ -2416,7 +2425,7 @@ dependencies = [ name = "uu_comm" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "uucore", ] @@ -2425,7 +2434,7 @@ dependencies = [ name = "uu_cp" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "exacl", "filetime", "ioctl-sys", @@ -2442,7 +2451,7 @@ dependencies = [ name = "uu_csplit" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "regex", "thiserror", "uucore", @@ -2454,7 +2463,7 @@ version = "0.0.12" dependencies = [ "atty", "bstr", - "clap 3.0.10", + "clap 3.1.6", "memchr 2.4.1", "uucore", ] @@ -2464,7 +2473,7 @@ name = "uu_date" version = "0.0.12" dependencies = [ "chrono", - "clap 3.0.10", + "clap 3.1.6", "libc", "uucore", "winapi 0.3.9", @@ -2475,7 +2484,7 @@ name = "uu_dd" version = "0.0.12" dependencies = [ "byte-unit", - "clap 3.0.10", + "clap 3.1.6", "gcd", "libc", "signal-hook", @@ -2487,7 +2496,7 @@ dependencies = [ name = "uu_df" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "number_prefix", "uucore", ] @@ -2496,7 +2505,7 @@ dependencies = [ name = "uu_dircolors" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "glob", "uucore", ] @@ -2505,7 +2514,7 @@ dependencies = [ name = "uu_dirname" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "uucore", ] @@ -2515,7 +2524,7 @@ name = "uu_du" version = "0.0.12" dependencies = [ "chrono", - "clap 3.0.10", + "clap 3.1.6", "uucore", "winapi 0.3.9", ] @@ -2524,7 +2533,7 @@ dependencies = [ name = "uu_echo" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -2532,7 +2541,7 @@ dependencies = [ name = "uu_env" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "rust-ini", "uucore", @@ -2542,7 +2551,7 @@ dependencies = [ name = "uu_expand" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "unicode-width", "uucore", ] @@ -2551,7 +2560,7 @@ dependencies = [ name = "uu_expr" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "num-bigint", "num-traits", @@ -2563,7 +2572,7 @@ dependencies = [ name = "uu_factor" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "coz", "num-traits", "paste 0.1.18", @@ -2577,7 +2586,7 @@ dependencies = [ name = "uu_false" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -2585,7 +2594,7 @@ dependencies = [ name = "uu_fmt" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "unicode-width", "uucore", @@ -2595,7 +2604,7 @@ dependencies = [ name = "uu_fold" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -2603,7 +2612,7 @@ dependencies = [ name = "uu_groups" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -2613,7 +2622,7 @@ version = "0.0.12" dependencies = [ "blake2b_simd", "blake3", - "clap 3.0.10", + "clap 3.1.6", "digest", "hex", "libc", @@ -2631,7 +2640,7 @@ dependencies = [ name = "uu_head" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "memchr 2.4.1", "uucore", ] @@ -2640,7 +2649,7 @@ dependencies = [ name = "uu_hostid" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "uucore", ] @@ -2649,7 +2658,7 @@ dependencies = [ name = "uu_hostname" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "hostname", "libc", "uucore", @@ -2660,7 +2669,7 @@ dependencies = [ name = "uu_id" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "selinux", "uucore", ] @@ -2669,7 +2678,7 @@ dependencies = [ name = "uu_install" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "file_diff", "filetime", "libc", @@ -2681,7 +2690,7 @@ dependencies = [ name = "uu_join" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "memchr 2.4.1", "uucore", ] @@ -2690,7 +2699,7 @@ dependencies = [ name = "uu_kill" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "uucore", ] @@ -2699,7 +2708,7 @@ dependencies = [ name = "uu_link" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "uucore", ] @@ -2708,7 +2717,7 @@ dependencies = [ name = "uu_ln" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "uucore", ] @@ -2717,7 +2726,7 @@ dependencies = [ name = "uu_logname" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "uucore", ] @@ -2728,7 +2737,7 @@ version = "0.0.12" dependencies = [ "atty", "chrono", - "clap 3.0.10", + "clap 3.1.6", "glob", "lazy_static", "lscolors", @@ -2745,7 +2754,7 @@ dependencies = [ name = "uu_mkdir" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "uucore", ] @@ -2754,7 +2763,7 @@ dependencies = [ name = "uu_mkfifo" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "uucore", ] @@ -2763,7 +2772,7 @@ dependencies = [ name = "uu_mknod" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "uucore", ] @@ -2772,7 +2781,7 @@ dependencies = [ name = "uu_mktemp" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "rand", "tempfile", "uucore", @@ -2783,7 +2792,7 @@ name = "uu_more" version = "0.0.12" dependencies = [ "atty", - "clap 3.0.10", + "clap 3.1.6", "crossterm", "nix 0.23.1", "redox_syscall", @@ -2797,7 +2806,7 @@ dependencies = [ name = "uu_mv" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "fs_extra", "uucore", ] @@ -2806,7 +2815,7 @@ dependencies = [ name = "uu_nice" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "nix 0.23.1", "uucore", @@ -2817,7 +2826,7 @@ name = "uu_nl" version = "0.0.12" dependencies = [ "aho-corasick", - "clap 3.0.10", + "clap 3.1.6", "libc", "memchr 2.4.1", "regex", @@ -2830,7 +2839,7 @@ name = "uu_nohup" version = "0.0.12" dependencies = [ "atty", - "clap 3.0.10", + "clap 3.1.6", "libc", "uucore", ] @@ -2839,7 +2848,7 @@ dependencies = [ name = "uu_nproc" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "num_cpus", "uucore", @@ -2849,7 +2858,7 @@ dependencies = [ name = "uu_numfmt" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -2858,7 +2867,7 @@ name = "uu_od" version = "0.0.12" dependencies = [ "byteorder", - "clap 3.0.10", + "clap 3.1.6", "half", "libc", "uucore", @@ -2868,7 +2877,7 @@ dependencies = [ name = "uu_paste" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -2876,7 +2885,7 @@ dependencies = [ name = "uu_pathchk" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "uucore", ] @@ -2885,7 +2894,7 @@ dependencies = [ name = "uu_pinky" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -2894,7 +2903,7 @@ name = "uu_pr" version = "0.0.12" dependencies = [ "chrono", - "clap 3.0.10", + "clap 3.1.6", "itertools", "quick-error", "regex", @@ -2905,7 +2914,7 @@ dependencies = [ name = "uu_printenv" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -2913,7 +2922,7 @@ dependencies = [ name = "uu_printf" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "itertools", "uucore", ] @@ -2923,7 +2932,7 @@ name = "uu_ptx" version = "0.0.12" dependencies = [ "aho-corasick", - "clap 3.0.10", + "clap 3.1.6", "libc", "memchr 2.4.1", "regex", @@ -2935,7 +2944,7 @@ dependencies = [ name = "uu_pwd" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -2943,7 +2952,7 @@ dependencies = [ name = "uu_readlink" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "uucore", ] @@ -2952,7 +2961,7 @@ dependencies = [ name = "uu_realpath" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -2960,7 +2969,7 @@ dependencies = [ name = "uu_relpath" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -2968,7 +2977,7 @@ dependencies = [ name = "uu_rm" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "remove_dir_all", "uucore", "walkdir", @@ -2979,7 +2988,7 @@ dependencies = [ name = "uu_rmdir" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "uucore", ] @@ -2988,7 +2997,7 @@ dependencies = [ name = "uu_runcon" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "fts-sys", "libc", "selinux", @@ -3001,7 +3010,7 @@ name = "uu_seq" version = "0.0.12" dependencies = [ "bigdecimal", - "clap 3.0.10", + "clap 3.1.6", "num-bigint", "num-traits", "uucore", @@ -3011,7 +3020,7 @@ dependencies = [ name = "uu_shred" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "rand", "uucore", @@ -3021,7 +3030,7 @@ dependencies = [ name = "uu_shuf" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "rand", "rand_core", "uucore", @@ -3031,7 +3040,7 @@ dependencies = [ name = "uu_sleep" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -3040,7 +3049,7 @@ name = "uu_sort" version = "0.0.12" dependencies = [ "binary-heap-plus", - "clap 3.0.10", + "clap 3.1.6", "compare", "ctrlc", "fnv", @@ -3058,7 +3067,7 @@ dependencies = [ name = "uu_split" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "memchr 2.4.1", "uucore", ] @@ -3067,7 +3076,7 @@ dependencies = [ name = "uu_stat" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -3075,7 +3084,7 @@ dependencies = [ name = "uu_stdbuf" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "tempfile", "uu_stdbuf_libstdbuf", "uucore", @@ -3095,7 +3104,7 @@ dependencies = [ name = "uu_sum" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -3103,7 +3112,7 @@ dependencies = [ name = "uu_sync" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "uucore", "winapi 0.3.9", @@ -3113,7 +3122,7 @@ dependencies = [ name = "uu_tac" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "memchr 2.4.1", "memmap2", "regex", @@ -3124,7 +3133,7 @@ dependencies = [ name = "uu_tail" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "nix 0.23.1", "redox_syscall", @@ -3136,7 +3145,7 @@ dependencies = [ name = "uu_tee" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "retain_mut", "uucore", @@ -3146,7 +3155,7 @@ dependencies = [ name = "uu_test" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "redox_syscall", "uucore", @@ -3156,7 +3165,7 @@ dependencies = [ name = "uu_timeout" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "nix 0.23.1", "uucore", @@ -3166,7 +3175,7 @@ dependencies = [ name = "uu_touch" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "filetime", "time", "uucore", @@ -3177,7 +3186,7 @@ dependencies = [ name = "uu_tr" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "nom", "uucore", ] @@ -3186,7 +3195,7 @@ dependencies = [ name = "uu_true" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -3194,7 +3203,7 @@ dependencies = [ name = "uu_truncate" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -3202,7 +3211,7 @@ dependencies = [ name = "uu_tsort" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -3211,7 +3220,7 @@ name = "uu_tty" version = "0.0.12" dependencies = [ "atty", - "clap 3.0.10", + "clap 3.1.6", "libc", "uucore", ] @@ -3220,7 +3229,7 @@ dependencies = [ name = "uu_uname" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "platform-info", "uucore", ] @@ -3229,7 +3238,7 @@ dependencies = [ name = "uu_unexpand" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "unicode-width", "uucore", ] @@ -3238,7 +3247,7 @@ dependencies = [ name = "uu_uniq" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "strum", "strum_macros", "uucore", @@ -3248,7 +3257,7 @@ dependencies = [ name = "uu_unlink" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -3257,7 +3266,7 @@ name = "uu_uptime" version = "0.0.12" dependencies = [ "chrono", - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -3265,7 +3274,7 @@ dependencies = [ name = "uu_users" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -3274,7 +3283,7 @@ name = "uu_wc" version = "0.0.12" dependencies = [ "bytecount", - "clap 3.0.10", + "clap 3.1.6", "libc", "nix 0.23.1", "unicode-width", @@ -3286,7 +3295,7 @@ dependencies = [ name = "uu_who" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "uucore", ] @@ -3294,7 +3303,7 @@ dependencies = [ name = "uu_whoami" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "libc", "uucore", "winapi 0.3.9", @@ -3304,7 +3313,7 @@ dependencies = [ name = "uu_yes" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "nix 0.23.1", "uucore", ] @@ -3313,7 +3322,7 @@ dependencies = [ name = "uucore" version = "0.0.12" dependencies = [ - "clap 3.0.10", + "clap 3.1.6", "data-encoding", "data-encoding-macro", "dns-lookup", diff --git a/Cargo.toml b/Cargo.toml index 43797e71e74..7668a27a07e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -245,7 +245,7 @@ test = [ "uu_test" ] [workspace] [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } clap_complete = "3.0" phf = "0.10.1" lazy_static = { version="1.3" } diff --git a/src/uu/arch/Cargo.toml b/src/uu/arch/Cargo.toml index 207100f59a2..96f6c4c8a42 100644 --- a/src/uu/arch/Cargo.toml +++ b/src/uu/arch/Cargo.toml @@ -16,7 +16,7 @@ path = "src/arch.rs" [dependencies] platform-info = "0.2" -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } [[bin]] diff --git a/src/uu/base32/Cargo.toml b/src/uu/base32/Cargo.toml index 0b695f0aa26..d61477fee8d 100644 --- a/src/uu/base32/Cargo.toml +++ b/src/uu/base32/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/base32.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features = ["encoding"] } [[bin]] diff --git a/src/uu/basename/Cargo.toml b/src/uu/basename/Cargo.toml index 6426e5046cf..3994331092c 100644 --- a/src/uu/basename/Cargo.toml +++ b/src/uu/basename/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/basename.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } [[bin]] diff --git a/src/uu/basenc/Cargo.toml b/src/uu/basenc/Cargo.toml index a0f652cee26..638c7e26c9f 100644 --- a/src/uu/basenc/Cargo.toml +++ b/src/uu/basenc/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/basenc.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features = ["encoding"] } uu_base32 = { version=">=0.0.8", package="uu_base32", path="../base32"} diff --git a/src/uu/cat/Cargo.toml b/src/uu/cat/Cargo.toml index 3eef5598bd4..f0a26fdac08 100644 --- a/src/uu/cat/Cargo.toml +++ b/src/uu/cat/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/cat.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } thiserror = "1.0" atty = "0.2" uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["fs", "pipes"] } diff --git a/src/uu/chcon/Cargo.toml b/src/uu/chcon/Cargo.toml index 75ce3fbd954..4a001b8852e 100644 --- a/src/uu/chcon/Cargo.toml +++ b/src/uu/chcon/Cargo.toml @@ -14,7 +14,7 @@ edition = "2018" path = "src/chcon.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version = ">=0.0.9", package="uucore", path="../../uucore", features=["entries", "fs", "perms"] } selinux = { version = "0.2" } fts-sys = { version = "0.2" } diff --git a/src/uu/chgrp/Cargo.toml b/src/uu/chgrp/Cargo.toml index ff60de8368f..d06c9adfac7 100644 --- a/src/uu/chgrp/Cargo.toml +++ b/src/uu/chgrp/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/chgrp.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["entries", "fs", "perms"] } [[bin]] diff --git a/src/uu/chmod/Cargo.toml b/src/uu/chmod/Cargo.toml index b2eb4257412..da23c62ef4b 100644 --- a/src/uu/chmod/Cargo.toml +++ b/src/uu/chmod/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/chmod.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.42" uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["fs", "mode"] } diff --git a/src/uu/chown/Cargo.toml b/src/uu/chown/Cargo.toml index b18310646be..710a7b8500e 100644 --- a/src/uu/chown/Cargo.toml +++ b/src/uu/chown/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/chown.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["entries", "fs", "perms"] } [[bin]] diff --git a/src/uu/chroot/Cargo.toml b/src/uu/chroot/Cargo.toml index d6a9dd0803f..a46f46a9043 100644 --- a/src/uu/chroot/Cargo.toml +++ b/src/uu/chroot/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/chroot.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["entries"] } [[bin]] diff --git a/src/uu/cksum/Cargo.toml b/src/uu/cksum/Cargo.toml index 6643a2bab4a..8a03db6d5b6 100644 --- a/src/uu/cksum/Cargo.toml +++ b/src/uu/cksum/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/cksum.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.42" uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } diff --git a/src/uu/comm/Cargo.toml b/src/uu/comm/Cargo.toml index 58868dfc5ee..80a03bbc25d 100644 --- a/src/uu/comm/Cargo.toml +++ b/src/uu/comm/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/comm.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.42" uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } diff --git a/src/uu/cp/Cargo.toml b/src/uu/cp/Cargo.toml index ffc008503fe..46637dadf8d 100644 --- a/src/uu/cp/Cargo.toml +++ b/src/uu/cp/Cargo.toml @@ -19,7 +19,7 @@ edition = "2018" path = "src/cp.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } filetime = "0.2" libc = "0.2.85" quick-error = "2.0.1" diff --git a/src/uu/csplit/Cargo.toml b/src/uu/csplit/Cargo.toml index 89fc118ddb0..f956db9fcbd 100644 --- a/src/uu/csplit/Cargo.toml +++ b/src/uu/csplit/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/csplit.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } thiserror = "1.0" regex = "1.0.0" uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["entries", "fs"] } diff --git a/src/uu/cut/Cargo.toml b/src/uu/cut/Cargo.toml index 302f8f0c17f..fb8e75470ff 100644 --- a/src/uu/cut/Cargo.toml +++ b/src/uu/cut/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/cut.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } memchr = "2" bstr = "0.2" diff --git a/src/uu/date/Cargo.toml b/src/uu/date/Cargo.toml index 79302299275..c423bbe0f8e 100644 --- a/src/uu/date/Cargo.toml +++ b/src/uu/date/Cargo.toml @@ -16,7 +16,7 @@ path = "src/date.rs" [dependencies] chrono = "^0.4.11" -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } [target.'cfg(unix)'.dependencies] diff --git a/src/uu/dd/Cargo.toml b/src/uu/dd/Cargo.toml index 139a4845de1..414f0a0aaa8 100644 --- a/src/uu/dd/Cargo.toml +++ b/src/uu/dd/Cargo.toml @@ -16,7 +16,7 @@ path = "src/dd.rs" [dependencies] byte-unit = "4.0" -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } gcd = "2.0" libc = "0.2" uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } diff --git a/src/uu/df/Cargo.toml b/src/uu/df/Cargo.toml index 29f32c6cfc9..3e9010f1ef5 100644 --- a/src/uu/df/Cargo.toml +++ b/src/uu/df/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/df.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } number_prefix = "0.4" uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["libc", "fsext"] } diff --git a/src/uu/dircolors/Cargo.toml b/src/uu/dircolors/Cargo.toml index 28a520eef89..ebc9d5cd9a5 100644 --- a/src/uu/dircolors/Cargo.toml +++ b/src/uu/dircolors/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/dircolors.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } glob = "0.3.0" uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } diff --git a/src/uu/dirname/Cargo.toml b/src/uu/dirname/Cargo.toml index 9b85edac063..980fee8a619 100644 --- a/src/uu/dirname/Cargo.toml +++ b/src/uu/dirname/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/dirname.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.42" uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } diff --git a/src/uu/du/Cargo.toml b/src/uu/du/Cargo.toml index a6af1a3aec0..73fa5e3a5e8 100644 --- a/src/uu/du/Cargo.toml +++ b/src/uu/du/Cargo.toml @@ -16,7 +16,7 @@ path = "src/du.rs" [dependencies] chrono = "^0.4.11" -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } [target.'cfg(target_os = "windows")'.dependencies] diff --git a/src/uu/echo/Cargo.toml b/src/uu/echo/Cargo.toml index 8b8ba081904..fcfaec16071 100644 --- a/src/uu/echo/Cargo.toml +++ b/src/uu/echo/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/echo.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } [[bin]] diff --git a/src/uu/env/Cargo.toml b/src/uu/env/Cargo.toml index d5537fb541b..da9ad66d1b0 100644 --- a/src/uu/env/Cargo.toml +++ b/src/uu/env/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/env.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.42" rust-ini = "0.17.0" uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } diff --git a/src/uu/expand/Cargo.toml b/src/uu/expand/Cargo.toml index ba2cdd317ae..053a2a530a7 100644 --- a/src/uu/expand/Cargo.toml +++ b/src/uu/expand/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/expand.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } unicode-width = "0.1.5" uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } diff --git a/src/uu/expr/Cargo.toml b/src/uu/expr/Cargo.toml index 278ebe46ecd..537f7e4c4b5 100644 --- a/src/uu/expr/Cargo.toml +++ b/src/uu/expr/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/expr.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.42" num-bigint = "0.4.0" num-traits = "0.2.14" diff --git a/src/uu/factor/Cargo.toml b/src/uu/factor/Cargo.toml index aec43af762f..592867ddfdc 100644 --- a/src/uu/factor/Cargo.toml +++ b/src/uu/factor/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" num-traits = "0.2.13" # used in src/numerics.rs, which is included by build.rs [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } coz = { version = "0.1.3", optional = true } num-traits = "0.2.13" # Needs at least version 0.2.13 for "OverflowingAdd" rand = { version = "0.8", features = ["small_rng"] } diff --git a/src/uu/false/Cargo.toml b/src/uu/false/Cargo.toml index 7cbdcd41ca1..d1270262012 100644 --- a/src/uu/false/Cargo.toml +++ b/src/uu/false/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/false.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } [[bin]] diff --git a/src/uu/fmt/Cargo.toml b/src/uu/fmt/Cargo.toml index 47574b384ec..b3422d8868e 100644 --- a/src/uu/fmt/Cargo.toml +++ b/src/uu/fmt/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/fmt.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.42" unicode-width = "0.1.5" uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } diff --git a/src/uu/fold/Cargo.toml b/src/uu/fold/Cargo.toml index 40e3fceb09f..a6ffee1205c 100644 --- a/src/uu/fold/Cargo.toml +++ b/src/uu/fold/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/fold.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } [[bin]] diff --git a/src/uu/groups/Cargo.toml b/src/uu/groups/Cargo.toml index d7b3bf01f1e..bca2cc45857 100644 --- a/src/uu/groups/Cargo.toml +++ b/src/uu/groups/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/groups.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["entries", "process"] } [[bin]] diff --git a/src/uu/hashsum/Cargo.toml b/src/uu/hashsum/Cargo.toml index d0362e3a330..0122bb1161d 100644 --- a/src/uu/hashsum/Cargo.toml +++ b/src/uu/hashsum/Cargo.toml @@ -16,7 +16,7 @@ path = "src/hashsum.rs" [dependencies] digest = "0.10.1" -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } hex = "0.4.3" libc = "0.2.42" memchr = "2" diff --git a/src/uu/head/Cargo.toml b/src/uu/head/Cargo.toml index 65ac7f7cb0d..1744a498078 100644 --- a/src/uu/head/Cargo.toml +++ b/src/uu/head/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/head.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } memchr = "2" uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["ringbuffer", "lines"] } diff --git a/src/uu/hostid/Cargo.toml b/src/uu/hostid/Cargo.toml index f0013fb0504..c1eeb413aad 100644 --- a/src/uu/hostid/Cargo.toml +++ b/src/uu/hostid/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/hostid.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.42" uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } diff --git a/src/uu/hostname/Cargo.toml b/src/uu/hostname/Cargo.toml index 8f72dc40295..4214b056f88 100644 --- a/src/uu/hostname/Cargo.toml +++ b/src/uu/hostname/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/hostname.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.42" hostname = { version = "0.3", features = ["set"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["wide"] } diff --git a/src/uu/id/Cargo.toml b/src/uu/id/Cargo.toml index a0ccefbd085..ef737569171 100644 --- a/src/uu/id/Cargo.toml +++ b/src/uu/id/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/id.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["entries", "process"] } selinux = { version="0.2", optional = true } diff --git a/src/uu/install/Cargo.toml b/src/uu/install/Cargo.toml index c5ca889ec58..bed17c6e3fa 100644 --- a/src/uu/install/Cargo.toml +++ b/src/uu/install/Cargo.toml @@ -18,7 +18,7 @@ edition = "2018" path = "src/install.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } filetime = "0.2" file_diff = "1.0.0" libc = ">= 0.2" diff --git a/src/uu/join/Cargo.toml b/src/uu/join/Cargo.toml index 706b246c2ff..025307e7a20 100644 --- a/src/uu/join/Cargo.toml +++ b/src/uu/join/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/join.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } memchr = "2" diff --git a/src/uu/kill/Cargo.toml b/src/uu/kill/Cargo.toml index 46853a85d42..a542cbd31df 100644 --- a/src/uu/kill/Cargo.toml +++ b/src/uu/kill/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/kill.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.42" uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["signals"] } diff --git a/src/uu/link/Cargo.toml b/src/uu/link/Cargo.toml index 46d7d26f0ba..80b7a3d1939 100644 --- a/src/uu/link/Cargo.toml +++ b/src/uu/link/Cargo.toml @@ -16,7 +16,7 @@ path = "src/link.rs" [dependencies] libc = "0.2.42" -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } [[bin]] diff --git a/src/uu/ln/Cargo.toml b/src/uu/ln/Cargo.toml index b1f42cad0e9..32fed44a510 100644 --- a/src/uu/ln/Cargo.toml +++ b/src/uu/ln/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/ln.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.42" uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["fs"] } diff --git a/src/uu/logname/Cargo.toml b/src/uu/logname/Cargo.toml index 8e1241b3bb3..69bb32dbcec 100644 --- a/src/uu/logname/Cargo.toml +++ b/src/uu/logname/Cargo.toml @@ -16,7 +16,7 @@ path = "src/logname.rs" [dependencies] libc = "0.2.42" -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } [[bin]] diff --git a/src/uu/ls/Cargo.toml b/src/uu/ls/Cargo.toml index 6ad91e8e7b4..20b289173ea 100644 --- a/src/uu/ls/Cargo.toml +++ b/src/uu/ls/Cargo.toml @@ -16,7 +16,7 @@ path = "src/ls.rs" [dependencies] chrono = "0.4.19" -clap = { version = "3.0", features = ["wrap_help", "cargo", "env"] } +clap = { version = "3.1", features = ["wrap_help", "cargo", "env"] } unicode-width = "0.1.8" number_prefix = "0.4" term_grid = "0.1.5" diff --git a/src/uu/mkdir/Cargo.toml b/src/uu/mkdir/Cargo.toml index 4bb12e43da9..b3a6462a5f4 100644 --- a/src/uu/mkdir/Cargo.toml +++ b/src/uu/mkdir/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/mkdir.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.42" uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["fs", "mode"] } diff --git a/src/uu/mkfifo/Cargo.toml b/src/uu/mkfifo/Cargo.toml index 473cc01437c..2a849fd3bc2 100644 --- a/src/uu/mkfifo/Cargo.toml +++ b/src/uu/mkfifo/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/mkfifo.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.42" uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } diff --git a/src/uu/mknod/Cargo.toml b/src/uu/mknod/Cargo.toml index 9bed05fd49a..c3eef112985 100644 --- a/src/uu/mknod/Cargo.toml +++ b/src/uu/mknod/Cargo.toml @@ -16,7 +16,7 @@ name = "uu_mknod" path = "src/mknod.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "^0.2.42" uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["mode"] } diff --git a/src/uu/mktemp/Cargo.toml b/src/uu/mktemp/Cargo.toml index 1ae00fa6f67..0fe2ea07d0b 100644 --- a/src/uu/mktemp/Cargo.toml +++ b/src/uu/mktemp/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/mktemp.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } rand = "0.8" tempfile = "3" uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } diff --git a/src/uu/more/Cargo.toml b/src/uu/more/Cargo.toml index 6975a3eccab..a62033ffe15 100644 --- a/src/uu/more/Cargo.toml +++ b/src/uu/more/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/more.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version = ">=0.0.7", package = "uucore", path = "../../uucore" } crossterm = ">=0.19" atty = "0.2" diff --git a/src/uu/mv/Cargo.toml b/src/uu/mv/Cargo.toml index 79012b5e0dc..3d7ae0791b8 100644 --- a/src/uu/mv/Cargo.toml +++ b/src/uu/mv/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/mv.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } fs_extra = "1.1.0" uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } diff --git a/src/uu/nice/Cargo.toml b/src/uu/nice/Cargo.toml index fc42cb801f1..e814cd4665f 100644 --- a/src/uu/nice/Cargo.toml +++ b/src/uu/nice/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/nice.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.42" nix = "0.23.1" uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } diff --git a/src/uu/nl/Cargo.toml b/src/uu/nl/Cargo.toml index 9ce451f27e1..59125560931 100644 --- a/src/uu/nl/Cargo.toml +++ b/src/uu/nl/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/nl.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } aho-corasick = "0.7.3" libc = "0.2.42" memchr = "2.2.0" diff --git a/src/uu/nohup/Cargo.toml b/src/uu/nohup/Cargo.toml index a19de6eb5b3..dd76cb7039f 100644 --- a/src/uu/nohup/Cargo.toml +++ b/src/uu/nohup/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/nohup.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.42" atty = "0.2" uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["fs"] } diff --git a/src/uu/nproc/Cargo.toml b/src/uu/nproc/Cargo.toml index ef9ee5b2a6c..8620b9cf29a 100644 --- a/src/uu/nproc/Cargo.toml +++ b/src/uu/nproc/Cargo.toml @@ -17,7 +17,7 @@ path = "src/nproc.rs" [dependencies] libc = "0.2.42" num_cpus = "1.10" -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["fs"] } [[bin]] diff --git a/src/uu/numfmt/Cargo.toml b/src/uu/numfmt/Cargo.toml index 8afc04f11b6..a2160becab3 100644 --- a/src/uu/numfmt/Cargo.toml +++ b/src/uu/numfmt/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/numfmt.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } [[bin]] diff --git a/src/uu/od/Cargo.toml b/src/uu/od/Cargo.toml index 10609ae47b5..a7d614d32ec 100644 --- a/src/uu/od/Cargo.toml +++ b/src/uu/od/Cargo.toml @@ -16,7 +16,7 @@ path = "src/od.rs" [dependencies] byteorder = "1.3.2" -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } half = "1.6" libc = "0.2.42" uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } diff --git a/src/uu/paste/Cargo.toml b/src/uu/paste/Cargo.toml index c37c7a939f7..a2e3049b21c 100644 --- a/src/uu/paste/Cargo.toml +++ b/src/uu/paste/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/paste.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } [[bin]] diff --git a/src/uu/pathchk/Cargo.toml b/src/uu/pathchk/Cargo.toml index 982a4ea8958..2877efca38e 100644 --- a/src/uu/pathchk/Cargo.toml +++ b/src/uu/pathchk/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/pathchk.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.42" uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } diff --git a/src/uu/pinky/Cargo.toml b/src/uu/pinky/Cargo.toml index 3bbffe98139..57eabb874ba 100644 --- a/src/uu/pinky/Cargo.toml +++ b/src/uu/pinky/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/pinky.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["utmpx", "entries"] } [[bin]] diff --git a/src/uu/pr/Cargo.toml b/src/uu/pr/Cargo.toml index 100f379987d..e5e6ddcb8d3 100644 --- a/src/uu/pr/Cargo.toml +++ b/src/uu/pr/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/pr.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.7", package="uucore", path="../../uucore", features=["entries"] } chrono = "0.4.19" quick-error = "2.0.1" diff --git a/src/uu/printenv/Cargo.toml b/src/uu/printenv/Cargo.toml index ff8e6ffe179..bb684a1c4a2 100644 --- a/src/uu/printenv/Cargo.toml +++ b/src/uu/printenv/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/printenv.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } [[bin]] diff --git a/src/uu/printf/Cargo.toml b/src/uu/printf/Cargo.toml index 98257f9aa01..aaeb1583e65 100644 --- a/src/uu/printf/Cargo.toml +++ b/src/uu/printf/Cargo.toml @@ -18,7 +18,7 @@ edition = "2018" path = "src/printf.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } itertools = "0.10.0" uucore = { version = ">=0.0.11", package = "uucore", path = "../../uucore", features = ["memo"] } diff --git a/src/uu/ptx/Cargo.toml b/src/uu/ptx/Cargo.toml index 90285ebf309..913ea1c042f 100644 --- a/src/uu/ptx/Cargo.toml +++ b/src/uu/ptx/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/ptx.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } aho-corasick = "0.7.3" libc = "0.2.42" memchr = "2.2.0" diff --git a/src/uu/pwd/Cargo.toml b/src/uu/pwd/Cargo.toml index faf718ebd14..d6c5567e23c 100644 --- a/src/uu/pwd/Cargo.toml +++ b/src/uu/pwd/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/pwd.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } [[bin]] diff --git a/src/uu/readlink/Cargo.toml b/src/uu/readlink/Cargo.toml index 30bb7e92528..e5357ffdc27 100644 --- a/src/uu/readlink/Cargo.toml +++ b/src/uu/readlink/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/readlink.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.42" uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["fs"] } diff --git a/src/uu/realpath/Cargo.toml b/src/uu/realpath/Cargo.toml index cabd33256a6..706b73c1b77 100644 --- a/src/uu/realpath/Cargo.toml +++ b/src/uu/realpath/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/realpath.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["fs"] } [[bin]] diff --git a/src/uu/relpath/Cargo.toml b/src/uu/relpath/Cargo.toml index 29eab9ac24e..3c31e7f3e8c 100644 --- a/src/uu/relpath/Cargo.toml +++ b/src/uu/relpath/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/relpath.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["fs"] } [[bin]] diff --git a/src/uu/rm/Cargo.toml b/src/uu/rm/Cargo.toml index 2ef29d43576..1e1b2464e2e 100644 --- a/src/uu/rm/Cargo.toml +++ b/src/uu/rm/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/rm.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } walkdir = "2.2" remove_dir_all = "0.5.1" uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["fs"] } diff --git a/src/uu/rmdir/Cargo.toml b/src/uu/rmdir/Cargo.toml index 86d5031c8d5..d79e41d7f9b 100644 --- a/src/uu/rmdir/Cargo.toml +++ b/src/uu/rmdir/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/rmdir.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } libc = "0.2.42" diff --git a/src/uu/runcon/Cargo.toml b/src/uu/runcon/Cargo.toml index 5c68a8d68a9..4aec11dbf98 100644 --- a/src/uu/runcon/Cargo.toml +++ b/src/uu/runcon/Cargo.toml @@ -14,7 +14,7 @@ edition = "2018" path = "src/runcon.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version = ">=0.0.9", package="uucore", path="../../uucore", features=["entries", "fs", "perms"] } selinux = { version = "0.2" } fts-sys = { version = "0.2" } diff --git a/src/uu/seq/Cargo.toml b/src/uu/seq/Cargo.toml index fe986529d0d..ef405d53154 100644 --- a/src/uu/seq/Cargo.toml +++ b/src/uu/seq/Cargo.toml @@ -17,7 +17,7 @@ path = "src/seq.rs" [dependencies] bigdecimal = "0.3" -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } num-bigint = "0.4.0" num-traits = "0.2.14" uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["memo"] } diff --git a/src/uu/shred/Cargo.toml b/src/uu/shred/Cargo.toml index c73e0741bed..68f28797325 100644 --- a/src/uu/shred/Cargo.toml +++ b/src/uu/shred/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/shred.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.42" rand = "0.8" uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } diff --git a/src/uu/shuf/Cargo.toml b/src/uu/shuf/Cargo.toml index ab74e08b8d0..37c84da8557 100644 --- a/src/uu/shuf/Cargo.toml +++ b/src/uu/shuf/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/shuf.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } rand = "0.8" rand_core = "0.6" uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } diff --git a/src/uu/sleep/Cargo.toml b/src/uu/sleep/Cargo.toml index 7f5413a3f0b..fc91d43b6c3 100644 --- a/src/uu/sleep/Cargo.toml +++ b/src/uu/sleep/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/sleep.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } [[bin]] diff --git a/src/uu/sort/Cargo.toml b/src/uu/sort/Cargo.toml index 12b171b74d9..2adf49c447b 100644 --- a/src/uu/sort/Cargo.toml +++ b/src/uu/sort/Cargo.toml @@ -16,7 +16,7 @@ path = "src/sort.rs" [dependencies] binary-heap-plus = "0.4.1" -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } compare = "0.1.0" ctrlc = { version = "3.0", features = ["termination"] } fnv = "1.0.7" diff --git a/src/uu/split/Cargo.toml b/src/uu/split/Cargo.toml index 233563d1c96..2f34311c106 100644 --- a/src/uu/split/Cargo.toml +++ b/src/uu/split/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/split.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } memchr = "2" uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } diff --git a/src/uu/stat/Cargo.toml b/src/uu/stat/Cargo.toml index ecf5aa5bd8a..20086bef551 100644 --- a/src/uu/stat/Cargo.toml +++ b/src/uu/stat/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/stat.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["entries", "libc", "fs", "fsext"] } [[bin]] diff --git a/src/uu/stdbuf/Cargo.toml b/src/uu/stdbuf/Cargo.toml index a977adfe697..939913c3649 100644 --- a/src/uu/stdbuf/Cargo.toml +++ b/src/uu/stdbuf/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/stdbuf.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } tempfile = "3" uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } diff --git a/src/uu/sum/Cargo.toml b/src/uu/sum/Cargo.toml index 56a4edf9a90..cca85e030d0 100644 --- a/src/uu/sum/Cargo.toml +++ b/src/uu/sum/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/sum.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } [[bin]] diff --git a/src/uu/sync/Cargo.toml b/src/uu/sync/Cargo.toml index a84d8c192fd..ce085a1d8f1 100644 --- a/src/uu/sync/Cargo.toml +++ b/src/uu/sync/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/sync.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.42" uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["wide"] } winapi = { version = "0.3", features = ["errhandlingapi", "fileapi", "handleapi", "std", "winbase", "winerror"] } diff --git a/src/uu/tac/Cargo.toml b/src/uu/tac/Cargo.toml index a430c1e53d4..89d1f65711e 100644 --- a/src/uu/tac/Cargo.toml +++ b/src/uu/tac/Cargo.toml @@ -20,7 +20,7 @@ path = "src/tac.rs" memchr = "2" memmap2 = "0.5" regex = "1" -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } [[bin]] diff --git a/src/uu/tail/Cargo.toml b/src/uu/tail/Cargo.toml index 7abc10a5603..927e2bff351 100644 --- a/src/uu/tail/Cargo.toml +++ b/src/uu/tail/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/tail.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.42" uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["ringbuffer", "lines"] } diff --git a/src/uu/tee/Cargo.toml b/src/uu/tee/Cargo.toml index b71e9b0efd4..f121d22cec8 100644 --- a/src/uu/tee/Cargo.toml +++ b/src/uu/tee/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/tee.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.42" retain_mut = "=0.1.2" # ToDO: [2021-01-01; rivy; maint/MinSRV] ~ v0.1.5 uses const generics which aren't stabilized until rust v1.51.0 uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["libc"] } diff --git a/src/uu/test/Cargo.toml b/src/uu/test/Cargo.toml index bf0558a7af6..10e411b5118 100644 --- a/src/uu/test/Cargo.toml +++ b/src/uu/test/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/test.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.42" uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } diff --git a/src/uu/timeout/Cargo.toml b/src/uu/timeout/Cargo.toml index c250381e867..9dbd872400e 100644 --- a/src/uu/timeout/Cargo.toml +++ b/src/uu/timeout/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/timeout.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.42" nix = "0.23.1" uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["process", "signals"] } diff --git a/src/uu/touch/Cargo.toml b/src/uu/touch/Cargo.toml index bb6e0dc1e80..6a2d46f845b 100644 --- a/src/uu/touch/Cargo.toml +++ b/src/uu/touch/Cargo.toml @@ -16,7 +16,7 @@ path = "src/touch.rs" [dependencies] filetime = "0.2.1" -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } time = "0.1.40" uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["libc"] } diff --git a/src/uu/tr/Cargo.toml b/src/uu/tr/Cargo.toml index 4ecfe20453b..efaa09fd1b2 100644 --- a/src/uu/tr/Cargo.toml +++ b/src/uu/tr/Cargo.toml @@ -16,7 +16,7 @@ path = "src/tr.rs" [dependencies] nom = "7.1.0" -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } [[bin]] diff --git a/src/uu/true/Cargo.toml b/src/uu/true/Cargo.toml index c737d223456..3dc1535e131 100644 --- a/src/uu/true/Cargo.toml +++ b/src/uu/true/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/true.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } [[bin]] diff --git a/src/uu/truncate/Cargo.toml b/src/uu/truncate/Cargo.toml index 3048df521f4..ce74d1367aa 100644 --- a/src/uu/truncate/Cargo.toml +++ b/src/uu/truncate/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/truncate.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } [[bin]] diff --git a/src/uu/tsort/Cargo.toml b/src/uu/tsort/Cargo.toml index 39e73f0a1c0..a107e8f27e6 100644 --- a/src/uu/tsort/Cargo.toml +++ b/src/uu/tsort/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/tsort.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } [[bin]] diff --git a/src/uu/tty/Cargo.toml b/src/uu/tty/Cargo.toml index 43a0d2edca4..30c32b45949 100644 --- a/src/uu/tty/Cargo.toml +++ b/src/uu/tty/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/tty.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.42" atty = "0.2" uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["fs"] } diff --git a/src/uu/uname/Cargo.toml b/src/uu/uname/Cargo.toml index 4a68e1b644b..7bfa19750d8 100644 --- a/src/uu/uname/Cargo.toml +++ b/src/uu/uname/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/uname.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } platform-info = "0.2" uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } diff --git a/src/uu/unexpand/Cargo.toml b/src/uu/unexpand/Cargo.toml index 86de08b9fdb..1df7061f32d 100644 --- a/src/uu/unexpand/Cargo.toml +++ b/src/uu/unexpand/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/unexpand.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } unicode-width = "0.1.5" uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } diff --git a/src/uu/uniq/Cargo.toml b/src/uu/uniq/Cargo.toml index 1fe571b0ed1..3f3840cbfef 100644 --- a/src/uu/uniq/Cargo.toml +++ b/src/uu/uniq/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/uniq.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } strum = "0.24.0" strum_macros = "0.23.1" uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } diff --git a/src/uu/unlink/Cargo.toml b/src/uu/unlink/Cargo.toml index 8d3ac6b2600..323c74dbab6 100644 --- a/src/uu/unlink/Cargo.toml +++ b/src/uu/unlink/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/unlink.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } [[bin]] diff --git a/src/uu/uptime/Cargo.toml b/src/uu/uptime/Cargo.toml index 8edb568d32f..471a1d9505b 100644 --- a/src/uu/uptime/Cargo.toml +++ b/src/uu/uptime/Cargo.toml @@ -16,7 +16,7 @@ path = "src/uptime.rs" [dependencies] chrono = "^0.4.11" -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["libc", "utmpx"] } [[bin]] diff --git a/src/uu/users/Cargo.toml b/src/uu/users/Cargo.toml index dfd6d03094d..2b155ee03c9 100644 --- a/src/uu/users/Cargo.toml +++ b/src/uu/users/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/users.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["utmpx"] } [[bin]] diff --git a/src/uu/wc/Cargo.toml b/src/uu/wc/Cargo.toml index 0e998b74e66..d21e606dd40 100644 --- a/src/uu/wc/Cargo.toml +++ b/src/uu/wc/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/wc.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["pipes"] } bytecount = "0.6.2" utf-8 = "0.7.6" diff --git a/src/uu/who/Cargo.toml b/src/uu/who/Cargo.toml index c0fd70ae84f..eac59709dab 100644 --- a/src/uu/who/Cargo.toml +++ b/src/uu/who/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/who.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["utmpx"] } [[bin]] diff --git a/src/uu/whoami/Cargo.toml b/src/uu/whoami/Cargo.toml index 151ef11416c..8b92e7e632a 100644 --- a/src/uu/whoami/Cargo.toml +++ b/src/uu/whoami/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/whoami.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["entries"] } [target.'cfg(target_os = "windows")'.dependencies] diff --git a/src/uu/yes/Cargo.toml b/src/uu/yes/Cargo.toml index 2054274f851..aad1af357c2 100644 --- a/src/uu/yes/Cargo.toml +++ b/src/uu/yes/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/yes.rs" [dependencies] -clap = { version = "3.0", features = ["wrap_help", "cargo"] } +clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["pipes"] } [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies] diff --git a/src/uucore/Cargo.toml b/src/uucore/Cargo.toml index c62e25d0bd2..1edf4c34f8f 100644 --- a/src/uucore/Cargo.toml +++ b/src/uucore/Cargo.toml @@ -17,7 +17,7 @@ path="src/lib/lib.rs" [dependencies] uucore_procs = { version=">=0.0.12", path="../uucore_procs" } -clap = "3.0" +clap = "3.1" dns-lookup = { version="1.0.5", optional=true } dunce = "1.0.0" wild = "2.0" @@ -38,7 +38,7 @@ walkdir = { version="2.3.2", optional=true } nix = { version="0.23.1", optional=true } [dev-dependencies] -clap = "3.0" +clap = "3.1" lazy_static = "1.3" [target.'cfg(target_os = "windows")'.dependencies] From 20212be4c8ce733c1247c974064c67521fddd83d Mon Sep 17 00:00:00 2001 From: Terts Diepraam Date: Thu, 17 Mar 2022 14:40:40 +0100 Subject: [PATCH 2/5] fix clippy errors related to clap upgrade from 3.0.10 to 3.1.6 --- build.rs | 2 +- src/bin/coreutils.rs | 16 +++---- src/bin/uudoc.rs | 32 +++++++------- src/uu/arch/src/arch.rs | 8 ++-- src/uu/base32/src/base32.rs | 4 +- src/uu/base32/src/base_common.rs | 12 +++--- src/uu/basename/src/basename.rs | 8 ++-- src/uu/basenc/src/basenc.rs | 10 ++--- src/uu/cat/src/cat.rs | 8 ++-- src/uu/chcon/src/chcon.rs | 12 +++--- src/uu/chgrp/src/chgrp.rs | 8 ++-- src/uu/chmod/src/chmod.rs | 8 ++-- src/uu/chown/src/chown.rs | 8 ++-- src/uu/chroot/src/chroot.rs | 15 ++++--- src/uu/cksum/src/cksum.rs | 8 ++-- src/uu/comm/src/comm.rs | 8 ++-- src/uu/cp/src/cp.rs | 10 ++--- src/uu/csplit/src/csplit.rs | 8 ++-- src/uu/cut/src/cut.rs | 8 ++-- src/uu/date/src/date.rs | 8 ++-- src/uu/dd/src/dd.rs | 20 ++++----- src/uu/df/src/df.rs | 12 +++--- src/uu/dircolors/src/dircolors.rs | 8 ++-- src/uu/dirname/src/dirname.rs | 8 ++-- src/uu/du/src/du.rs | 8 ++-- src/uu/echo/src/echo.rs | 12 +++--- src/uu/env/src/env.rs | 14 +++--- src/uu/expand/src/expand.rs | 8 ++-- src/uu/expr/src/expr.rs | 8 ++-- src/uu/factor/src/cli.rs | 8 ++-- src/uu/false/src/false.rs | 17 ++++---- src/uu/fmt/src/fmt.rs | 8 ++-- src/uu/fold/src/fold.rs | 8 ++-- src/uu/groups/src/groups.rs | 8 ++-- src/uu/hashsum/src/hashsum.rs | 22 +++++----- src/uu/head/src/head.rs | 8 ++-- src/uu/hostid/src/hostid.rs | 8 ++-- src/uu/hostname/src/hostname.rs | 8 ++-- src/uu/id/src/id.rs | 8 ++-- src/uu/install/src/install.rs | 12 +++--- src/uu/join/src/join.rs | 8 ++-- src/uu/kill/src/kill.rs | 8 ++-- src/uu/link/src/link.rs | 8 ++-- src/uu/ln/src/ln.rs | 8 ++-- src/uu/logname/src/logname.rs | 8 ++-- src/uu/ls/src/ls.rs | 12 +++--- src/uu/mkdir/src/mkdir.rs | 8 ++-- src/uu/mkfifo/src/mkfifo.rs | 8 ++-- src/uu/mknod/src/mknod.rs | 8 ++-- src/uu/mktemp/src/mktemp.rs | 8 ++-- src/uu/more/src/more.rs | 8 ++-- src/uu/mv/src/mv.rs | 8 ++-- src/uu/nice/src/nice.rs | 10 ++--- src/uu/nl/src/nl.rs | 8 ++-- src/uu/nohup/src/nohup.rs | 10 ++--- src/uu/nproc/src/nproc.rs | 8 ++-- src/uu/numfmt/src/numfmt.rs | 10 ++--- src/uu/od/src/od.rs | 18 ++++---- src/uu/paste/src/paste.rs | 8 ++-- src/uu/pathchk/src/pathchk.rs | 8 ++-- src/uu/pinky/src/pinky.rs | 8 ++-- src/uu/pr/src/pr.rs | 18 ++++---- src/uu/printenv/src/printenv.rs | 8 ++-- src/uu/printf/src/printf.rs | 8 ++-- src/uu/ptx/src/ptx.rs | 8 ++-- src/uu/pwd/src/pwd.rs | 8 ++-- src/uu/readlink/src/readlink.rs | 8 ++-- src/uu/realpath/src/realpath.rs | 8 ++-- src/uu/relpath/src/relpath.rs | 8 ++-- src/uu/rm/src/rm.rs | 8 ++-- src/uu/rmdir/src/rmdir.rs | 8 ++-- src/uu/runcon/src/runcon.rs | 14 +++--- src/uu/seq/src/seq.rs | 12 +++--- src/uu/shred/src/shred.rs | 8 ++-- src/uu/shuf/src/shuf.rs | 10 ++--- src/uu/sleep/src/sleep.rs | 8 ++-- src/uu/sort/src/sort.rs | 8 ++-- src/uu/split/src/split.rs | 8 ++-- src/uu/stat/src/stat.rs | 8 ++-- src/uu/stdbuf/src/stdbuf.rs | 16 +++---- src/uu/sum/src/sum.rs | 8 ++-- src/uu/sync/src/sync.rs | 8 ++-- src/uu/tac/src/tac.rs | 8 ++-- src/uu/tail/src/tail.rs | 8 ++-- src/uu/tee/src/tee.rs | 8 ++-- src/uu/test/src/test.rs | 8 ++-- src/uu/timeout/src/timeout.rs | 18 ++++---- src/uu/touch/src/touch.rs | 8 ++-- src/uu/tr/src/tr.rs | 10 ++--- src/uu/true/src/true.rs | 17 ++++---- src/uu/truncate/src/truncate.rs | 10 ++--- src/uu/tsort/src/tsort.rs | 8 ++-- src/uu/tty/src/tty.rs | 8 ++-- src/uu/uname/src/uname.rs | 8 ++-- src/uu/unexpand/src/unexpand.rs | 8 ++-- src/uu/uniq/src/uniq.rs | 8 ++-- src/uu/unlink/src/unlink.rs | 8 ++-- src/uu/uptime/src/uptime.rs | 8 ++-- src/uu/users/src/users.rs | 8 ++-- src/uu/wc/src/wc.rs | 8 ++-- src/uu/who/src/who.rs | 8 ++-- src/uu/whoami/src/whoami.rs | 8 ++-- src/uu/yes/src/yes.rs | 8 ++-- src/uucore/src/lib/features/perms.rs | 12 +++--- src/uucore/src/lib/mods/backup_control.rs | 52 +++++++++++------------ tests/by-util/test_link.rs | 2 +- tests/by-util/test_mknod.rs | 4 +- 107 files changed, 532 insertions(+), 529 deletions(-) diff --git a/build.rs b/build.rs index c4f135e64c8..50b8cfa3fc7 100644 --- a/build.rs +++ b/build.rs @@ -43,7 +43,7 @@ pub fn main() { let mut tf = File::create(Path::new(&out_dir).join("test_modules.rs")).unwrap(); mf.write_all( - "type UtilityMap = phf::Map<&'static str, (fn(T) -> i32, fn() -> App<'static>)>;\n\ + "type UtilityMap = phf::Map<&'static str, (fn(T) -> i32, fn() -> Command<'static>)>;\n\ \n\ fn util_map() -> UtilityMap {\n" .as_bytes(), diff --git a/src/bin/coreutils.rs b/src/bin/coreutils.rs index fcd86c93f1b..7a8986035cd 100644 --- a/src/bin/coreutils.rs +++ b/src/bin/coreutils.rs @@ -5,7 +5,7 @@ // For the full copyright and license information, please view the LICENSE // file that was distributed with this source code. -use clap::{App, Arg}; +use clap::{Arg, Command}; use clap_complete::Shell; use std::cmp; use std::ffi::OsStr; @@ -138,7 +138,7 @@ fn gen_completions( .chain(util_map.keys().copied()) .collect(); - let matches = App::new("completion") + let matches = Command::new("completion") .about("Prints completions to stdout") .arg( Arg::new("utility") @@ -155,7 +155,7 @@ fn gen_completions( let utility = matches.value_of("utility").unwrap(); let shell = matches.value_of("shell").unwrap(); - let mut app = if utility == "coreutils" { + let mut command = if utility == "coreutils" { gen_coreutils_app(util_map) } else { util_map.get(utility).unwrap().1() @@ -163,15 +163,15 @@ fn gen_completions( let shell: Shell = shell.parse().unwrap(); let bin_name = std::env::var("PROG_PREFIX").unwrap_or_default() + utility; - clap_complete::generate(shell, &mut app, bin_name, &mut io::stdout()); + clap_complete::generate(shell, &mut command, bin_name, &mut io::stdout()); io::stdout().flush().unwrap(); process::exit(0); } -fn gen_coreutils_app(util_map: &UtilityMap) -> App<'static> { - let mut app = App::new("coreutils"); +fn gen_coreutils_app(util_map: &UtilityMap) -> Command<'static> { + let mut command = Command::new("coreutils"); for (_, (_, sub_app)) in util_map { - app = app.subcommand(sub_app()); + command = command.subcommand(sub_app()); } - app + command } diff --git a/src/bin/uudoc.rs b/src/bin/uudoc.rs index a6bc16cc220..24c347fe7d2 100644 --- a/src/bin/uudoc.rs +++ b/src/bin/uudoc.rs @@ -4,7 +4,7 @@ // file that was distributed with this source code. // spell-checker:ignore tldr -use clap::App; +use clap::Command; use std::ffi::OsString; use std::fs::File; use std::io::Cursor; @@ -46,13 +46,13 @@ fn main() -> io::Result<()> { let mut utils = utils.entries().collect::>(); utils.sort(); - for (&name, (_, app)) in utils { + for (&name, (_, command)) in utils { if name == "[" { continue; } let p = format!("docs/src/utils/{}.md", name); if let Ok(f) = File::create(&p) { - write_markdown(f, &mut app(), name, &mut tldr_zip)?; + write_markdown(f, &mut command(), name, &mut tldr_zip)?; println!("Wrote to '{}'", p); } else { println!("Error writing to {}", p); @@ -64,29 +64,29 @@ fn main() -> io::Result<()> { fn write_markdown( mut w: impl Write, - app: &mut App, + command: &mut Command, name: &str, tldr_zip: &mut zip::ZipArchive, ) -> io::Result<()> { write!(w, "# {}\n\n", name)?; - write_version(&mut w, app)?; - write_usage(&mut w, app, name)?; - write_description(&mut w, app)?; - write_options(&mut w, app)?; + write_version(&mut w, command)?; + write_usage(&mut w, command, name)?; + write_description(&mut w, command)?; + write_options(&mut w, command)?; write_examples(&mut w, name, tldr_zip) } -fn write_version(w: &mut impl Write, app: &App) -> io::Result<()> { +fn write_version(w: &mut impl Write, command: &Command) -> io::Result<()> { writeln!( w, "
version: {}
", - app.render_version().split_once(' ').unwrap().1 + command.render_version().split_once(' ').unwrap().1 ) } -fn write_usage(w: &mut impl Write, app: &mut App, name: &str) -> io::Result<()> { +fn write_usage(w: &mut impl Write, command: &mut Command, name: &str) -> io::Result<()> { writeln!(w, "\n```")?; - let mut usage: String = app + let mut usage: String = command .render_usage() .lines() .skip(1) @@ -99,8 +99,8 @@ fn write_usage(w: &mut impl Write, app: &mut App, name: &str) -> io::Result<()> writeln!(w, "```") } -fn write_description(w: &mut impl Write, app: &App) -> io::Result<()> { - if let Some(about) = app.get_long_about().or_else(|| app.get_about()) { +fn write_description(w: &mut impl Write, command: &Command) -> io::Result<()> { + if let Some(about) = command.get_long_about().or_else(|| command.get_about()) { writeln!(w, "{}", about) } else { Ok(()) @@ -152,10 +152,10 @@ fn get_zip_content(archive: &mut ZipArchive, name: &str) -> Op Some(s) } -fn write_options(w: &mut impl Write, app: &App) -> io::Result<()> { +fn write_options(w: &mut impl Write, command: &Command) -> io::Result<()> { writeln!(w, "

Options

")?; write!(w, "
")?; - for arg in app.get_arguments() { + for arg in command.get_arguments() { write!(w, "
")?; let mut first = true; for l in arg.get_long_and_visible_aliases().unwrap_or_default() { diff --git a/src/uu/arch/src/arch.rs b/src/uu/arch/src/arch.rs index b588adbb95a..502e2d5a060 100644 --- a/src/uu/arch/src/arch.rs +++ b/src/uu/arch/src/arch.rs @@ -8,7 +8,7 @@ use platform_info::*; -use clap::{crate_version, App, AppSettings}; +use clap::{crate_version, Command}; use uucore::error::{FromIo, UResult}; static ABOUT: &str = "Display machine architecture"; @@ -23,10 +23,10 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .after_help(SUMMARY) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) } diff --git a/src/uu/base32/src/base32.rs b/src/uu/base32/src/base32.rs index ff1ba502adc..4260c472e68 100644 --- a/src/uu/base32/src/base32.rs +++ b/src/uu/base32/src/base32.rs @@ -7,7 +7,7 @@ use std::io::{stdin, Read}; -use clap::App; +use clap::Command; use uucore::{encoding::Format, error::UResult}; pub mod base_common; @@ -44,6 +44,6 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { ) } -pub fn uu_app<'a>() -> App<'a> { +pub fn uu_app<'a>() -> Command<'a> { base_common::base_app(ABOUT, USAGE) } diff --git a/src/uu/base32/src/base_common.rs b/src/uu/base32/src/base_common.rs index 1d4d8a19d64..100c85b1f13 100644 --- a/src/uu/base32/src/base_common.rs +++ b/src/uu/base32/src/base_common.rs @@ -18,7 +18,7 @@ use std::fs::File; use std::io::{BufReader, Stdin}; use std::path::Path; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; pub static BASE_CMD_PARSE_ERROR: i32 = 1; @@ -86,19 +86,19 @@ impl Config { } pub fn parse_base_cmd_args(args: impl uucore::Args, about: &str, usage: &str) -> UResult { - let app = base_app(about, usage); + let command = base_app(about, usage); let arg_list = args .collect_str(InvalidEncodingHandling::ConvertLossy) .accept_any(); - Config::from(&app.get_matches_from(arg_list)) + Config::from(&command.get_matches_from(arg_list)) } -pub fn base_app<'a>(about: &'a str, usage: &'a str) -> App<'a> { - App::new(uucore::util_name()) +pub fn base_app<'a>(about: &'a str, usage: &'a str) -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(about) .override_usage(format_usage(usage)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) // Format arguments. .arg( Arg::new(options::DECODE) diff --git a/src/uu/basename/src/basename.rs b/src/uu/basename/src/basename.rs index bf13fde7ebe..7b0a0a486c4 100644 --- a/src/uu/basename/src/basename.rs +++ b/src/uu/basename/src/basename.rs @@ -7,7 +7,7 @@ // spell-checker:ignore (ToDO) fullname -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::path::{is_separator, PathBuf}; use uucore::display::Quotable; use uucore::error::{UResult, UUsageError}; @@ -87,12 +87,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(SUMMARY) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::MULTIPLE) .short('a') diff --git a/src/uu/basenc/src/basenc.rs b/src/uu/basenc/src/basenc.rs index 9e48cf80c21..d47fe123ac2 100644 --- a/src/uu/basenc/src/basenc.rs +++ b/src/uu/basenc/src/basenc.rs @@ -8,7 +8,7 @@ //spell-checker:ignore (args) lsbf msbf -use clap::{App, Arg}; +use clap::{Arg, Command}; use uu_base32::base_common::{self, Config, BASE_CMD_PARSE_ERROR}; use uucore::{ @@ -40,12 +40,12 @@ const ENCODINGS: &[(&str, Format)] = &[ const USAGE: &str = "{} [OPTION]... [FILE]"; -pub fn uu_app<'a>() -> App<'a> { - let mut app = base_common::base_app(ABOUT, USAGE); +pub fn uu_app<'a>() -> Command<'a> { + let mut command = base_common::base_app(ABOUT, USAGE); for encoding in ENCODINGS { - app = app.arg(Arg::new(encoding.0).long(encoding.0)); + command = command.arg(Arg::new(encoding.0).long(encoding.0)); } - app + command } fn parse_cmd_args(args: impl uucore::Args) -> UResult<(Config, Format)> { diff --git a/src/uu/cat/src/cat.rs b/src/uu/cat/src/cat.rs index 0a1ba25593b..edba1b8d070 100644 --- a/src/uu/cat/src/cat.rs +++ b/src/uu/cat/src/cat.rs @@ -14,7 +14,7 @@ extern crate unix_socket; // last synced with: cat (GNU coreutils) 8.13 -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::fs::{metadata, File}; use std::io::{self, Read, Write}; use thiserror::Error; @@ -239,13 +239,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { cat_files(&files, &options) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .name(NAME) .version(crate_version!()) .override_usage(format_usage(USAGE)) .about(SUMMARY) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::FILE) .hide(true) diff --git a/src/uu/chcon/src/chcon.rs b/src/uu/chcon/src/chcon.rs index d033b62c17e..8f5e0f26bfa 100644 --- a/src/uu/chcon/src/chcon.rs +++ b/src/uu/chcon/src/chcon.rs @@ -6,7 +6,7 @@ use uucore::error::{UResult, USimpleError, UUsageError}; use uucore::format_usage; use uucore::{display::Quotable, show_error, show_warning}; -use clap::{App, AppSettings, Arg}; +use clap::{Arg, Command}; use selinux::{OpaqueSecurityContext, SecurityContext}; use std::borrow::Cow; @@ -65,7 +65,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(r) => r, Err(r) => { if let Error::CommandLine(r) = &r { - match r.kind { + match r.kind() { clap::ErrorKind::DisplayHelp | clap::ErrorKind::DisplayVersion => { println!("{}", r); return Ok(()); @@ -154,12 +154,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Err(libc::EXIT_FAILURE.into()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(VERSION) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::dereference::DEREFERENCE) .long(options::dereference::DEREFERENCE) @@ -303,7 +303,7 @@ struct Options { files: Vec, } -fn parse_command_line(config: clap::App, args: impl uucore::Args) -> Result { +fn parse_command_line(config: clap::Command, args: impl uucore::Args) -> Result { let matches = config.try_get_matches_from(args)?; let verbose = matches.is_present(options::VERBOSE); diff --git a/src/uu/chgrp/src/chgrp.rs b/src/uu/chgrp/src/chgrp.rs index affaf86a3c4..ce1cb5f3771 100644 --- a/src/uu/chgrp/src/chgrp.rs +++ b/src/uu/chgrp/src/chgrp.rs @@ -13,7 +13,7 @@ use uucore::error::{FromIo, UResult, USimpleError}; use uucore::format_usage; use uucore::perms::{chown_base, options, IfFrom}; -use clap::{App, AppSettings, Arg, ArgMatches}; +use clap::{Arg, ArgMatches, Command}; use std::fs; use std::os::unix::fs::MetadataExt; @@ -54,12 +54,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { chown_base(uu_app(), args, options::ARG_GROUP, parse_gid_and_uid, true) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(VERSION) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::verbosity::CHANGES) .short('c') diff --git a/src/uu/chmod/src/chmod.rs b/src/uu/chmod/src/chmod.rs index c2b51ae5ebe..25a37c372bf 100644 --- a/src/uu/chmod/src/chmod.rs +++ b/src/uu/chmod/src/chmod.rs @@ -7,7 +7,7 @@ // spell-checker:ignore (ToDO) Chmoder cmode fmode fperm fref ugoa RFILE RFILE's -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::fs; use std::os::unix::fs::{MetadataExt, PermissionsExt}; use std::path::Path; @@ -112,12 +112,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { chmoder.chmod(&files) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::CHANGES) .long(options::CHANGES) diff --git a/src/uu/chown/src/chown.rs b/src/uu/chown/src/chown.rs index 27a98984734..c1d7d1420c1 100644 --- a/src/uu/chown/src/chown.rs +++ b/src/uu/chown/src/chown.rs @@ -14,7 +14,7 @@ use uucore::perms::{chown_base, options, IfFrom}; use uucore::error::{FromIo, UResult, USimpleError}; -use clap::{crate_version, App, AppSettings, Arg, ArgMatches}; +use clap::{crate_version, Arg, ArgMatches, Command}; use std::fs; use std::os::unix::fs::MetadataExt; @@ -63,12 +63,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { ) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::verbosity::CHANGES) .short('c') diff --git a/src/uu/chroot/src/chroot.rs b/src/uu/chroot/src/chroot.rs index d182645661b..713336104a5 100644 --- a/src/uu/chroot/src/chroot.rs +++ b/src/uu/chroot/src/chroot.rs @@ -10,11 +10,11 @@ mod error; use crate::error::ChrootError; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::ffi::CString; use std::io::Error; use std::path::Path; -use std::process::Command; +use std::process; use uucore::error::{set_exit_code, UResult}; use uucore::libc::{self, chroot, setgid, setgroups, setuid}; use uucore::{entries, format_usage, InvalidEncodingHandling}; @@ -77,7 +77,10 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { // NOTE: Tests can only trigger code beyond this point if they're invoked with root permissions set_context(newroot, &matches)?; - let pstatus = match Command::new(chroot_command).args(chroot_args).status() { + let pstatus = match process::Command::new(chroot_command) + .args(chroot_args) + .status() + { Ok(status) => status, Err(e) => return Err(ChrootError::CommandFailed(command[0].to_string(), e).into()), }; @@ -91,12 +94,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::NEWROOT) .hide(true) diff --git a/src/uu/cksum/src/cksum.rs b/src/uu/cksum/src/cksum.rs index 7f7ba9ed338..e901e0820ed 100644 --- a/src/uu/cksum/src/cksum.rs +++ b/src/uu/cksum/src/cksum.rs @@ -6,7 +6,7 @@ // file that was distributed with this source code. // spell-checker:ignore (ToDO) fname -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::fs::File; use std::io::{self, stdin, BufReader, Read}; use std::path::Path; @@ -140,13 +140,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .name(NAME) .version(crate_version!()) .about(SUMMARY) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::FILE) .hide(true) diff --git a/src/uu/comm/src/comm.rs b/src/uu/comm/src/comm.rs index 8064dd21633..2207493d30d 100644 --- a/src/uu/comm/src/comm.rs +++ b/src/uu/comm/src/comm.rs @@ -15,7 +15,7 @@ use uucore::error::FromIo; use uucore::error::UResult; use uucore::{format_usage, InvalidEncodingHandling}; -use clap::{crate_version, App, AppSettings, Arg, ArgMatches}; +use clap::{crate_version, Arg, ArgMatches, Command}; static ABOUT: &str = "compare two sorted files line by line"; static LONG_HELP: &str = ""; @@ -143,13 +143,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .after_help(LONG_HELP) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::COLUMN_1) .short('1') diff --git a/src/uu/cp/src/cp.rs b/src/uu/cp/src/cp.rs index a4a512d6b5c..1152e8def59 100644 --- a/src/uu/cp/src/cp.rs +++ b/src/uu/cp/src/cp.rs @@ -28,7 +28,7 @@ use winapi::um::fileapi::GetFileInformationByHandle; use std::borrow::Cow; -use clap::{crate_version, App, AppSettings, Arg, ArgMatches}; +use clap::{crate_version, Arg, ArgMatches, Command}; use filetime::FileTime; #[cfg(unix)] use libc::mkfifo; @@ -296,7 +296,7 @@ static DEFAULT_ATTRIBUTES: &[Attribute] = &[ Attribute::Timestamps, ]; -pub fn uu_app<'a>() -> App<'a> { +pub fn uu_app<'a>() -> Command<'a> { const MODE_ARGS: &[&str] = &[ options::LINK, options::REFLINK, @@ -304,11 +304,11 @@ pub fn uu_app<'a>() -> App<'a> { options::ATTRIBUTES_ONLY, options::COPY_CONTENTS, ]; - App::new(uucore::util_name()) + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg(Arg::new(options::TARGET_DIRECTORY) .short('t') .conflicts_with(options::NO_TARGET_DIRECTORY) @@ -389,7 +389,7 @@ pub fn uu_app<'a>() -> App<'a> { .long(options::PRESERVE) .takes_value(true) .multiple_occurrences(true) - .use_delimiter(true) + .use_value_delimiter(true) .possible_values(PRESERVABLE_ATTRIBUTES) .min_values(0) .value_name("ATTR_LIST") diff --git a/src/uu/csplit/src/csplit.rs b/src/uu/csplit/src/csplit.rs index 7793a86370c..a0b739935c9 100644 --- a/src/uu/csplit/src/csplit.rs +++ b/src/uu/csplit/src/csplit.rs @@ -12,7 +12,7 @@ use std::{ io::{BufRead, BufWriter, Write}, }; -use clap::{crate_version, App, AppSettings, Arg, ArgMatches}; +use clap::{crate_version, Arg, ArgMatches, Command}; use regex::Regex; use uucore::display::Quotable; use uucore::error::{FromIo, UResult}; @@ -746,12 +746,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(SUMMARY) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::SUFFIX_FORMAT) .short('b') diff --git a/src/uu/cut/src/cut.rs b/src/uu/cut/src/cut.rs index ce82a27375f..2264f4f26a1 100644 --- a/src/uu/cut/src/cut.rs +++ b/src/uu/cut/src/cut.rs @@ -11,7 +11,7 @@ extern crate uucore; use bstr::io::BufReadExt; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::fs::File; use std::io::{stdin, stdout, BufReader, BufWriter, Read, Write}; use std::path::Path; @@ -533,14 +533,14 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .name(NAME) .version(crate_version!()) .override_usage(format_usage(USAGE)) .about(SUMMARY) .after_help(LONG_HELP) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::BYTES) .short('b') diff --git a/src/uu/date/src/date.rs b/src/uu/date/src/date.rs index 18e06aef43b..8946768d540 100644 --- a/src/uu/date/src/date.rs +++ b/src/uu/date/src/date.rs @@ -11,7 +11,7 @@ use chrono::{DateTime, FixedOffset, Local, Offset, Utc}; #[cfg(windows)] use chrono::{Datelike, Timelike}; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; #[cfg(all(unix, not(target_os = "macos"), not(target_os = "redox")))] use libc::{clock_settime, timespec, CLOCK_REALTIME}; use std::fs::File; @@ -254,12 +254,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(OPT_DATE) .short('d') diff --git a/src/uu/dd/src/dd.rs b/src/uu/dd/src/dd.rs index d8bc3acd360..10a0ff9c2c7 100644 --- a/src/uu/dd/src/dd.rs +++ b/src/uu/dd/src/dd.rs @@ -34,7 +34,7 @@ use std::sync::mpsc; use std::thread; use std::time; -use clap::{crate_version, App, AppSettings, Arg, ArgMatches}; +use clap::{crate_version, Arg, ArgMatches, Command}; use gcd::Gcd; use uucore::display::Quotable; use uucore::error::{FromIo, UResult}; @@ -730,11 +730,11 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::INFILE) .long(options::INFILE) @@ -846,8 +846,8 @@ Printing performance stats is also triggered by the INFO signal (where supported .long(options::CONV) .takes_value(true) .multiple_occurrences(true) - .use_delimiter(true) - .require_delimiter(true) + .use_value_delimiter(true) + .require_value_delimiter(true) .multiple_values(true) .require_equals(true) .value_name("CONV") @@ -887,8 +887,8 @@ Conversion Flags: .long(options::IFLAG) .takes_value(true) .multiple_occurrences(true) - .use_delimiter(true) - .require_delimiter(true) + .use_value_delimiter(true) + .require_value_delimiter(true) .multiple_values(true) .require_equals(true) .value_name("FLAG") @@ -917,8 +917,8 @@ General-Flags .long(options::OFLAG) .takes_value(true) .multiple_occurrences(true) - .use_delimiter(true) - .require_delimiter(true) + .use_value_delimiter(true) + .require_value_delimiter(true) .multiple_values(true) .require_equals(true) .value_name("FLAG") diff --git a/src/uu/df/src/df.rs b/src/uu/df/src/df.rs index 338648e105b..466d027bc68 100644 --- a/src/uu/df/src/df.rs +++ b/src/uu/df/src/df.rs @@ -15,7 +15,7 @@ use uucore::error::{UResult, USimpleError}; use uucore::format_usage; use uucore::fsext::{read_fs_list, MountInfo}; -use clap::{crate_version, App, AppSettings, Arg, ArgMatches}; +use clap::{crate_version, Arg, ArgMatches, Command}; use std::fmt; use std::path::Path; @@ -316,12 +316,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(OPT_ALL) .short('a') @@ -385,7 +385,7 @@ pub fn uu_app<'a>() -> App<'a> { Arg::new(OPT_OUTPUT) .long("output") .takes_value(true) - .use_delimiter(true) + .use_value_delimiter(true) .possible_values(OUTPUT_FIELD_LIST) .default_missing_values(&OUTPUT_FIELD_LIST) .default_values(&["source", "size", "used", "avail", "pcent", "target"]) @@ -428,7 +428,7 @@ pub fn uu_app<'a>() -> App<'a> { .long("exclude-type") .allow_invalid_utf8(true) .takes_value(true) - .use_delimiter(true) + .use_value_delimiter(true) .multiple_occurrences(true) .help("limit listing to file systems not of type TYPE"), ) diff --git a/src/uu/dircolors/src/dircolors.rs b/src/uu/dircolors/src/dircolors.rs index dcc832ece7a..c76dbc0c14e 100644 --- a/src/uu/dircolors/src/dircolors.rs +++ b/src/uu/dircolors/src/dircolors.rs @@ -13,7 +13,7 @@ use std::env; use std::fs::File; use std::io::{BufRead, BufReader}; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use uucore::display::Quotable; use uucore::error::{UResult, USimpleError, UUsageError}; @@ -154,13 +154,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(SUMMARY) .after_help(LONG_HELP) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::BOURNE_SHELL) .long("sh") diff --git a/src/uu/dirname/src/dirname.rs b/src/uu/dirname/src/dirname.rs index ad370aacf1d..030c3981c31 100644 --- a/src/uu/dirname/src/dirname.rs +++ b/src/uu/dirname/src/dirname.rs @@ -5,7 +5,7 @@ // For the full copyright and license information, please view the LICENSE // file that was distributed with this source code. -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::path::Path; use uucore::display::print_verbatim; use uucore::error::{UResult, UUsageError}; @@ -76,12 +76,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .about(ABOUT) .version(crate_version!()) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::ZERO) .long(options::ZERO) diff --git a/src/uu/du/src/du.rs b/src/uu/du/src/du.rs index 0bb1abf4a28..8d97b8b47f1 100644 --- a/src/uu/du/src/du.rs +++ b/src/uu/du/src/du.rs @@ -10,7 +10,7 @@ extern crate uucore; use chrono::prelude::DateTime; use chrono::Local; -use clap::{crate_version, App, AppSettings, Arg, ArgMatches}; +use clap::{crate_version, Arg, ArgMatches, Command}; use std::collections::HashSet; use std::env; use std::fs; @@ -617,13 +617,13 @@ fn parse_depth(max_depth_str: Option<&str>, summarize: bool) -> UResult() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(SUMMARY) .after_help(LONG_HELP) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::ALL) .short('a') diff --git a/src/uu/echo/src/echo.rs b/src/uu/echo/src/echo.rs index 54a606c318f..d2de30cb177 100644 --- a/src/uu/echo/src/echo.rs +++ b/src/uu/echo/src/echo.rs @@ -6,7 +6,7 @@ // For the full copyright and license information, please view the LICENSE // file that was distributed with this source code. -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::io::{self, Write}; use std::iter::Peekable; use std::str::Chars; @@ -126,15 +126,15 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { .map_err_context(|| "could not write to stdout".to_string()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .name(NAME) // TrailingVarArg specifies the final positional argument is a VarArg // and it doesn't attempts the parse any further args. // Final argument must have multiple(true) or the usage string equivalent. - .setting(AppSettings::TrailingVarArg) - .setting(AppSettings::AllowHyphenValues) - .setting(AppSettings::InferLongArgs) + .trailing_var_arg(true) + .allow_hyphen_values(true) + .infer_long_args(true) .version(crate_version!()) .about(SUMMARY) .after_help(AFTER_HELP) diff --git a/src/uu/env/src/env.rs b/src/uu/env/src/env.rs index 13610041308..b78b5f224c5 100644 --- a/src/uu/env/src/env.rs +++ b/src/uu/env/src/env.rs @@ -16,13 +16,13 @@ extern crate clap; #[macro_use] extern crate uucore; -use clap::{App, AppSettings, Arg}; +use clap::{Arg, Command}; use ini::Ini; use std::borrow::Cow; use std::env; use std::io::{self, Write}; use std::iter::Iterator; -use std::process::Command; +use std::process; use uucore::display::Quotable; use uucore::error::{UResult, USimpleError, UUsageError}; use uucore::format_usage; @@ -121,15 +121,15 @@ fn build_command<'a, 'b>(args: &'a mut Vec<&'b str>) -> (Cow<'b, str>, &'a [&'b (progname, &args[..]) } -pub fn uu_app<'a>() -> App<'a> { - App::new(crate_name!()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(crate_name!()) .version(crate_version!()) .author(crate_authors!()) .about(crate_description!()) .override_usage(format_usage(USAGE)) .after_help(AFTER_HELP) - .setting(AppSettings::AllowExternalSubcommands) - .setting(AppSettings::InferLongArgs) + .allow_external_subcommands(true) + .infer_long_args(true) .arg(Arg::new("ignore-environment") .short('i') .long("ignore-environment") @@ -307,7 +307,7 @@ fn run_env(args: impl uucore::Args) -> UResult<()> { * standard library contains many checks and fail-safes to ensure the process ends up being * created. This is much simpler than dealing with the hassles of calling execvp directly. */ - match Command::new(&*prog).args(args).status() { + match process::Command::new(&*prog).args(args).status() { Ok(exit) if !exit.success() => return Err(exit.code().unwrap().into()), Err(ref err) if err.kind() == io::ErrorKind::NotFound => return Err(127.into()), Err(_) => return Err(126.into()), diff --git a/src/uu/expand/src/expand.rs b/src/uu/expand/src/expand.rs index c2bf98093a6..b9d9309cd7a 100644 --- a/src/uu/expand/src/expand.rs +++ b/src/uu/expand/src/expand.rs @@ -12,7 +12,7 @@ #[macro_use] extern crate uucore; -use clap::{crate_version, App, AppSettings, Arg, ArgMatches}; +use clap::{crate_version, Arg, ArgMatches, Command}; use std::fs::File; use std::io::{stdin, stdout, BufRead, BufReader, BufWriter, Read, Write}; use std::str::from_utf8; @@ -176,13 +176,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { expand(&Options::new(&matches)).map_err_context(|| "failed to write output".to_string()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .after_help(LONG_HELP) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::INITIAL) .long(options::INITIAL) diff --git a/src/uu/expr/src/expr.rs b/src/uu/expr/src/expr.rs index 188537fbc96..f202b091cb7 100644 --- a/src/uu/expr/src/expr.rs +++ b/src/uu/expr/src/expr.rs @@ -5,7 +5,7 @@ //* For the full copyright and license information, please view the LICENSE //* file that was distributed with this source code. -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use uucore::error::{UResult, USimpleError}; use uucore::InvalidEncodingHandling; @@ -19,12 +19,12 @@ static USAGE: &str = r#" expr [EXPRESSION] expr [OPTIONS]"#; -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(USAGE) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(VERSION) .long(VERSION) diff --git a/src/uu/factor/src/cli.rs b/src/uu/factor/src/cli.rs index 90f2fd3c857..f78e410ba7f 100644 --- a/src/uu/factor/src/cli.rs +++ b/src/uu/factor/src/cli.rs @@ -14,7 +14,7 @@ use std::fmt::Write as FmtWrite; use std::io::{self, stdin, stdout, BufRead, Write}; mod factor; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; pub use factor::*; use uucore::display::Quotable; use uucore::error::UResult; @@ -77,10 +77,10 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(SUMMARY) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg(Arg::new(options::NUMBER).multiple_occurrences(true)) } diff --git a/src/uu/false/src/false.rs b/src/uu/false/src/false.rs index c6661dc3543..687235f70df 100644 --- a/src/uu/false/src/false.rs +++ b/src/uu/false/src/false.rs @@ -4,7 +4,7 @@ // * // * For the full copyright and license information, please view the LICENSE // * file that was distributed with this source code. -use clap::{App, AppSettings, Arg}; +use clap::{Arg, Command}; use std::io::Write; use uucore::error::{set_exit_code, UResult}; @@ -18,7 +18,7 @@ the program will also return `1`. #[uucore::main] pub fn uumain(args: impl uucore::Args) -> UResult<()> { - let mut app = uu_app(); + let mut command = uu_app(); // Mirror GNU options, always return `1`. In particular even the 'successful' cases of no-op, // and the interrupted display of help and version should return `1`. Also, we return Ok in all @@ -26,11 +26,11 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { // and unwind through the standard library allocation handling machinery. set_exit_code(1); - if let Ok(matches) = app.try_get_matches_from_mut(args) { + if let Ok(matches) = command.try_get_matches_from_mut(args) { let error = if matches.index_of("help").is_some() { - app.print_long_help() + command.print_long_help() } else if matches.index_of("version").is_some() { - writeln!(std::io::stdout(), "{}", app.render_version()) + writeln!(std::io::stdout(), "{}", command.render_version()) } else { Ok(()) }; @@ -45,12 +45,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(clap::crate_version!()) .about(ABOUT) // We provide our own help and version options, to ensure maximum compatibility with GNU. - .setting(AppSettings::DisableHelpFlag | AppSettings::DisableVersionFlag) + .disable_help_flag(true) + .disable_version_flag(true) .arg( Arg::new("help") .long("help") diff --git a/src/uu/fmt/src/fmt.rs b/src/uu/fmt/src/fmt.rs index e53617dacbf..3cb85167486 100644 --- a/src/uu/fmt/src/fmt.rs +++ b/src/uu/fmt/src/fmt.rs @@ -10,7 +10,7 @@ #[macro_use] extern crate uucore; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::cmp; use std::fs::File; use std::io::{stdin, stdout, Write}; @@ -218,12 +218,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(OPT_CROWN_MARGIN) .short('c') diff --git a/src/uu/fold/src/fold.rs b/src/uu/fold/src/fold.rs index d217f0beae2..d24d31be975 100644 --- a/src/uu/fold/src/fold.rs +++ b/src/uu/fold/src/fold.rs @@ -7,7 +7,7 @@ // spell-checker:ignore (ToDOs) ncount routput -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::fs::File; use std::io::{stdin, BufRead, BufReader, Read}; use std::path::Path; @@ -63,13 +63,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { fold(&files, bytes, spaces, width) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .name(NAME) .version(crate_version!()) .override_usage(format_usage(USAGE)) .about(SUMMARY) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::BYTES) .long(options::BYTES) diff --git a/src/uu/groups/src/groups.rs b/src/uu/groups/src/groups.rs index d4015fb5005..e1bf99fbc2a 100644 --- a/src/uu/groups/src/groups.rs +++ b/src/uu/groups/src/groups.rs @@ -26,7 +26,7 @@ use uucore::{ format_usage, }; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; mod options { pub const USERS: &str = "USERNAME"; @@ -102,12 +102,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::USERS) .multiple_occurrences(true) diff --git a/src/uu/hashsum/src/hashsum.rs b/src/uu/hashsum/src/hashsum.rs index d923367022e..fbfe1c1f2c6 100644 --- a/src/uu/hashsum/src/hashsum.rs +++ b/src/uu/hashsum/src/hashsum.rs @@ -20,7 +20,7 @@ mod digest; use self::digest::Digest; use self::digest::DigestWriter; -use clap::{App, AppSettings, Arg, ArgMatches}; +use clap::{Arg, ArgMatches, Command}; use hex::encode; use md5::Md5; use regex::Regex; @@ -297,13 +297,13 @@ pub fn uumain(mut args: impl uucore::Args) -> UResult<()> { // Default binary in Windows, text mode otherwise let binary_flag_default = cfg!(windows); - let app = uu_app(&binary_name); + let command = uu_app(&binary_name); // FIXME: this should use try_get_matches_from() and crash!(), but at the moment that just // causes "error: " to be printed twice (once from crash!() and once from clap). With // the current setup, the name of the utility is not printed, but I think this is at // least somewhat better from a user's perspective. - let matches = app.get_matches_from(args); + let matches = command.get_matches_from(args); let (name, algo, bits) = detect_algo(&binary_name, &matches); @@ -340,7 +340,7 @@ pub fn uumain(mut args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app_common<'a>() -> App<'a> { +pub fn uu_app_common<'a>() -> Command<'a> { #[cfg(windows)] const BINARY_HELP: &str = "read in binary mode (default)"; #[cfg(not(windows))] @@ -349,10 +349,10 @@ pub fn uu_app_common<'a>() -> App<'a> { const TEXT_HELP: &str = "read in text mode"; #[cfg(not(windows))] const TEXT_HELP: &str = "read in text mode (default)"; - App::new(uucore::util_name()) + Command::new(uucore::util_name()) .version(crate_version!()) .about("Compute and check message digests.") - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new("binary") .short('b') @@ -419,8 +419,8 @@ pub fn uu_app_common<'a>() -> App<'a> { ) } -pub fn uu_app_custom<'a>() -> App<'a> { - let mut app = uu_app_common(); +pub fn uu_app_custom<'a>() -> Command<'a> { + let mut command = uu_app_common(); let algorithms = &[ ("md5", "work with MD5"), ("sha1", "work with SHA1"), @@ -446,14 +446,14 @@ pub fn uu_app_custom<'a>() -> App<'a> { ]; for (name, desc) in algorithms { - app = app.arg(Arg::new(*name).long(name).help(*desc)); + command = command.arg(Arg::new(*name).long(name).help(*desc)); } - app + command } // hashsum is handled differently in build.rs, therefore this is not the same // as in other utilities. -fn uu_app<'a>(binary_name: &str) -> App<'a> { +fn uu_app<'a>(binary_name: &str) -> Command<'a> { if !is_custom_binary(binary_name) { uu_app_custom() } else { diff --git a/src/uu/head/src/head.rs b/src/uu/head/src/head.rs index 3bde78ec795..14780aa3c97 100644 --- a/src/uu/head/src/head.rs +++ b/src/uu/head/src/head.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (vars) zlines BUFWRITER seekable -use clap::{crate_version, App, AppSettings, Arg, ArgMatches}; +use clap::{crate_version, Arg, ArgMatches, Command}; use std::convert::{TryFrom, TryInto}; use std::ffi::OsString; use std::io::{self, BufWriter, ErrorKind, Read, Seek, SeekFrom, Write}; @@ -41,12 +41,12 @@ mod take; use take::take_all_but; use take::take_lines; -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::BYTES_NAME) .short('c') diff --git a/src/uu/hostid/src/hostid.rs b/src/uu/hostid/src/hostid.rs index a82bb5e6956..b60446e9fe5 100644 --- a/src/uu/hostid/src/hostid.rs +++ b/src/uu/hostid/src/hostid.rs @@ -7,7 +7,7 @@ // spell-checker:ignore (ToDO) gethostid -use clap::{crate_version, App, AppSettings}; +use clap::{crate_version, Command}; use libc::c_long; use uucore::{error::UResult, format_usage}; @@ -26,12 +26,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(SUMMARY) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) } fn hostid() { diff --git a/src/uu/hostname/src/hostname.rs b/src/uu/hostname/src/hostname.rs index b45b4b1d871..757caed023a 100644 --- a/src/uu/hostname/src/hostname.rs +++ b/src/uu/hostname/src/hostname.rs @@ -11,7 +11,7 @@ use std::collections::hash_set::HashSet; use std::net::ToSocketAddrs; use std::str; -use clap::{crate_version, App, AppSettings, Arg, ArgMatches}; +use clap::{crate_version, Arg, ArgMatches, Command}; use uucore::{ error::{FromIo, UResult}, @@ -71,12 +71,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(OPT_DOMAIN) .short('d') diff --git a/src/uu/id/src/id.rs b/src/uu/id/src/id.rs index b1da511734f..3bb9ce8c932 100644 --- a/src/uu/id/src/id.rs +++ b/src/uu/id/src/id.rs @@ -39,7 +39,7 @@ #[macro_use] extern crate uucore; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::ffi::CStr; use uucore::display::Quotable; use uucore::entries::{self, Group, Locate, Passwd}; @@ -341,12 +341,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::OPT_AUDIT) .short('A') diff --git a/src/uu/install/src/install.rs b/src/uu/install/src/install.rs index 9b72627fa62..28d1aa7023c 100644 --- a/src/uu/install/src/install.rs +++ b/src/uu/install/src/install.rs @@ -12,7 +12,7 @@ mod mode; #[macro_use] extern crate uucore; -use clap::{crate_version, App, AppSettings, Arg, ArgMatches}; +use clap::{crate_version, Arg, ArgMatches, Command}; use file_diff::diff; use filetime::{set_file_times, FileTime}; use uucore::backup_control::{self, BackupMode}; @@ -30,7 +30,7 @@ use std::fs; use std::fs::File; use std::os::unix::fs::MetadataExt; use std::path::{Path, PathBuf}; -use std::process::Command; +use std::process; const DEFAULT_MODE: u32 = 0o755; const DEFAULT_STRIP_PROGRAM: &str = "strip"; @@ -188,12 +188,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( backup_control::arguments::backup() ) @@ -585,7 +585,7 @@ fn copy(from: &Path, to: &Path, b: &Behavior) -> UResult<()> { } if b.strip && cfg!(not(windows)) { - match Command::new(&b.strip_program).arg(to).output() { + match process::Command::new(&b.strip_program).arg(to).output() { Ok(o) => { if !o.status.success() { return Err(InstallError::StripProgramFailed( diff --git a/src/uu/join/src/join.rs b/src/uu/join/src/join.rs index e5abefba484..1d306415b29 100644 --- a/src/uu/join/src/join.rs +++ b/src/uu/join/src/join.rs @@ -10,7 +10,7 @@ #[macro_use] extern crate uucore; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use memchr::{memchr3_iter, memchr_iter}; use std::cmp::Ordering; use std::convert::From; @@ -697,8 +697,8 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app<'a>() -> App<'a> { - App::new(NAME) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(NAME) .version(crate_version!()) .about( "For each pair of input lines with identical join fields, write a line to @@ -706,7 +706,7 @@ standard output. The default join field is the first, delimited by blanks. When FILE1 or FILE2 (not both) is -, read standard input.", ) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new("a") .short('a') diff --git a/src/uu/kill/src/kill.rs b/src/uu/kill/src/kill.rs index 2d049092146..df868e41812 100644 --- a/src/uu/kill/src/kill.rs +++ b/src/uu/kill/src/kill.rs @@ -10,7 +10,7 @@ #[macro_use] extern crate uucore; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use libc::{c_int, pid_t}; use std::io::Error; use uucore::display::Quotable; @@ -78,12 +78,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::LIST) .short('l') diff --git a/src/uu/link/src/link.rs b/src/uu/link/src/link.rs index 9d515ee8a49..3c959af333e 100644 --- a/src/uu/link/src/link.rs +++ b/src/uu/link/src/link.rs @@ -4,7 +4,7 @@ // * // * For the full copyright and license information, please view the LICENSE // * file that was distributed with this source code. -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::fs::hard_link; use std::path::Path; use uucore::display::Quotable; @@ -33,12 +33,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { .map_err_context(|| format!("cannot create link {} to {}", new.quote(), old.quote())) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::FILES) .hide(true) diff --git a/src/uu/ln/src/ln.rs b/src/uu/ln/src/ln.rs index ec48688761a..2fc478a23c7 100644 --- a/src/uu/ln/src/ln.rs +++ b/src/uu/ln/src/ln.rs @@ -10,7 +10,7 @@ #[macro_use] extern crate uucore; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use uucore::display::Quotable; use uucore::error::{UError, UResult}; use uucore::format_usage; @@ -173,12 +173,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { exec(&paths[..], &settings) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg(backup_control::arguments::backup()) .arg(backup_control::arguments::backup_no_args()) // TODO: opts.arg( diff --git a/src/uu/logname/src/logname.rs b/src/uu/logname/src/logname.rs index 64ad5e9bcc9..31246b5c794 100644 --- a/src/uu/logname/src/logname.rs +++ b/src/uu/logname/src/logname.rs @@ -12,7 +12,7 @@ #[macro_use] extern crate uucore; -use clap::{crate_version, App, AppSettings}; +use clap::{crate_version, Command}; use std::ffi::CStr; use uucore::error::UResult; use uucore::InvalidEncodingHandling; @@ -51,10 +51,10 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .override_usage(uucore::execution_phrase()) .about(SUMMARY) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) } diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs index 9353d1f6b71..a7dbc7b422b 100644 --- a/src/uu/ls/src/ls.rs +++ b/src/uu/ls/src/ls.rs @@ -15,7 +15,7 @@ extern crate lazy_static; mod quoting_style; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use glob::Pattern; use lscolors::LsColors; use number_prefix::NumberPrefix; @@ -782,9 +782,9 @@ impl Config { #[uucore::main] pub fn uumain(args: impl uucore::Args) -> UResult<()> { - let app = uu_app(); + let command = uu_app(); - let matches = app.get_matches_from(args); + let matches = command.get_matches_from(args); let config = Config::from(&matches)?; @@ -796,8 +796,8 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { list(locs, &config) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .override_usage(format_usage(USAGE)) .about( @@ -805,7 +805,7 @@ pub fn uu_app<'a>() -> App<'a> { the command line, expect that it will ignore files and directories \ whose names start with '.'.", ) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) // Format arguments .arg( Arg::new(options::FORMAT) diff --git a/src/uu/mkdir/src/mkdir.rs b/src/uu/mkdir/src/mkdir.rs index 14b1ebaf557..ed487bb580f 100644 --- a/src/uu/mkdir/src/mkdir.rs +++ b/src/uu/mkdir/src/mkdir.rs @@ -10,7 +10,7 @@ #[macro_use] extern crate uucore; -use clap::{crate_version, App, AppSettings, Arg, ArgMatches, OsValues}; +use clap::{crate_version, Arg, ArgMatches, Command, OsValues}; use std::path::Path; use uucore::display::Quotable; #[cfg(not(windows))] @@ -104,12 +104,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::MODE) .short('m') diff --git a/src/uu/mkfifo/src/mkfifo.rs b/src/uu/mkfifo/src/mkfifo.rs index 2ac316f9d21..756fd75cfe6 100644 --- a/src/uu/mkfifo/src/mkfifo.rs +++ b/src/uu/mkfifo/src/mkfifo.rs @@ -8,7 +8,7 @@ #[macro_use] extern crate uucore; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use libc::mkfifo; use std::ffi::CString; use uucore::error::{UResult, USimpleError}; @@ -70,13 +70,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .name(NAME) .version(crate_version!()) .override_usage(format_usage(USAGE)) .about(SUMMARY) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::MODE) .short('m') diff --git a/src/uu/mknod/src/mknod.rs b/src/uu/mknod/src/mknod.rs index a27a48056ce..0e7c4be45e5 100644 --- a/src/uu/mknod/src/mknod.rs +++ b/src/uu/mknod/src/mknod.rs @@ -9,7 +9,7 @@ use std::ffi::CString; -use clap::{crate_version, App, AppSettings, Arg, ArgMatches}; +use clap::{crate_version, Arg, ArgMatches, Command}; use libc::{dev_t, mode_t}; use libc::{S_IFBLK, S_IFCHR, S_IFIFO, S_IRGRP, S_IROTH, S_IRUSR, S_IWGRP, S_IWOTH, S_IWUSR}; @@ -143,13 +143,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .override_usage(format_usage(USAGE)) .after_help(LONG_HELP) .about(ABOUT) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new("mode") .short('m') diff --git a/src/uu/mktemp/src/mktemp.rs b/src/uu/mktemp/src/mktemp.rs index 54d3ac65196..54283b9afed 100644 --- a/src/uu/mktemp/src/mktemp.rs +++ b/src/uu/mktemp/src/mktemp.rs @@ -8,7 +8,7 @@ // spell-checker:ignore (paths) GPGHome -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use uucore::display::{println_verbatim, Quotable}; use uucore::error::{FromIo, UError, UResult}; use uucore::format_usage; @@ -131,12 +131,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(OPT_DIRECTORY) .short('d') diff --git a/src/uu/more/src/more.rs b/src/uu/more/src/more.rs index db6ad249bcd..ab94bd435c4 100644 --- a/src/uu/more/src/more.rs +++ b/src/uu/more/src/more.rs @@ -17,7 +17,7 @@ use std::{ #[cfg(all(unix, not(target_os = "fuchsia")))] extern crate nix; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use crossterm::{ event::{self, Event, KeyCode, KeyEvent, KeyModifiers}, execute, queue, @@ -96,11 +96,11 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .about("A file perusal filter for CRT viewing.") .version(crate_version!()) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::SILENT) .short('d') diff --git a/src/uu/mv/src/mv.rs b/src/uu/mv/src/mv.rs index c02f70dbd98..60cff5dfbc2 100644 --- a/src/uu/mv/src/mv.rs +++ b/src/uu/mv/src/mv.rs @@ -13,7 +13,7 @@ mod error; #[macro_use] extern crate uucore; -use clap::{crate_version, App, AppSettings, Arg, ArgMatches}; +use clap::{crate_version, Arg, ArgMatches, Command}; use std::env; use std::ffi::OsString; use std::fs; @@ -112,12 +112,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { exec(&files[..], &behavior) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( backup_control::arguments::backup() ) diff --git a/src/uu/nice/src/nice.rs b/src/uu/nice/src/nice.rs index 94ccbe61eeb..b75dd979e18 100644 --- a/src/uu/nice/src/nice.rs +++ b/src/uu/nice/src/nice.rs @@ -15,7 +15,7 @@ use std::ffi::CString; use std::io::Error; use std::ptr; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use uucore::{ error::{set_exit_code, UResult, USimpleError, UUsageError}, format_usage, @@ -102,12 +102,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::TrailingVarArg) - .setting(AppSettings::InferLongArgs) + .trailing_var_arg(true) + .infer_long_args(true) .version(crate_version!()) .arg( Arg::new(options::ADJUSTMENT) diff --git a/src/uu/nl/src/nl.rs b/src/uu/nl/src/nl.rs index c1661178f94..09ad9a8166e 100644 --- a/src/uu/nl/src/nl.rs +++ b/src/uu/nl/src/nl.rs @@ -8,7 +8,7 @@ // spell-checker:ignore (ToDO) corasick memchr -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::fs::File; use std::io::{stdin, BufRead, BufReader, Read}; use std::iter::repeat; @@ -139,12 +139,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .name(NAME) .version(crate_version!()) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::FILE) .hide(true) diff --git a/src/uu/nohup/src/nohup.rs b/src/uu/nohup/src/nohup.rs index c7c7350cc98..c2593f8eae8 100644 --- a/src/uu/nohup/src/nohup.rs +++ b/src/uu/nohup/src/nohup.rs @@ -10,7 +10,7 @@ #[macro_use] extern crate uucore; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use libc::{c_char, dup2, execvp, signal}; use libc::{SIGHUP, SIG_IGN}; use std::env; @@ -116,8 +116,8 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .after_help(LONG_HELP) @@ -128,8 +128,8 @@ pub fn uu_app<'a>() -> App<'a> { .required(true) .multiple_occurrences(true), ) - .setting(AppSettings::TrailingVarArg) - .setting(AppSettings::InferLongArgs) + .trailing_var_arg(true) + .infer_long_args(true) } fn replace_fds() -> UResult<()> { diff --git a/src/uu/nproc/src/nproc.rs b/src/uu/nproc/src/nproc.rs index f10b41e40eb..fdebea65a47 100644 --- a/src/uu/nproc/src/nproc.rs +++ b/src/uu/nproc/src/nproc.rs @@ -7,7 +7,7 @@ // spell-checker:ignore (ToDO) NPROCESSORS nprocs numstr threadstr sysconf -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::env; use uucore::display::Quotable; use uucore::error::{UResult, USimpleError}; @@ -68,12 +68,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(OPT_ALL) .long(OPT_ALL) diff --git a/src/uu/numfmt/src/numfmt.rs b/src/uu/numfmt/src/numfmt.rs index 516d7a4df8a..1b3ab39503a 100644 --- a/src/uu/numfmt/src/numfmt.rs +++ b/src/uu/numfmt/src/numfmt.rs @@ -11,7 +11,7 @@ use crate::errors::*; use crate::format::format_and_print; use crate::options::*; use crate::units::{Result, Unit}; -use clap::{crate_version, App, AppSettings, Arg, ArgMatches}; +use clap::{crate_version, Arg, ArgMatches, Command}; use std::io::{BufRead, Write}; use uucore::display::Quotable; use uucore::error::UResult; @@ -186,14 +186,14 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .after_help(LONG_HELP) .override_usage(format_usage(USAGE)) - .setting(AppSettings::AllowNegativeNumbers) - .setting(AppSettings::InferLongArgs) + .allow_negative_numbers(true) + .infer_long_args(true) .arg( Arg::new(options::DELIMITER) .short('d') diff --git a/src/uu/od/src/od.rs b/src/uu/od/src/od.rs index 3bbe3ab5d17..eeca0171a08 100644 --- a/src/uu/od/src/od.rs +++ b/src/uu/od/src/od.rs @@ -5,7 +5,7 @@ // * For the full copyright and license information, please view the LICENSE // * file that was distributed with this source code. -// spell-checker:ignore (clap) DontDelimitTrailingValues +// spell-checker:ignore (clap) dont // spell-checker:ignore (ToDO) formatteriteminfo inputdecoder inputoffset mockstream nrofbytes partialreader odfunc multifile exitcode #[macro_use] @@ -43,7 +43,7 @@ use crate::parse_nrofbytes::parse_number_of_bytes; use crate::partialreader::*; use crate::peekreader::*; use crate::prn_char::format_ascii_dump; -use clap::{crate_version, App, AppSettings, Arg, ArgMatches}; +use clap::{crate_version, AppSettings, Arg, ArgMatches, Command}; use uucore::display::Quotable; use uucore::error::{UResult, USimpleError}; use uucore::format_usage; @@ -289,18 +289,16 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { odfunc(&mut input_offset, &mut input_decoder, &output_info) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .after_help(LONG_HELP) - .setting( - AppSettings::TrailingVarArg | - AppSettings::DontDelimitTrailingValues | - AppSettings::DeriveDisplayOrder | - AppSettings::InferLongArgs - ) + .trailing_var_arg(true) + .dont_delimit_trailing_values(true) + .infer_long_args(true) + .setting(AppSettings::DeriveDisplayOrder) .arg( Arg::new(options::ADDRESS_RADIX) .short('A') diff --git a/src/uu/paste/src/paste.rs b/src/uu/paste/src/paste.rs index dc93ae625b8..2826a19e354 100644 --- a/src/uu/paste/src/paste.rs +++ b/src/uu/paste/src/paste.rs @@ -7,7 +7,7 @@ // spell-checker:ignore (ToDO) delim -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::fs::File; use std::io::{stdin, stdout, BufRead, BufReader, Read, Write}; use std::path::Path; @@ -47,11 +47,11 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { paste(files, serial, delimiters) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::SERIAL) .long(options::SERIAL) diff --git a/src/uu/pathchk/src/pathchk.rs b/src/uu/pathchk/src/pathchk.rs index 2d72d4a5ab1..6260590aab5 100644 --- a/src/uu/pathchk/src/pathchk.rs +++ b/src/uu/pathchk/src/pathchk.rs @@ -8,7 +8,7 @@ // * that was distributed with this source code. // spell-checker:ignore (ToDO) lstat -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::fs; use std::io::{ErrorKind, Write}; use uucore::display::Quotable; @@ -84,12 +84,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::POSIX) .short('p') diff --git a/src/uu/pinky/src/pinky.rs b/src/uu/pinky/src/pinky.rs index 02ad09d2004..b5ad2c5c959 100644 --- a/src/uu/pinky/src/pinky.rs +++ b/src/uu/pinky/src/pinky.rs @@ -18,7 +18,7 @@ use std::io::BufReader; use std::fs::File; use std::os::unix::fs::MetadataExt; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::path::PathBuf; use uucore::{format_usage, InvalidEncodingHandling}; @@ -123,12 +123,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::LONG_FORMAT) .short('l') diff --git a/src/uu/pr/src/pr.rs b/src/uu/pr/src/pr.rs index 79baf72c994..e18d29730db 100644 --- a/src/uu/pr/src/pr.rs +++ b/src/uu/pr/src/pr.rs @@ -11,7 +11,7 @@ extern crate quick_error; use chrono::offset::Local; use chrono::DateTime; -use clap::{App, AppSettings, Arg, ArgMatches}; +use clap::{AppSettings, Arg, ArgMatches, Command}; use itertools::Itertools; use quick_error::ResultExt; use regex::Regex; @@ -192,13 +192,13 @@ quick_error! { } } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(VERSION) .about(ABOUT) .after_help(AFTER_HELP) - .setting(AppSettings::InferLongArgs) - .setting(AppSettings::AllArgsOverrideSelf) + .infer_long_args(true) + .args_override_self(true) .setting(AppSettings::NoAutoHelp) .setting(AppSettings::NoAutoVersion) .arg( @@ -383,8 +383,8 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { let opt_args = recreate_arguments(&args); - let mut app = uu_app(); - let matches = match app.try_get_matches_from_mut(opt_args) { + let mut command = uu_app(); + let matches = match command.try_get_matches_from_mut(opt_args) { Ok(m) => m, Err(e) => { e.print()?; @@ -394,12 +394,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { }; if matches.is_present(options::VERSION) { - println!("{}", app.render_long_version()); + println!("{}", command.render_long_version()); return Ok(()); } if matches.is_present(options::HELP) { - app.print_long_help()?; + command.print_long_help()?; return Ok(()); } diff --git a/src/uu/printenv/src/printenv.rs b/src/uu/printenv/src/printenv.rs index cb24299cc66..c5832c4df38 100644 --- a/src/uu/printenv/src/printenv.rs +++ b/src/uu/printenv/src/printenv.rs @@ -7,7 +7,7 @@ /* last synced with: printenv (GNU coreutils) 8.13 */ -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::env; use uucore::{error::UResult, format_usage}; @@ -56,12 +56,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(OPT_NULL) .short('0') diff --git a/src/uu/printf/src/printf.rs b/src/uu/printf/src/printf.rs index 2dbc7f99637..662db1ed579 100644 --- a/src/uu/printf/src/printf.rs +++ b/src/uu/printf/src/printf.rs @@ -2,7 +2,7 @@ // spell-checker:ignore (change!) each's // spell-checker:ignore (ToDO) LONGHELP FORMATSTRING templating parameterizing formatstr -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use uucore::error::{UResult, UUsageError}; use uucore::InvalidEncodingHandling; use uucore::{format_usage, memo}; @@ -288,9 +288,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) - .setting(AppSettings::AllowHyphenValues) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) + .allow_hyphen_values(true) .version(crate_version!()) .about(ABOUT) .after_help(AFTER_HELP) diff --git a/src/uu/ptx/src/ptx.rs b/src/uu/ptx/src/ptx.rs index 20a2b13f205..9c3aee13349 100644 --- a/src/uu/ptx/src/ptx.rs +++ b/src/uu/ptx/src/ptx.rs @@ -7,7 +7,7 @@ // spell-checker:ignore (ToDOs) corasick memchr Roff trunc oset iset -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use regex::Regex; use std::cmp; use std::collections::{BTreeSet, HashMap, HashSet}; @@ -702,13 +702,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { write_traditional_output(&config, &file_map, &word_set, &output_file) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .name(NAME) .about(ABOUT) .version(crate_version!()) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::FILE) .hide(true) diff --git a/src/uu/pwd/src/pwd.rs b/src/uu/pwd/src/pwd.rs index 28487545ca5..67462ac163a 100644 --- a/src/uu/pwd/src/pwd.rs +++ b/src/uu/pwd/src/pwd.rs @@ -5,7 +5,7 @@ // * For the full copyright and license information, please view the LICENSE // * file that was distributed with this source code. -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::env; use std::io; use std::path::PathBuf; @@ -148,12 +148,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(OPT_LOGICAL) .short('L') diff --git a/src/uu/readlink/src/readlink.rs b/src/uu/readlink/src/readlink.rs index adbae7a27ee..ba1e368f26a 100644 --- a/src/uu/readlink/src/readlink.rs +++ b/src/uu/readlink/src/readlink.rs @@ -10,7 +10,7 @@ #[macro_use] extern crate uucore; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::fs; use std::io::{stdout, Write}; use std::path::{Path, PathBuf}; @@ -95,12 +95,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_help(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(OPT_CANONICALIZE) .short('f') diff --git a/src/uu/realpath/src/realpath.rs b/src/uu/realpath/src/realpath.rs index 4a42930f30b..bea89c19e95 100644 --- a/src/uu/realpath/src/realpath.rs +++ b/src/uu/realpath/src/realpath.rs @@ -10,7 +10,7 @@ #[macro_use] extern crate uucore; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::{ io::{stdout, Write}, path::{Path, PathBuf}, @@ -70,12 +70,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(OPT_QUIET) .short('q') diff --git a/src/uu/relpath/src/relpath.rs b/src/uu/relpath/src/relpath.rs index a7da7a956d8..2e45ce927b2 100644 --- a/src/uu/relpath/src/relpath.rs +++ b/src/uu/relpath/src/relpath.rs @@ -7,7 +7,7 @@ // spell-checker:ignore (ToDO) subpath absto absfrom absbase -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::env; use std::path::{Path, PathBuf}; use uucore::display::println_verbatim; @@ -78,12 +78,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { println_verbatim(result).map_err_context(String::new) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg(Arg::new(options::DIR).short('d').takes_value(true).help( "If any of FROM and TO is not subpath of DIR, output absolute path instead of relative", )) diff --git a/src/uu/rm/src/rm.rs b/src/uu/rm/src/rm.rs index 9179c6d9fe1..a1924b41db9 100644 --- a/src/uu/rm/src/rm.rs +++ b/src/uu/rm/src/rm.rs @@ -10,7 +10,7 @@ #[macro_use] extern crate uucore; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use remove_dir_all::remove_dir_all; use std::collections::VecDeque; use std::fs; @@ -139,12 +139,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(OPT_FORCE) .short('f') diff --git a/src/uu/rmdir/src/rmdir.rs b/src/uu/rmdir/src/rmdir.rs index bdb6ab60ded..127b8fcf91d 100644 --- a/src/uu/rmdir/src/rmdir.rs +++ b/src/uu/rmdir/src/rmdir.rs @@ -10,7 +10,7 @@ #[macro_use] extern crate uucore; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::fs::{read_dir, remove_dir}; use std::io; use std::path::Path; @@ -170,12 +170,12 @@ struct Opts { verbose: bool, } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(OPT_IGNORE_FAIL_NON_EMPTY) .long(OPT_IGNORE_FAIL_NON_EMPTY) diff --git a/src/uu/runcon/src/runcon.rs b/src/uu/runcon/src/runcon.rs index 55186d2187b..8c20319be33 100644 --- a/src/uu/runcon/src/runcon.rs +++ b/src/uu/runcon/src/runcon.rs @@ -2,7 +2,7 @@ use uucore::error::{UResult, UUsageError}; -use clap::{App, AppSettings, Arg}; +use clap::{Arg, Command}; use selinux::{OpaqueSecurityContext, SecurityClass, SecurityContext}; use uucore::format_usage; @@ -48,7 +48,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(r) => r, Err(r) => { if let Error::CommandLine(ref r) = r { - match r.kind { + match r.kind() { clap::ErrorKind::DisplayHelp | clap::ErrorKind::DisplayVersion => { println!("{}", r); return Ok(()); @@ -103,13 +103,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(VERSION) .about(ABOUT) .after_help(DESCRIPTION) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::COMPUTE) .short('c') @@ -162,7 +162,7 @@ pub fn uu_app<'a>() -> App<'a> { // // This is not how POSIX does things, but this is how the GNU implementation // parses its command line. - .setting(clap::AppSettings::TrailingVarArg) + .trailing_var_arg(true) } #[derive(Debug)] @@ -205,7 +205,7 @@ struct Options { arguments: Vec, } -fn parse_command_line(config: App, args: impl uucore::Args) -> Result { +fn parse_command_line(config: Command, args: impl uucore::Args) -> Result { let matches = config.try_get_matches_from(args)?; let compute_transition_context = matches.is_present(options::COMPUTE); diff --git a/src/uu/seq/src/seq.rs b/src/uu/seq/src/seq.rs index 788583a726c..851857ea11c 100644 --- a/src/uu/seq/src/seq.rs +++ b/src/uu/seq/src/seq.rs @@ -7,7 +7,7 @@ use std::io::{stdout, ErrorKind, Write}; use std::process::exit; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use num_traits::Zero; use uucore::error::FromIo; @@ -141,11 +141,11 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) - .setting(AppSettings::TrailingVarArg) - .setting(AppSettings::AllowNegativeNumbers) - .setting(AppSettings::InferLongArgs) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) + .trailing_var_arg(true) + .allow_negative_numbers(true) + .infer_long_args(true) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) diff --git a/src/uu/shred/src/shred.rs b/src/uu/shred/src/shred.rs index 5c545e8e7cd..05c8d18050e 100644 --- a/src/uu/shred/src/shred.rs +++ b/src/uu/shred/src/shred.rs @@ -8,7 +8,7 @@ // spell-checker:ignore (words) writeback wipesync -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use rand::prelude::SliceRandom; use rand::Rng; use std::cell::{Cell, RefCell}; @@ -314,13 +314,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .after_help(AFTER_HELP) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::FORCE) .long(options::FORCE) diff --git a/src/uu/shuf/src/shuf.rs b/src/uu/shuf/src/shuf.rs index c331d786738..6a3e325c7ad 100644 --- a/src/uu/shuf/src/shuf.rs +++ b/src/uu/shuf/src/shuf.rs @@ -7,7 +7,7 @@ // spell-checker:ignore (ToDO) cmdline evec seps rvec fdata -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use rand::prelude::SliceRandom; use rand::RngCore; use std::fs::File; @@ -119,13 +119,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .name(NAME) .about(ABOUT) .version(crate_version!()) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::ECHO) .short('e') @@ -134,7 +134,7 @@ pub fn uu_app<'a>() -> App<'a> { .value_name("ARG") .help("treat each ARG as an input line") .multiple_occurrences(true) - .use_delimiter(false) + .use_value_delimiter(false) .min_values(0) .conflicts_with(options::INPUT_RANGE), ) diff --git a/src/uu/sleep/src/sleep.rs b/src/uu/sleep/src/sleep.rs index 0c8de143e8d..2ac6275a658 100644 --- a/src/uu/sleep/src/sleep.rs +++ b/src/uu/sleep/src/sleep.rs @@ -13,7 +13,7 @@ use uucore::{ format_usage, }; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; static ABOUT: &str = "Pause for NUMBER seconds."; const USAGE: &str = "\ @@ -41,13 +41,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .after_help(LONG_HELP) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::NUMBER) .help("pause for NUMBER seconds") diff --git a/src/uu/sort/src/sort.rs b/src/uu/sort/src/sort.rs index 1c118b15aa9..70cebad4f86 100644 --- a/src/uu/sort/src/sort.rs +++ b/src/uu/sort/src/sort.rs @@ -25,7 +25,7 @@ mod numeric_str_cmp; mod tmp_dir; use chunks::LineData; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use custom_str_cmp::custom_str_cmp; use ext_sort::ext_sort; use fnv::FnvHasher; @@ -1268,12 +1268,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { exec(&mut files, &settings, output, &mut tmp_dir) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::modes::SORT) .long(options::modes::SORT) diff --git a/src/uu/split/src/split.rs b/src/uu/split/src/split.rs index fb8c44dcbb5..6cb7c629aad 100644 --- a/src/uu/split/src/split.rs +++ b/src/uu/split/src/split.rs @@ -13,7 +13,7 @@ mod platform; use crate::filenames::FilenameIterator; use crate::filenames::SuffixType; -use clap::{crate_version, App, AppSettings, Arg, ArgMatches}; +use clap::{crate_version, Arg, ArgMatches, Command}; use std::convert::TryInto; use std::env; use std::fmt; @@ -62,13 +62,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about("Create output files containing consecutive or interleaved sections of input") .after_help(AFTER_HELP) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) // strategy (mutually exclusive) .arg( Arg::new(OPT_BYTES) diff --git a/src/uu/stat/src/stat.rs b/src/uu/stat/src/stat.rs index 569c94d96f1..7d107302094 100644 --- a/src/uu/stat/src/stat.rs +++ b/src/uu/stat/src/stat.rs @@ -16,7 +16,7 @@ use uucore::fsext::{ use uucore::libc::mode_t; use uucore::{entries, format_usage}; -use clap::{crate_version, App, AppSettings, Arg, ArgMatches}; +use clap::{crate_version, Arg, ArgMatches, Command}; use std::borrow::Cow; use std::convert::AsRef; use std::os::unix::fs::{FileTypeExt, MetadataExt}; @@ -967,12 +967,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::DEREFERENCE) .short('L') diff --git a/src/uu/stdbuf/src/stdbuf.rs b/src/uu/stdbuf/src/stdbuf.rs index 8bd28b62601..2eedb038bb8 100644 --- a/src/uu/stdbuf/src/stdbuf.rs +++ b/src/uu/stdbuf/src/stdbuf.rs @@ -10,13 +10,13 @@ #[macro_use] extern crate uucore; -use clap::{crate_version, App, AppSettings, Arg, ArgMatches}; +use clap::{crate_version, Arg, ArgMatches, Command}; use std::convert::{TryFrom, TryInto}; use std::fs::File; use std::io::{self, Write}; use std::os::unix::process::ExitStatusExt; use std::path::PathBuf; -use std::process::Command; +use std::process; use tempfile::tempdir; use tempfile::TempDir; use uucore::error::{FromIo, UResult, USimpleError, UUsageError}; @@ -131,7 +131,7 @@ fn check_option(matches: &ArgMatches, name: &str) -> Result { command.env(buffer_name, m.to_string()); @@ -164,7 +164,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { let options = ProgramOptions::try_from(&matches).map_err(|e| UUsageError::new(125, e.0))?; let mut command_values = matches.values_of::<&str>(options::COMMAND).unwrap(); - let mut command = Command::new(command_values.next().unwrap()); + let mut command = process::Command::new(command_values.next().unwrap()); let command_params: Vec<&str> = command_values.collect(); let mut tmp_dir = tempdir().unwrap(); @@ -194,14 +194,14 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .after_help(LONG_HELP) .override_usage(format_usage(USAGE)) - .setting(AppSettings::TrailingVarArg) - .setting(AppSettings::InferLongArgs) + .trailing_var_arg(true) + .infer_long_args(true) .arg( Arg::new(options::INPUT) .long(options::INPUT) diff --git a/src/uu/sum/src/sum.rs b/src/uu/sum/src/sum.rs index 4dacf61cb48..5016359105f 100644 --- a/src/uu/sum/src/sum.rs +++ b/src/uu/sum/src/sum.rs @@ -10,7 +10,7 @@ #[macro_use] extern crate uucore; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::fs::File; use std::io::{stdin, Read}; use std::path::Path; @@ -140,13 +140,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .name(NAME) .version(crate_version!()) .override_usage(format_usage(USAGE)) .about(SUMMARY) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::FILE) .multiple_occurrences(true) diff --git a/src/uu/sync/src/sync.rs b/src/uu/sync/src/sync.rs index 773e49479f8..f9c18d50080 100644 --- a/src/uu/sync/src/sync.rs +++ b/src/uu/sync/src/sync.rs @@ -9,7 +9,7 @@ extern crate libc; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::path::Path; use uucore::display::Quotable; use uucore::error::{UResult, USimpleError}; @@ -190,12 +190,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::FILE_SYSTEM) .short('f') diff --git a/src/uu/tac/src/tac.rs b/src/uu/tac/src/tac.rs index 925968f74c1..3151b97e22c 100644 --- a/src/uu/tac/src/tac.rs +++ b/src/uu/tac/src/tac.rs @@ -8,7 +8,7 @@ // spell-checker:ignore (ToDO) sbytes slen dlen memmem memmap Mmap mmap SIGBUS mod error; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use memchr::memmem; use memmap2::Mmap; use std::io::{stdin, stdout, BufWriter, Read, Write}; @@ -60,13 +60,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { tac(&files, before, regex, separator) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .name(NAME) .version(crate_version!()) .override_usage(format_usage(USAGE)) .about(SUMMARY) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::BEFORE) .short('b') diff --git a/src/uu/tail/src/tail.rs b/src/uu/tail/src/tail.rs index 27153117c84..bbbc9810d96 100644 --- a/src/uu/tail/src/tail.rs +++ b/src/uu/tail/src/tail.rs @@ -20,7 +20,7 @@ mod parse; mod platform; use chunks::ReverseChunks; -use clap::{App, AppSettings, Arg}; +use clap::{Arg, Command}; use std::collections::VecDeque; use std::convert::TryInto; use std::ffi::OsString; @@ -275,12 +275,12 @@ fn arg_iterate<'a>( } } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::BYTES) .short('c') diff --git a/src/uu/tee/src/tee.rs b/src/uu/tee/src/tee.rs index a1ba6b20144..d9c2e78f1b0 100644 --- a/src/uu/tee/src/tee.rs +++ b/src/uu/tee/src/tee.rs @@ -8,7 +8,7 @@ #[macro_use] extern crate uucore; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use retain_mut::RetainMut; use std::fs::OpenOptions; use std::io::{copy, sink, stdin, stdout, Error, ErrorKind, Read, Result, Write}; @@ -55,13 +55,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .after_help("If a FILE is -, it refers to a file named - .") - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::APPEND) .long(options::APPEND) diff --git a/src/uu/test/src/test.rs b/src/uu/test/src/test.rs index f91aaf8ea39..e53ba4db192 100644 --- a/src/uu/test/src/test.rs +++ b/src/uu/test/src/test.rs @@ -10,7 +10,7 @@ mod parser; -use clap::{crate_version, App}; +use clap::{crate_version, Command}; use parser::{parse, Operator, Symbol, UnaryOperator}; use std::ffi::{OsStr, OsString}; use uucore::display::Quotable; @@ -90,8 +90,8 @@ for details about the options it supports."; const ABOUT: &str = "Check file types and compare values."; -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) @@ -108,7 +108,7 @@ pub fn uumain(mut args: impl uucore::Args) -> UResult<()> { // If invoked as [ we should recognize --help and --version (but not -h or -v) if args.len() == 1 && (args[0] == "--help" || args[0] == "--version") { // Let clap pretty-print help and version - App::new(binary_name) + Command::new(binary_name) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) diff --git a/src/uu/timeout/src/timeout.rs b/src/uu/timeout/src/timeout.rs index 3da0bcd2a85..192892d4f60 100644 --- a/src/uu/timeout/src/timeout.rs +++ b/src/uu/timeout/src/timeout.rs @@ -14,9 +14,9 @@ extern crate uucore; extern crate clap; use crate::status::ExitStatus; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::io::ErrorKind; -use std::process::{Child, Command, Stdio}; +use std::process::{self, Child, Stdio}; use std::time::Duration; use uucore::display::Quotable; use uucore::error::{UResult, USimpleError}; @@ -103,9 +103,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { .collect_str(InvalidEncodingHandling::ConvertLossy) .accept_any(); - let app = uu_app(); + let command = uu_app(); - let matches = app.get_matches_from(args); + let matches = command.get_matches_from(args); let config = Config::from(&matches)?; timeout( @@ -119,8 +119,8 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { ) } -pub fn uu_app<'a>() -> App<'a> { - App::new("timeout") +pub fn uu_app<'a>() -> Command<'a> { + Command::new("timeout") .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) @@ -162,8 +162,8 @@ pub fn uu_app<'a>() -> App<'a> { .required(true) .multiple_occurrences(true) ) - .setting(AppSettings::TrailingVarArg) - .setting(AppSettings::InferLongArgs) + .trailing_var_arg(true) + .infer_long_args(true) } /// Remove pre-existing SIGCHLD handlers that would make waiting for the child's exit code fail. @@ -245,7 +245,7 @@ fn timeout( if !foreground { unsafe { libc::setpgid(0, 0) }; } - let mut process = Command::new(&cmd[0]) + let mut process = process::Command::new(&cmd[0]) .args(&cmd[1..]) .stdin(Stdio::inherit()) .stdout(Stdio::inherit()) diff --git a/src/uu/touch/src/touch.rs b/src/uu/touch/src/touch.rs index 2b56cdb95aa..220a8476e59 100644 --- a/src/uu/touch/src/touch.rs +++ b/src/uu/touch/src/touch.rs @@ -13,7 +13,7 @@ pub extern crate filetime; #[macro_use] extern crate uucore; -use clap::{crate_version, App, AppSettings, Arg, ArgGroup}; +use clap::{crate_version, Arg, ArgGroup, Command}; use filetime::*; use std::fs::{self, File}; use std::path::{Path, PathBuf}; @@ -149,12 +149,12 @@ Try 'touch --help' for more information."##, Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::ACCESS) .short('a') diff --git a/src/uu/tr/src/tr.rs b/src/uu/tr/src/tr.rs index a92a7308ac5..dd8edc518aa 100644 --- a/src/uu/tr/src/tr.rs +++ b/src/uu/tr/src/tr.rs @@ -11,7 +11,7 @@ mod convert; mod operation; mod unicode_table; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use nom::AsBytes; use operation::{translate_input, Sequence, SqueezeOperation, TranslateOperation}; use std::io::{stdin, stdout, BufReader, BufWriter}; @@ -137,13 +137,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) + .infer_long_args(true) .arg( Arg::new(options::COMPLEMENT) .visible_short_alias('C') diff --git a/src/uu/true/src/true.rs b/src/uu/true/src/true.rs index 4a8452db6a4..57c3d2af51a 100644 --- a/src/uu/true/src/true.rs +++ b/src/uu/true/src/true.rs @@ -4,7 +4,7 @@ // * // * For the full copyright and license information, please view the LICENSE // * file that was distributed with this source code. -use clap::{App, AppSettings, Arg}; +use clap::{Arg, Command}; use std::io::Write; use uucore::error::{set_exit_code, UResult}; @@ -18,13 +18,13 @@ operation causes the program to return `1` instead. #[uucore::main] pub fn uumain(args: impl uucore::Args) -> UResult<()> { - let mut app = uu_app(); + let mut command = uu_app(); - if let Ok(matches) = app.try_get_matches_from_mut(args) { + if let Ok(matches) = command.try_get_matches_from_mut(args) { let error = if matches.index_of("help").is_some() { - app.print_long_help() + command.print_long_help() } else if matches.index_of("version").is_some() { - writeln!(std::io::stdout(), "{}", app.render_version()) + writeln!(std::io::stdout(), "{}", command.render_version()) } else { Ok(()) }; @@ -42,12 +42,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(clap::crate_version!()) .about(ABOUT) // We provide our own help and version options, to ensure maximum compatibility with GNU. - .setting(AppSettings::DisableHelpFlag | AppSettings::DisableVersionFlag) + .disable_help_flag(true) + .disable_version_flag(true) .arg( Arg::new("help") .long("help") diff --git a/src/uu/truncate/src/truncate.rs b/src/uu/truncate/src/truncate.rs index b88040fb8ab..6c9d8197be4 100644 --- a/src/uu/truncate/src/truncate.rs +++ b/src/uu/truncate/src/truncate.rs @@ -6,7 +6,7 @@ // * file that was distributed with this source code. // spell-checker:ignore (ToDO) RFILE refsize rfilename fsize tsize -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::fs::{metadata, OpenOptions}; use std::io::ErrorKind; #[cfg(unix)] @@ -115,7 +115,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { .try_get_matches_from(args) .map_err(|e| { e.print().expect("Error writing clap::Error"); - match e.kind { + match e.kind() { clap::ErrorKind::DisplayHelp | clap::ErrorKind::DisplayVersion => 0, _ => 1, } @@ -137,12 +137,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::IO_BLOCKS) .short('o') diff --git a/src/uu/tsort/src/tsort.rs b/src/uu/tsort/src/tsort.rs index 61cb9525695..aecd492fe26 100644 --- a/src/uu/tsort/src/tsort.rs +++ b/src/uu/tsort/src/tsort.rs @@ -5,7 +5,7 @@ // * // * For the full copyright and license information, please view the LICENSE // * file that was distributed with this source code. -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::collections::{HashMap, HashSet}; use std::fs::File; use std::io::{stdin, BufRead, BufReader, Read}; @@ -93,12 +93,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .override_usage(format_usage(USAGE)) .about(SUMMARY) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg(Arg::new(options::FILE).default_value("-").hide(true)) } diff --git a/src/uu/tty/src/tty.rs b/src/uu/tty/src/tty.rs index e3d13b67d28..b13b61784a3 100644 --- a/src/uu/tty/src/tty.rs +++ b/src/uu/tty/src/tty.rs @@ -9,7 +9,7 @@ // spell-checker:ignore (ToDO) ttyname filedesc -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::ffi::CStr; use std::io::Write; use uucore::error::{UResult, UUsageError}; @@ -66,12 +66,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::SILENT) .long(options::SILENT) diff --git a/src/uu/uname/src/uname.rs b/src/uu/uname/src/uname.rs index c5c2b88017c..bff03304753 100644 --- a/src/uu/uname/src/uname.rs +++ b/src/uu/uname/src/uname.rs @@ -10,7 +10,7 @@ // spell-checker:ignore (ToDO) nodename kernelname kernelrelease kernelversion sysname hwplatform mnrsv -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use platform_info::*; use uucore::{ error::{FromIo, UResult}, @@ -121,12 +121,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg(Arg::new(options::ALL) .short('a') .long(options::ALL) diff --git a/src/uu/unexpand/src/unexpand.rs b/src/uu/unexpand/src/unexpand.rs index 55bd51ad1d6..910ff91d372 100644 --- a/src/uu/unexpand/src/unexpand.rs +++ b/src/uu/unexpand/src/unexpand.rs @@ -11,7 +11,7 @@ #[macro_use] extern crate uucore; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::fs::File; use std::io::{stdin, stdout, BufRead, BufReader, BufWriter, Read, Stdout, Write}; use std::str::from_utf8; @@ -102,13 +102,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { unexpand(&Options::new(&matches)).map_err_context(String::new) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .name(NAME) .version(crate_version!()) .override_usage(format_usage(USAGE)) .about(SUMMARY) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg(Arg::new(options::FILE).hide(true).multiple_occurrences(true)) .arg( Arg::new(options::ALL) diff --git a/src/uu/uniq/src/uniq.rs b/src/uu/uniq/src/uniq.rs index a22db42a903..020de023000 100644 --- a/src/uu/uniq/src/uniq.rs +++ b/src/uu/uniq/src/uniq.rs @@ -5,7 +5,7 @@ // * For the full copyright and license information, please view the LICENSE // * file that was distributed with this source code. -use clap::{crate_version, App, AppSettings, Arg, ArgMatches}; +use clap::{crate_version, Arg, ArgMatches, Command}; use std::fs::File; use std::io::{self, stdin, stdout, BufRead, BufReader, BufWriter, Read, Write}; use std::path::Path; @@ -290,12 +290,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { ) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::ALL_REPEATED) .short('D') diff --git a/src/uu/unlink/src/unlink.rs b/src/uu/unlink/src/unlink.rs index 65544612bce..fc72b46239b 100644 --- a/src/uu/unlink/src/unlink.rs +++ b/src/uu/unlink/src/unlink.rs @@ -10,7 +10,7 @@ use std::fs::remove_file; use std::path::Path; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use uucore::display::Quotable; use uucore::error::{FromIo, UResult}; @@ -27,11 +27,11 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { remove_file(path).map_err_context(|| format!("cannot unlink {}", path.quote())) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(OPT_PATH) .required(true) diff --git a/src/uu/uptime/src/uptime.rs b/src/uu/uptime/src/uptime.rs index ac9ba6d1596..a93344dbcd1 100644 --- a/src/uu/uptime/src/uptime.rs +++ b/src/uu/uptime/src/uptime.rs @@ -9,7 +9,7 @@ // spell-checker:ignore (ToDO) getloadavg upsecs updays nusers loadavg boottime uphours upmins use chrono::{Local, TimeZone, Utc}; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use uucore::format_usage; // import crate time from utmpx @@ -59,12 +59,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::SINCE) .short('s') diff --git a/src/uu/users/src/users.rs b/src/uu/users/src/users.rs index 761080139c6..79fac3b68be 100644 --- a/src/uu/users/src/users.rs +++ b/src/uu/users/src/users.rs @@ -10,7 +10,7 @@ use std::path::Path; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use uucore::error::UResult; use uucore::format_usage; use uucore::utmpx::{self, Utmpx}; @@ -58,11 +58,11 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg(Arg::new(ARG_FILES).takes_value(true).max_values(1)) } diff --git a/src/uu/wc/src/wc.rs b/src/uu/wc/src/wc.rs index a07877e0ed0..61eda682899 100644 --- a/src/uu/wc/src/wc.rs +++ b/src/uu/wc/src/wc.rs @@ -18,7 +18,7 @@ use utf8::{BufReadDecoder, BufReadDecoderError}; use uucore::format_usage; use word_count::{TitledWordCount, WordCount}; -use clap::{crate_version, App, AppSettings, Arg, ArgMatches}; +use clap::{crate_version, Arg, ArgMatches, Command}; use std::cmp::max; use std::error::Error; @@ -183,12 +183,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { wc(&inputs, &settings) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::BYTES) .short('c') diff --git a/src/uu/who/src/who.rs b/src/uu/who/src/who.rs index 8c0a66c3653..98ef06f4766 100644 --- a/src/uu/who/src/who.rs +++ b/src/uu/who/src/who.rs @@ -12,7 +12,7 @@ use uucore::error::{FromIo, UResult}; use uucore::libc::{ttyname, STDIN_FILENO, S_IWGRP}; use uucore::utmpx::{self, time, Utmpx}; -use clap::{crate_version, App, AppSettings, Arg}; +use clap::{crate_version, Arg, Command}; use std::borrow::Cow; use std::ffi::CStr; use std::os::unix::fs::MetadataExt; @@ -151,12 +151,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { who.exec() } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) .arg( Arg::new(options::ALL) .long(options::ALL) diff --git a/src/uu/whoami/src/whoami.rs b/src/uu/whoami/src/whoami.rs index f55e026da4f..77080276461 100644 --- a/src/uu/whoami/src/whoami.rs +++ b/src/uu/whoami/src/whoami.rs @@ -10,7 +10,7 @@ #[macro_use] extern crate clap; -use clap::{App, AppSettings}; +use clap::Command; use uucore::display::println_verbatim; use uucore::error::{FromIo, UResult}; @@ -27,9 +27,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> App<'a> { - App::new(uucore::util_name()) +pub fn uu_app<'a>() -> Command<'a> { + Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) } diff --git a/src/uu/yes/src/yes.rs b/src/uu/yes/src/yes.rs index b237fb857f5..879f60579ca 100644 --- a/src/uu/yes/src/yes.rs +++ b/src/uu/yes/src/yes.rs @@ -13,7 +13,7 @@ use std::io::{self, Write}; #[macro_use] extern crate clap; -use clap::{App, AppSettings, Arg}; +use clap::{Arg, Command}; use uucore::error::{UResult, USimpleError}; use uucore::format_usage; @@ -49,11 +49,11 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } } -pub fn uu_app<'a>() -> App<'a> { - app_from_crate!() +pub fn uu_app<'a>() -> Command<'a> { + command!() .override_usage(format_usage(USAGE)) .arg(Arg::new("STRING").index(1).multiple_occurrences(true)) - .setting(AppSettings::InferLongArgs) + .infer_long_args(true) } fn prepare_buffer<'a>(input: &'a str, buffer: &'a mut [u8; BUF_SIZE]) -> &'a [u8] { diff --git a/src/uucore/src/lib/features/perms.rs b/src/uucore/src/lib/features/perms.rs index 942c67e2974..970b2fca9b7 100644 --- a/src/uucore/src/lib/features/perms.rs +++ b/src/uucore/src/lib/features/perms.rs @@ -12,9 +12,9 @@ use crate::error::USimpleError; pub use crate::features::entries; use crate::fs::resolve_relative_path; use crate::show_error; -use clap::App; use clap::Arg; use clap::ArgMatches; +use clap::Command; use libc::{self, gid_t, uid_t}; use walkdir::WalkDir; @@ -414,13 +414,13 @@ type GidUidFilterParser = fn(&ArgMatches) -> UResult<(Option, Option, /// Base implementation for `chgrp` and `chown`. /// -/// An argument called `add_arg_if_not_reference` will be added to `app` if +/// An argument called `add_arg_if_not_reference` will be added to `command` if /// `args` does not contain the `--reference` option. /// `parse_gid_uid_and_filter` will be called to obtain the target gid and uid, and the filter, /// from `ArgMatches`. /// `groups_only` determines whether verbose output will only mention the group. pub fn chown_base<'a>( - mut app: App<'a>, + mut command: Command<'a>, args: impl crate::Args, add_arg_if_not_reference: &'a str, parse_gid_uid_and_filter: GidUidFilterParser, @@ -444,7 +444,7 @@ pub fn chown_base<'a>( if help || !reference { // add both positional arguments // arg_group is only required if - app = app.arg( + command = command.arg( Arg::new(add_arg_if_not_reference) .value_name(add_arg_if_not_reference) .required(true) @@ -452,7 +452,7 @@ pub fn chown_base<'a>( .multiple_occurrences(false), ); } - app = app.arg( + command = command.arg( Arg::new(options::ARG_FILES) .value_name(options::ARG_FILES) .multiple_occurrences(true) @@ -460,7 +460,7 @@ pub fn chown_base<'a>( .required(true) .min_values(1), ); - let matches = app.get_matches_from(args); + let matches = command.get_matches_from(args); let files: Vec = matches .values_of(options::ARG_FILES) diff --git a/src/uucore/src/lib/mods/backup_control.rs b/src/uucore/src/lib/mods/backup_control.rs index a2753b964b5..f2da374b6cb 100644 --- a/src/uucore/src/lib/mods/backup_control.rs +++ b/src/uucore/src/lib/mods/backup_control.rs @@ -34,16 +34,16 @@ //! #[macro_use] //! extern crate uucore; //! -//! use clap::{App, Arg, ArgMatches}; +//! use clap::{Command, Arg, ArgMatches}; //! use std::path::{Path, PathBuf}; //! use uucore::backup_control::{self, BackupMode}; //! use uucore::error::{UError, UResult}; //! //! fn main() { -//! let usage = String::from("app [OPTION]... ARG"); +//! let usage = String::from("command [OPTION]... ARG"); //! let long_usage = String::from("And here's a detailed explanation"); //! -//! let matches = App::new("app") +//! let matches = Command::new("command") //! .arg(backup_control::arguments::backup()) //! .arg(backup_control::arguments::backup_no_args()) //! .arg(backup_control::arguments::suffix()) @@ -54,7 +54,7 @@ //! backup_control::BACKUP_CONTROL_LONG_HELP //! )) //! .get_matches_from(vec![ -//! "app", "--backup=t", "--suffix=bak~" +//! "command", "--backup=t", "--suffix=bak~" //! ]); //! //! let backup_mode = match backup_control::determine_backup_mode(&matches) { @@ -290,14 +290,14 @@ pub fn determine_backup_suffix(matches: &ArgMatches) -> String { /// #[macro_use] /// extern crate uucore; /// use uucore::backup_control::{self, BackupMode}; -/// use clap::{App, Arg, ArgMatches}; +/// use clap::{Command, Arg, ArgMatches}; /// /// fn main() { -/// let matches = App::new("app") +/// let matches = Command::new("command") /// .arg(backup_control::arguments::backup()) /// .arg(backup_control::arguments::backup_no_args()) /// .get_matches_from(vec![ -/// "app", "-b", "--backup=t" +/// "command", "-b", "--backup=t" /// ]); /// /// let backup_mode = backup_control::determine_backup_mode(&matches).unwrap(); @@ -313,14 +313,14 @@ pub fn determine_backup_suffix(matches: &ArgMatches) -> String { /// #[macro_use] /// extern crate uucore; /// use uucore::backup_control::{self, BackupMode, BackupError}; -/// use clap::{App, Arg, ArgMatches}; +/// use clap::{Command, Arg, ArgMatches}; /// /// fn main() { -/// let matches = App::new("app") +/// let matches = Command::new("command") /// .arg(backup_control::arguments::backup()) /// .arg(backup_control::arguments::backup_no_args()) /// .get_matches_from(vec![ -/// "app", "-b", "--backup=n" +/// "command", "-b", "--backup=n" /// ]); /// /// let backup_mode = backup_control::determine_backup_mode(&matches); @@ -446,7 +446,7 @@ mod tests { use super::*; use std::env; // Required to instantiate mutex in shared context - use clap::App; + use clap::Command; use lazy_static::lazy_static; use std::sync::Mutex; @@ -463,8 +463,8 @@ mod tests { // Environment variable for "VERSION_CONTROL" static ENV_VERSION_CONTROL: &str = "VERSION_CONTROL"; - fn make_app() -> clap::App<'static> { - App::new("app") + fn make_app() -> clap::Command<'static> { + Command::new("command") .arg(arguments::backup()) .arg(arguments::backup_no_args()) .arg(arguments::suffix()) @@ -474,7 +474,7 @@ mod tests { #[test] fn test_backup_mode_short_only() { let _dummy = TEST_MUTEX.lock().unwrap(); - let matches = make_app().get_matches_from(vec!["app", "-b"]); + let matches = make_app().get_matches_from(vec!["command", "-b"]); let result = determine_backup_mode(&matches).unwrap(); @@ -485,7 +485,7 @@ mod tests { #[test] fn test_backup_mode_long_preferred_over_short() { let _dummy = TEST_MUTEX.lock().unwrap(); - let matches = make_app().get_matches_from(vec!["app", "-b", "--backup=none"]); + let matches = make_app().get_matches_from(vec!["command", "-b", "--backup=none"]); let result = determine_backup_mode(&matches).unwrap(); @@ -496,7 +496,7 @@ mod tests { #[test] fn test_backup_mode_long_without_args_no_env() { let _dummy = TEST_MUTEX.lock().unwrap(); - let matches = make_app().get_matches_from(vec!["app", "--backup"]); + let matches = make_app().get_matches_from(vec!["command", "--backup"]); let result = determine_backup_mode(&matches).unwrap(); @@ -507,7 +507,7 @@ mod tests { #[test] fn test_backup_mode_long_with_args() { let _dummy = TEST_MUTEX.lock().unwrap(); - let matches = make_app().get_matches_from(vec!["app", "--backup=simple"]); + let matches = make_app().get_matches_from(vec!["command", "--backup=simple"]); let result = determine_backup_mode(&matches).unwrap(); @@ -518,7 +518,7 @@ mod tests { #[test] fn test_backup_mode_long_with_args_invalid() { let _dummy = TEST_MUTEX.lock().unwrap(); - let matches = make_app().get_matches_from(vec!["app", "--backup=foobar"]); + let matches = make_app().get_matches_from(vec!["command", "--backup=foobar"]); let result = determine_backup_mode(&matches); @@ -531,7 +531,7 @@ mod tests { #[test] fn test_backup_mode_long_with_args_ambiguous() { let _dummy = TEST_MUTEX.lock().unwrap(); - let matches = make_app().get_matches_from(vec!["app", "--backup=n"]); + let matches = make_app().get_matches_from(vec!["command", "--backup=n"]); let result = determine_backup_mode(&matches); @@ -544,7 +544,7 @@ mod tests { #[test] fn test_backup_mode_long_with_arg_shortened() { let _dummy = TEST_MUTEX.lock().unwrap(); - let matches = make_app().get_matches_from(vec!["app", "--backup=si"]); + let matches = make_app().get_matches_from(vec!["command", "--backup=si"]); let result = determine_backup_mode(&matches).unwrap(); @@ -556,7 +556,7 @@ mod tests { fn test_backup_mode_short_only_ignore_env() { let _dummy = TEST_MUTEX.lock().unwrap(); env::set_var(ENV_VERSION_CONTROL, "none"); - let matches = make_app().get_matches_from(vec!["app", "-b"]); + let matches = make_app().get_matches_from(vec!["command", "-b"]); let result = determine_backup_mode(&matches).unwrap(); @@ -569,7 +569,7 @@ mod tests { fn test_backup_mode_long_without_args_with_env() { let _dummy = TEST_MUTEX.lock().unwrap(); env::set_var(ENV_VERSION_CONTROL, "none"); - let matches = make_app().get_matches_from(vec!["app", "--backup"]); + let matches = make_app().get_matches_from(vec!["command", "--backup"]); let result = determine_backup_mode(&matches).unwrap(); @@ -582,7 +582,7 @@ mod tests { fn test_backup_mode_long_with_env_var_invalid() { let _dummy = TEST_MUTEX.lock().unwrap(); env::set_var(ENV_VERSION_CONTROL, "foobar"); - let matches = make_app().get_matches_from(vec!["app", "--backup"]); + let matches = make_app().get_matches_from(vec!["command", "--backup"]); let result = determine_backup_mode(&matches); @@ -597,7 +597,7 @@ mod tests { fn test_backup_mode_long_with_env_var_ambiguous() { let _dummy = TEST_MUTEX.lock().unwrap(); env::set_var(ENV_VERSION_CONTROL, "n"); - let matches = make_app().get_matches_from(vec!["app", "--backup"]); + let matches = make_app().get_matches_from(vec!["command", "--backup"]); let result = determine_backup_mode(&matches); @@ -612,7 +612,7 @@ mod tests { fn test_backup_mode_long_with_env_var_shortened() { let _dummy = TEST_MUTEX.lock().unwrap(); env::set_var(ENV_VERSION_CONTROL, "si"); - let matches = make_app().get_matches_from(vec!["app", "--backup"]); + let matches = make_app().get_matches_from(vec!["command", "--backup"]); let result = determine_backup_mode(&matches).unwrap(); @@ -623,7 +623,7 @@ mod tests { #[test] fn test_suffix_takes_hyphen_value() { let _dummy = TEST_MUTEX.lock().unwrap(); - let matches = make_app().get_matches_from(vec!["app", "-b", "--suffix", "-v"]); + let matches = make_app().get_matches_from(vec!["command", "-b", "--suffix", "-v"]); let result = determine_backup_suffix(&matches); assert_eq!(result, "-v"); diff --git a/tests/by-util/test_link.rs b/tests/by-util/test_link.rs index 5a84364e957..6e98f1d64fe 100644 --- a/tests/by-util/test_link.rs +++ b/tests/by-util/test_link.rs @@ -45,7 +45,7 @@ fn test_link_one_argument() { let (_, mut ucmd) = at_and_ucmd!(); let file = "test_link_argument"; ucmd.args(&[file]).fails().stderr_contains( - "error: The argument '...' requires at least 2 values, but only 1 was provide", + "error: The argument '...' requires at least 2 values but only 1 was provided", ); } diff --git a/tests/by-util/test_mknod.rs b/tests/by-util/test_mknod.rs index f42ab0b90d7..3b22ef83548 100644 --- a/tests/by-util/test_mknod.rs +++ b/tests/by-util/test_mknod.rs @@ -86,14 +86,14 @@ fn test_mknod_character_device_requires_major_and_minor() { .arg("1") .arg("c") .fails() - .stderr_contains(&"Invalid value for ''"); + .stderr_contains(&"Invalid value \"c\" for ''"); new_ucmd!() .arg("test_file") .arg("c") .arg("c") .arg("1") .fails() - .stderr_contains(&"Invalid value for ''"); + .stderr_contains(&"Invalid value \"c\" for ''"); } #[test] From ee1ae6497041bb8c6fc44420dc15da8d3f51628e Mon Sep 17 00:00:00 2001 From: Terts Diepraam Date: Sat, 19 Mar 2022 16:28:21 +0100 Subject: [PATCH 3/5] bump textwrap to 0.15 --- Cargo.lock | 15 +++------------ Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fcc0b4ca4c9..3c57717b8c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -349,7 +349,7 @@ dependencies = [ "selinux", "sha1", "tempfile", - "textwrap 0.14.2", + "textwrap 0.15.0", "time", "unindent", "unix_socket", @@ -2087,9 +2087,9 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.14.2" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80" +checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" dependencies = [ "smawk", "terminal_size", @@ -2097,15 +2097,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "textwrap" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" -dependencies = [ - "terminal_size", -] - [[package]] name = "thiserror" version = "1.0.30" diff --git a/Cargo.toml b/Cargo.toml index 7668a27a07e..517752e32f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -249,7 +249,7 @@ clap = { version = "3.1", features = ["wrap_help", "cargo"] } clap_complete = "3.0" phf = "0.10.1" lazy_static = { version="1.3" } -textwrap = { version="0.14", features=["terminal_size"] } +textwrap = { version="0.15", features=["terminal_size"] } uucore = { version=">=0.0.11", package="uucore", path="src/uucore" } selinux = { version="0.2", optional = true } ureq = "2.4.0" From 32cadbc715aa977fa941b4d34c36883fb04bc5bb Mon Sep 17 00:00:00 2001 From: Terts Diepraam Date: Sat, 19 Mar 2022 23:04:20 +0100 Subject: [PATCH 4/5] pinky: don't include short flag in help --- src/uu/pinky/src/pinky.rs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/uu/pinky/src/pinky.rs b/src/uu/pinky/src/pinky.rs index b5ad2c5c959..437c20cf530 100644 --- a/src/uu/pinky/src/pinky.rs +++ b/src/uu/pinky/src/pinky.rs @@ -36,6 +36,7 @@ mod options { pub const OMIT_NAME_HOST: &str = "omit_name_host"; pub const OMIT_NAME_HOST_TIME: &str = "omit_name_host_time"; pub const USER: &str = "user"; + pub const HELP: &str = "help"; } fn get_long_usage() -> String { @@ -180,6 +181,13 @@ pub fn uu_app<'a>() -> Command<'a> { .takes_value(true) .multiple_occurrences(true), ) + .arg( + // Redefine the help argument to not include the short flag + // since that conflicts with omit_project_file. + Arg::new(options::HELP) + .long(options::HELP) + .help("Print help information"), + ) } struct Pinky { From d90a81fb464fc6d0c8683b6e2ef45ccb734d5c63 Mon Sep 17 00:00:00 2001 From: Terts Diepraam Date: Sun, 20 Mar 2022 10:14:32 +0100 Subject: [PATCH 5/5] all utils: remove short help flag if another -h flag is present --- src/uu/chcon/src/chcon.rs | 6 ++++++ src/uu/chgrp/src/chgrp.rs | 5 +++++ src/uu/chown/src/chown.rs | 5 +++++ src/uu/df/src/df.rs | 6 ++++++ src/uu/du/src/du.rs | 6 ++++++ src/uu/ls/src/ls.rs | 6 ++++++ src/uu/nl/src/nl.rs | 6 ++++++ src/uu/od/src/od.rs | 6 ++++++ src/uu/sort/src/sort.rs | 6 ++++++ src/uu/touch/src/touch.rs | 6 ++++++ src/uucore/src/lib/features/perms.rs | 1 + 11 files changed, 59 insertions(+) diff --git a/src/uu/chcon/src/chcon.rs b/src/uu/chcon/src/chcon.rs index 8f5e0f26bfa..4d589edddff 100644 --- a/src/uu/chcon/src/chcon.rs +++ b/src/uu/chcon/src/chcon.rs @@ -29,6 +29,7 @@ const USAGE: &str = "\ {} [OPTION]... --reference=RFILE FILE..."; pub mod options { + pub static HELP: &str = "help"; pub static VERBOSE: &str = "verbose"; pub static REFERENCE: &str = "reference"; @@ -160,6 +161,11 @@ pub fn uu_app<'a>() -> Command<'a> { .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) + .arg( + Arg::new(options::HELP) + .long(options::HELP) + .help("Print help information."), + ) .arg( Arg::new(options::dereference::DEREFERENCE) .long(options::dereference::DEREFERENCE) diff --git a/src/uu/chgrp/src/chgrp.rs b/src/uu/chgrp/src/chgrp.rs index ce1cb5f3771..d7e8baafeab 100644 --- a/src/uu/chgrp/src/chgrp.rs +++ b/src/uu/chgrp/src/chgrp.rs @@ -60,6 +60,11 @@ pub fn uu_app<'a>() -> Command<'a> { .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) + .arg( + Arg::new(options::HELP) + .long(options::HELP) + .help("Print help information.") + ) .arg( Arg::new(options::verbosity::CHANGES) .short('c') diff --git a/src/uu/chown/src/chown.rs b/src/uu/chown/src/chown.rs index c1d7d1420c1..3add9df1f06 100644 --- a/src/uu/chown/src/chown.rs +++ b/src/uu/chown/src/chown.rs @@ -69,6 +69,11 @@ pub fn uu_app<'a>() -> Command<'a> { .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) + .arg( + Arg::new(options::HELP) + .long(options::HELP) + .help("Print help information."), + ) .arg( Arg::new(options::verbosity::CHANGES) .short('c') diff --git a/src/uu/df/src/df.rs b/src/uu/df/src/df.rs index 466d027bc68..d41233139e1 100644 --- a/src/uu/df/src/df.rs +++ b/src/uu/df/src/df.rs @@ -29,6 +29,7 @@ static ABOUT: &str = "Show information about the file system on which each FILE or all file systems by default."; const USAGE: &str = "{} [OPTION]... [FILE]..."; +static OPT_HELP: &str = "help"; static OPT_ALL: &str = "all"; static OPT_BLOCKSIZE: &str = "blocksize"; static OPT_DIRECT: &str = "direct"; @@ -322,6 +323,11 @@ pub fn uu_app<'a>() -> Command<'a> { .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) + .arg( + Arg::new(OPT_HELP) + .long(OPT_HELP) + .help("Print help information."), + ) .arg( Arg::new(OPT_ALL) .short('a') diff --git a/src/uu/du/src/du.rs b/src/uu/du/src/du.rs index 8d97b8b47f1..0690c6299c8 100644 --- a/src/uu/du/src/du.rs +++ b/src/uu/du/src/du.rs @@ -47,6 +47,7 @@ use winapi::um::winbase::GetFileInformationByHandleEx; use winapi::um::winnt::{FILE_ID_128, ULONGLONG}; mod options { + pub const HELP: &str = "help"; pub const NULL: &str = "0"; pub const ALL: &str = "all"; pub const APPARENT_SIZE: &str = "apparent-size"; @@ -624,6 +625,11 @@ pub fn uu_app<'a>() -> Command<'a> { .after_help(LONG_HELP) .override_usage(format_usage(USAGE)) .infer_long_args(true) + .arg( + Arg::new(options::HELP) + .long(options::HELP) + .help("Print help information.") + ) .arg( Arg::new(options::ALL) .short('a') diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs index a7dbc7b422b..fa1900bbb7c 100644 --- a/src/uu/ls/src/ls.rs +++ b/src/uu/ls/src/ls.rs @@ -116,6 +116,7 @@ pub mod options { pub static DIR_ARGS: &str = "dereference-command-line-symlink-to-dir"; } + pub static HELP: &str = "help"; pub static QUOTING_STYLE: &str = "quoting-style"; pub static HIDE_CONTROL_CHARS: &str = "hide-control-chars"; pub static SHOW_CONTROL_CHARS: &str = "show-control-chars"; @@ -806,6 +807,11 @@ pub fn uu_app<'a>() -> Command<'a> { whose names start with '.'.", ) .infer_long_args(true) + .arg( + Arg::new(options::HELP) + .long(options::HELP) + .help("Print help information.") + ) // Format arguments .arg( Arg::new(options::FORMAT) diff --git a/src/uu/nl/src/nl.rs b/src/uu/nl/src/nl.rs index 09ad9a8166e..28cf3fb4d0d 100644 --- a/src/uu/nl/src/nl.rs +++ b/src/uu/nl/src/nl.rs @@ -66,6 +66,7 @@ enum NumberFormat { } pub mod options { + pub const HELP: &str = "help"; pub const FILE: &str = "file"; pub const BODY_NUMBERING: &str = "body-numbering"; pub const SECTION_DELIMITER: &str = "section-delimiter"; @@ -145,6 +146,11 @@ pub fn uu_app<'a>() -> Command<'a> { .version(crate_version!()) .override_usage(format_usage(USAGE)) .infer_long_args(true) + .arg( + Arg::new(options::HELP) + .long(options::HELP) + .help("Print help information."), + ) .arg( Arg::new(options::FILE) .hide(true) diff --git a/src/uu/od/src/od.rs b/src/uu/od/src/od.rs index eeca0171a08..81cfb94de19 100644 --- a/src/uu/od/src/od.rs +++ b/src/uu/od/src/od.rs @@ -98,6 +98,7 @@ If an error occurred, a diagnostic message will be printed to stderr, and the exitcode will be non-zero."#; pub(crate) mod options { + pub const HELP: &str = "help"; pub const ADDRESS_RADIX: &str = "address-radix"; pub const SKIP_BYTES: &str = "skip-bytes"; pub const READ_BYTES: &str = "read-bytes"; @@ -299,6 +300,11 @@ pub fn uu_app<'a>() -> Command<'a> { .dont_delimit_trailing_values(true) .infer_long_args(true) .setting(AppSettings::DeriveDisplayOrder) + .arg( + Arg::new(options::HELP) + .long(options::HELP) + .help("Print help information.") + ) .arg( Arg::new(options::ADDRESS_RADIX) .short('A') diff --git a/src/uu/sort/src/sort.rs b/src/uu/sort/src/sort.rs index 70cebad4f86..c6e1583a777 100644 --- a/src/uu/sort/src/sort.rs +++ b/src/uu/sort/src/sort.rs @@ -98,6 +98,7 @@ mod options { pub const DIAGNOSE_FIRST: &str = "diagnose-first"; } + pub const HELP: &str = "help"; pub const DICTIONARY_ORDER: &str = "dictionary-order"; pub const MERGE: &str = "merge"; pub const DEBUG: &str = "debug"; @@ -1274,6 +1275,11 @@ pub fn uu_app<'a>() -> Command<'a> { .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) + .arg( + Arg::new(options::HELP) + .long(options::HELP) + .help("Print help information."), + ) .arg( Arg::new(options::modes::SORT) .long(options::modes::SORT) diff --git a/src/uu/touch/src/touch.rs b/src/uu/touch/src/touch.rs index 220a8476e59..8649175746e 100644 --- a/src/uu/touch/src/touch.rs +++ b/src/uu/touch/src/touch.rs @@ -31,6 +31,7 @@ pub mod options { pub static REFERENCE: &str = "reference"; pub static CURRENT: &str = "current"; } + pub static HELP: &str = "help"; pub static ACCESS: &str = "access"; pub static MODIFICATION: &str = "modification"; pub static NO_CREATE: &str = "no-create"; @@ -155,6 +156,11 @@ pub fn uu_app<'a>() -> Command<'a> { .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) + .arg( + Arg::new(options::HELP) + .long(options::HELP) + .help("Print help information."), + ) .arg( Arg::new(options::ACCESS) .short('a') diff --git a/src/uucore/src/lib/features/perms.rs b/src/uucore/src/lib/features/perms.rs index 970b2fca9b7..d8e3453137a 100644 --- a/src/uucore/src/lib/features/perms.rs +++ b/src/uucore/src/lib/features/perms.rs @@ -383,6 +383,7 @@ impl ChownExecutor { } pub mod options { + pub const HELP: &str = "help"; pub mod verbosity { pub const CHANGES: &str = "changes"; pub const QUIET: &str = "quiet";