system/coreutils
system/coreutils
1
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-10-01 13:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

coreutils: update to clap 4

Browse source
This commit is contained in:
Terts Diepraam 2022-10-01 12:27:32 +02:00
parent 153614c40e
commit 84b7ecd32d
3 changed files with 137 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

246
Cargo.lock generated
View file

@ -116,7 +116,7 @@ dependencies = [
"bitflags",
"cexpr",
"clang-sys",
"clap",
"clap 3.2.22",
"env_logger 0.9.0",
"lazy_static",
"lazycell",
@ -260,22 +260,35 @@ checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750"
dependencies = [
"atty",
"bitflags",
"clap_lex",
"clap_lex 0.2.4",
"indexmap",
"once_cell",
"strsim",
"termcolor",
"terminal_size",
"textwrap",
]
[[package]]
name = "clap_complete"
version = "3.2.5"
name = "clap"
version = "4.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8"
checksum = "6ea54a38e4bce14ff6931c72e5b3c43da7051df056913d4e7e1fcdb1c03df69d"
dependencies = [
"clap",
"atty",
"bitflags",
"clap_lex 0.3.0",
"once_cell",
"strsim",
"termcolor",
"terminal_size",
]
[[package]]
name = "clap_complete"
version = "4.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11cba7abac9b56dfe2f035098cdb3a43946f276e6db83b72c4e692343f9aab9a"
dependencies = [
"clap 4.0.14",
]
[[package]]
@ -287,6 +300,15 @@ dependencies = [
"os_str_bytes",
]
[[package]]
name = "clap_lex"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8"
dependencies = [
"os_str_bytes",
]
[[package]]
name = "compare"
version = "0.1.0"
@ -320,7 +342,7 @@ version = "0.0.16"
dependencies = [
"atty",
"chrono",
"clap",
"clap 4.0.14",
"clap_complete",
"conv",
"filetime",
@ -2047,7 +2069,7 @@ checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1"
name = "uu_arch"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"platform-info",
"uucore",
]
@ -2056,7 +2078,7 @@ dependencies = [
name = "uu_base32"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2072,7 +2094,7 @@ dependencies = [
name = "uu_basename"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2080,7 +2102,7 @@ dependencies = [
name = "uu_basenc"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uu_base32",
"uucore",
]
@ -2090,7 +2112,7 @@ name = "uu_cat"
version = "0.0.16"
dependencies = [
"atty",
"clap",
"clap 4.0.14",
"nix",
"thiserror",
"uucore",
@ -2100,7 +2122,7 @@ dependencies = [
name = "uu_chcon"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"fts-sys",
"libc",
"selinux",
@ -2112,7 +2134,7 @@ dependencies = [
name = "uu_chgrp"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2120,7 +2142,7 @@ dependencies = [
name = "uu_chmod"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"libc",
"uucore",
]
@ -2129,7 +2151,7 @@ dependencies = [
name = "uu_chown"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2137,7 +2159,7 @@ dependencies = [
name = "uu_chroot"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2145,7 +2167,7 @@ dependencies = [
name = "uu_cksum"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2153,7 +2175,7 @@ dependencies = [
name = "uu_comm"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2161,7 +2183,7 @@ dependencies = [
name = "uu_cp"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"exacl",
"filetime",
"libc",
@ -2177,7 +2199,7 @@ dependencies = [
name = "uu_csplit"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"regex",
"thiserror",
"uucore",
@ -2189,7 +2211,7 @@ version = "0.0.16"
dependencies = [
"atty",
"bstr",
"clap",
"clap 4.0.14",
"memchr",
"uucore",
]
@ -2199,7 +2221,7 @@ name = "uu_date"
version = "0.0.16"
dependencies = [
"chrono",
"clap",
"clap 4.0.14",
"libc",
"uucore",
"winapi",
@ -2210,7 +2232,7 @@ name = "uu_dd"
version = "0.0.16"
dependencies = [
"byte-unit",
"clap",
"clap 4.0.14",
"gcd",
"libc",
"signal-hook",
@ -2221,7 +2243,7 @@ dependencies = [
name = "uu_df"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"unicode-width",
"uucore",
]
@ -2230,7 +2252,7 @@ dependencies = [
name = "uu_dir"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"selinux",
"uu_ls",
"uucore",
@ -2240,7 +2262,7 @@ dependencies = [
name = "uu_dircolors"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"glob",
"uucore",
]
@ -2249,7 +2271,7 @@ dependencies = [
name = "uu_dirname"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2258,7 +2280,7 @@ name = "uu_du"
version = "0.0.16"
dependencies = [
"chrono",
"clap",
"clap 4.0.14",
"glob",
"uucore",
"winapi",
@ -2268,7 +2290,7 @@ dependencies = [
name = "uu_echo"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2276,7 +2298,7 @@ dependencies = [
name = "uu_env"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"nix",
"rust-ini",
"uucore",
@ -2286,7 +2308,7 @@ dependencies = [
name = "uu_expand"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"unicode-width",
"uucore",
]
@ -2295,7 +2317,7 @@ dependencies = [
name = "uu_expr"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"num-bigint",
"num-traits",
"onig",
@ -2306,7 +2328,7 @@ dependencies = [
name = "uu_factor"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"coz",
"num-traits",
"paste",
@ -2320,7 +2342,7 @@ dependencies = [
name = "uu_false"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2328,7 +2350,7 @@ dependencies = [
name = "uu_fmt"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"unicode-width",
"uucore",
]
@ -2337,7 +2359,7 @@ dependencies = [
name = "uu_fold"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2345,7 +2367,7 @@ dependencies = [
name = "uu_groups"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2355,7 +2377,7 @@ version = "0.0.16"
dependencies = [
"blake2b_simd",
"blake3",
"clap",
"clap 4.0.14",
"digest",
"hex",
"md-5",
@ -2371,7 +2393,7 @@ dependencies = [
name = "uu_head"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"memchr",
"uucore",
]
@ -2380,7 +2402,7 @@ dependencies = [
name = "uu_hostid"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"libc",
"uucore",
]
@ -2389,7 +2411,7 @@ dependencies = [
name = "uu_hostname"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"hostname",
"uucore",
"winapi",
@ -2399,7 +2421,7 @@ dependencies = [
name = "uu_id"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"selinux",
"uucore",
]
@ -2408,7 +2430,7 @@ dependencies = [
name = "uu_install"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"file_diff",
"filetime",
"libc",
@ -2420,7 +2442,7 @@ dependencies = [
name = "uu_join"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"memchr",
"uucore",
]
@ -2429,7 +2451,7 @@ dependencies = [
name = "uu_kill"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"nix",
"uucore",
]
@ -2438,7 +2460,7 @@ dependencies = [
name = "uu_link"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2446,7 +2468,7 @@ dependencies = [
name = "uu_ln"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2454,7 +2476,7 @@ dependencies = [
name = "uu_logname"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"libc",
"uucore",
]
@ -2465,7 +2487,7 @@ version = "0.0.16"
dependencies = [
"atty",
"chrono",
"clap",
"clap 4.0.14",
"glob",
"lscolors",
"number_prefix",
@ -2481,7 +2503,7 @@ dependencies = [
name = "uu_mkdir"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2489,7 +2511,7 @@ dependencies = [
name = "uu_mkfifo"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"libc",
"uucore",
]
@ -2498,7 +2520,7 @@ dependencies = [
name = "uu_mknod"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"libc",
"uucore",
]
@ -2507,7 +2529,7 @@ dependencies = [
name = "uu_mktemp"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"rand",
"tempfile",
"uucore",
@ -2518,7 +2540,7 @@ name = "uu_more"
version = "0.0.16"
dependencies = [
"atty",
"clap",
"clap 4.0.14",
"crossterm",
"nix",
"unicode-segmentation",
@ -2530,7 +2552,7 @@ dependencies = [
name = "uu_mv"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"fs_extra",
"uucore",
]
@ -2539,7 +2561,7 @@ dependencies = [
name = "uu_nice"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"libc",
"nix",
"uucore",
@ -2549,7 +2571,7 @@ dependencies = [
name = "uu_nl"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"regex",
"uucore",
]
@ -2559,7 +2581,7 @@ name = "uu_nohup"
version = "0.0.16"
dependencies = [
"atty",
"clap",
"clap 4.0.14",
"libc",
"uucore",
]
@ -2568,7 +2590,7 @@ dependencies = [
name = "uu_nproc"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"libc",
"num_cpus",
"uucore",
@ -2578,7 +2600,7 @@ dependencies = [
name = "uu_numfmt"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2587,7 +2609,7 @@ name = "uu_od"
version = "0.0.16"
dependencies = [
"byteorder",
"clap",
"clap 4.0.14",
"half",
"uucore",
]
@ -2596,7 +2618,7 @@ dependencies = [
name = "uu_paste"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2604,7 +2626,7 @@ dependencies = [
name = "uu_pathchk"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"libc",
"uucore",
]
@ -2613,7 +2635,7 @@ dependencies = [
name = "uu_pinky"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2621,7 +2643,7 @@ dependencies = [
name = "uu_pr"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"itertools",
"quick-error",
"regex",
@ -2633,7 +2655,7 @@ dependencies = [
name = "uu_printenv"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2641,7 +2663,7 @@ dependencies = [
name = "uu_printf"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2649,7 +2671,7 @@ dependencies = [
name = "uu_ptx"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"regex",
"uucore",
]
@ -2658,7 +2680,7 @@ dependencies = [
name = "uu_pwd"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2666,7 +2688,7 @@ dependencies = [
name = "uu_readlink"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2674,7 +2696,7 @@ dependencies = [
name = "uu_realpath"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2682,7 +2704,7 @@ dependencies = [
name = "uu_relpath"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2690,7 +2712,7 @@ dependencies = [
name = "uu_rm"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"remove_dir_all 0.7.0",
"uucore",
"walkdir",
@ -2701,7 +2723,7 @@ dependencies = [
name = "uu_rmdir"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"libc",
"uucore",
]
@ -2710,7 +2732,7 @@ dependencies = [
name = "uu_runcon"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"libc",
"selinux",
"thiserror",
@ -2722,7 +2744,7 @@ name = "uu_seq"
version = "0.0.16"
dependencies = [
"bigdecimal",
"clap",
"clap 4.0.14",
"num-bigint",
"num-traits",
"uucore",
@ -2732,7 +2754,7 @@ dependencies = [
name = "uu_shred"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"rand",
"uucore",
]
@ -2741,7 +2763,7 @@ dependencies = [
name = "uu_shuf"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"memchr",
"rand",
"rand_core",
@ -2752,7 +2774,7 @@ dependencies = [
name = "uu_sleep"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2761,7 +2783,7 @@ name = "uu_sort"
version = "0.0.16"
dependencies = [
"binary-heap-plus",
"clap",
"clap 4.0.14",
"compare",
"ctrlc",
"fnv",
@ -2779,7 +2801,7 @@ dependencies = [
name = "uu_split"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"memchr",
"uucore",
]
@ -2788,7 +2810,7 @@ dependencies = [
name = "uu_stat"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2796,7 +2818,7 @@ dependencies = [
name = "uu_stdbuf"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"tempfile",
"uu_stdbuf_libstdbuf",
"uucore",
@ -2816,7 +2838,7 @@ dependencies = [
name = "uu_stty"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"nix",
"uucore",
]
@ -2825,7 +2847,7 @@ dependencies = [
name = "uu_sum"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2833,7 +2855,7 @@ dependencies = [
name = "uu_sync"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"libc",
"nix",
"uucore",
@ -2844,7 +2866,7 @@ dependencies = [
name = "uu_tac"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"memchr",
"memmap2",
"regex",
@ -2855,7 +2877,7 @@ dependencies = [
name = "uu_tail"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"libc",
"memchr",
"nix",
@ -2870,7 +2892,7 @@ dependencies = [
name = "uu_tee"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"libc",
"retain_mut",
"uucore",
@ -2880,7 +2902,7 @@ dependencies = [
name = "uu_test"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"libc",
"redox_syscall",
"uucore",
@ -2890,7 +2912,7 @@ dependencies = [
name = "uu_timeout"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"libc",
"nix",
"uucore",
@ -2900,7 +2922,7 @@ dependencies = [
name = "uu_touch"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"filetime",
"time",
"uucore",
@ -2911,7 +2933,7 @@ dependencies = [
name = "uu_tr"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"nom",
"uucore",
]
@ -2920,7 +2942,7 @@ dependencies = [
name = "uu_true"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2928,7 +2950,7 @@ dependencies = [
name = "uu_truncate"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2936,7 +2958,7 @@ dependencies = [
name = "uu_tsort"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2945,7 +2967,7 @@ name = "uu_tty"
version = "0.0.16"
dependencies = [
"atty",
"clap",
"clap 4.0.14",
"nix",
"uucore",
]
@ -2954,7 +2976,7 @@ dependencies = [
name = "uu_uname"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"platform-info",
"uucore",
]
@ -2963,7 +2985,7 @@ dependencies = [
name = "uu_unexpand"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"unicode-width",
"uucore",
]
@ -2972,7 +2994,7 @@ dependencies = [
name = "uu_uniq"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"strum",
"strum_macros",
"uucore",
@ -2982,7 +3004,7 @@ dependencies = [
name = "uu_unlink"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -2991,7 +3013,7 @@ name = "uu_uptime"
version = "0.0.16"
dependencies = [
"chrono",
"clap",
"clap 4.0.14",
"uucore",
]
@ -2999,7 +3021,7 @@ dependencies = [
name = "uu_users"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -3007,7 +3029,7 @@ dependencies = [
name = "uu_vdir"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"selinux",
"uu_ls",
"uucore",
@ -3018,7 +3040,7 @@ name = "uu_wc"
version = "0.0.16"
dependencies = [
"bytecount",
"clap",
"clap 4.0.14",
"libc",
"nix",
"unicode-width",
@ -3030,7 +3052,7 @@ dependencies = [
name = "uu_who"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"uucore",
]
@ -3038,7 +3060,7 @@ dependencies = [
name = "uu_whoami"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"libc",
"uucore",
"winapi",
@ -3048,7 +3070,7 @@ dependencies = [
name = "uu_yes"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"libc",
"nix",
"uucore",
@ -3058,7 +3080,7 @@ dependencies = [
name = "uucore"
version = "0.0.16"
dependencies = [
"clap",
"clap 4.0.14",
"data-encoding",
"data-encoding-macro",
"dns-lookup",

4
Cargo.toml
View file

@ -261,8 +261,8 @@ uudoc = [ "zip" ]
[workspace]
[dependencies]
clap = { version = "3.2", features = ["wrap_help", "cargo"] }
clap_complete = "3.1"
clap = { version = "4.0", features = ["wrap_help", "cargo"] }
clap_complete = "4.0"
once_cell = "1.13.1"
phf = "0.10.1"
selinux = { version="0.3", optional = true }

2
build.rs
View file

@ -39,7 +39,7 @@ pub fn main() {
let mut mf = File::create(Path::new(&out_dir).join("uutils_map.rs")).unwrap();
mf.write_all(
"type UtilityMap<T> = phf::Map<&'static str, (fn(T) -> i32, fn() -> Command<'static>)>;\n\
"type UtilityMap<T> = phf::Map<&'static str, (fn(T) -> i32, fn() -> Command)>;\n\
\n\
fn util_map<T: uucore::Args>() -> UtilityMap<T> {\n"
.as_bytes(),