From 1c97a29a565704e8c289bad3044592d29561fab4 Mon Sep 17 00:00:00 2001 From: Roy Ivy III Date: Wed, 8 Apr 2020 02:15:54 -0500 Subject: [PATCH] maint/build ~ refactor dependency specifications (sorted, single lines) of 'Cargo.toml' --- src/base32/Cargo.toml | 11 ++++------- src/base64/Cargo.toml | 5 ++--- src/cat/Cargo.toml | 5 +---- src/chgrp/Cargo.toml | 5 +---- src/chmod/Cargo.toml | 5 +---- src/chown/Cargo.toml | 5 +---- src/chroot/Cargo.toml | 5 +---- src/comm/Cargo.toml | 2 +- src/cp/Cargo.toml | 11 ++++------- src/env/Cargo.toml | 2 +- src/expand/Cargo.toml | 2 +- src/groups/Cargo.toml | 5 ++--- src/hostname/Cargo.toml | 4 ++-- src/id/Cargo.toml | 5 ++--- src/kill/Cargo.toml | 5 +---- src/ls/Cargo.toml | 7 ++----- src/mktemp/Cargo.toml | 2 +- src/nl/Cargo.toml | 2 +- src/nohup/Cargo.toml | 5 +---- src/od/Cargo.toml | 4 ++-- src/pinky/Cargo.toml | 5 ++--- src/ptx/Cargo.toml | 4 ++-- src/readlink/Cargo.toml | 5 +---- src/realpath/Cargo.toml | 5 +---- src/relpath/Cargo.toml | 5 +---- src/shred/Cargo.toml | 2 +- src/sleep/Cargo.toml | 5 +---- src/sort/Cargo.toml | 7 ++----- src/stat/Cargo.toml | 5 +---- src/stdbuf/libstdbuf/Cargo.toml | 4 ++-- src/sync/Cargo.toml | 9 +++------ src/timeout/Cargo.toml | 5 +---- src/touch/Cargo.toml | 5 +---- src/tr/Cargo.toml | 2 +- src/tty/Cargo.toml | 5 +---- src/uptime/Cargo.toml | 5 +---- src/users/Cargo.toml | 5 +---- src/who/Cargo.toml | 11 ++++------- src/whoami/Cargo.toml | 9 +++------ 39 files changed, 62 insertions(+), 138 deletions(-) diff --git a/src/base32/Cargo.toml b/src/base32/Cargo.toml index 60f263c83..fb8ad815d 100644 --- a/src/base32/Cargo.toml +++ b/src/base32/Cargo.toml @@ -8,13 +8,10 @@ build = "../#common/mkmain.rs" name = "uu_base32" path = "base32.rs" -[dependencies.uucore] -version = "0.0.1" -features = ["encoding"] - -[dependencies.clippy] -version = "0.0.212" -optional = true +[dependencies] +uucore = { version = "0.0.1", features = ["encoding"] } +## optional +clippy = { version = "0.0.212", optional = true } [[bin]] name = "base32" diff --git a/src/base64/Cargo.toml b/src/base64/Cargo.toml index d959808a0..31c46721c 100644 --- a/src/base64/Cargo.toml +++ b/src/base64/Cargo.toml @@ -8,9 +8,8 @@ build = "../#common/mkmain.rs" name = "uu_base64" path = "base64.rs" -[dependencies.uucore] -version = "0.0.1" -features = ["encoding"] +[dependencies] +uucore = { version = "0.0.1", features = ["encoding"] } [[bin]] name = "base64" diff --git a/src/cat/Cargo.toml b/src/cat/Cargo.toml index 93540431a..b6b247d71 100644 --- a/src/cat/Cargo.toml +++ b/src/cat/Cargo.toml @@ -10,10 +10,7 @@ path = "cat.rs" [dependencies] quick-error = "1.2.3" - -[dependencies.uucore] -version = "0.0.1" -features = ["fs"] +uucore = { version = "0.0.1", features = ["fs"] } [target.'cfg(unix)'.dependencies] unix_socket = "0.5.0" diff --git a/src/chgrp/Cargo.toml b/src/chgrp/Cargo.toml index 317053bf5..4f0e06096 100644 --- a/src/chgrp/Cargo.toml +++ b/src/chgrp/Cargo.toml @@ -9,12 +9,9 @@ name = "uu_chgrp" path = "chgrp.rs" [dependencies] +uucore = { version = "0.0.1", features = ["entries", "fs"] } walkdir = "2.2.8" -[dependencies.uucore] -version = "0.0.1" -features = ["entries", "fs"] - [[bin]] name = "chgrp" path = "../#common/uumain.rs" diff --git a/src/chmod/Cargo.toml b/src/chmod/Cargo.toml index 37f9d6c5a..35cfb6388 100644 --- a/src/chmod/Cargo.toml +++ b/src/chmod/Cargo.toml @@ -10,12 +10,9 @@ path = "chmod.rs" [dependencies] libc = "0.2.42" +uucore = { version = "0.0.1", features = ["mode"] } walker = "1.0.0" -[dependencies.uucore] -version = "0.0.1" -features = ["mode"] - [[bin]] name = "chmod" path = "../#common/uumain.rs" diff --git a/src/chown/Cargo.toml b/src/chown/Cargo.toml index 05b385594..6a8a4ac61 100644 --- a/src/chown/Cargo.toml +++ b/src/chown/Cargo.toml @@ -10,12 +10,9 @@ path = "chown.rs" [dependencies] glob = "0.3.0" +uucore = { version = "0.0.1", features = ["entries", "fs"] } walkdir = "2.2" -[dependencies.uucore] -version = "0.0.1" -features = ["entries", "fs"] - [dependencies.clippy] version = "0.0.212" optional = true diff --git a/src/chroot/Cargo.toml b/src/chroot/Cargo.toml index dd2b4bcc8..1e4c31ec6 100644 --- a/src/chroot/Cargo.toml +++ b/src/chroot/Cargo.toml @@ -10,10 +10,7 @@ path = "chroot.rs" [dependencies] getopts = "0.2.18" - -[dependencies.uucore] -version = "0.0.1" -features = ["entries"] +uucore = { version = "0.0.1", features = ["entries"] } [[bin]] name = "chroot" diff --git a/src/comm/Cargo.toml b/src/comm/Cargo.toml index f01b82aa9..ccfa56846 100644 --- a/src/comm/Cargo.toml +++ b/src/comm/Cargo.toml @@ -9,8 +9,8 @@ name = "uu_comm" path = "comm.rs" [dependencies] -libc = "0.2.42" getopts = "0.2.18" +libc = "0.2.42" uucore = "0.0.1" [[bin]] diff --git a/src/cp/Cargo.toml b/src/cp/Cargo.toml index b513ce244..a7f80f38b 100644 --- a/src/cp/Cargo.toml +++ b/src/cp/Cargo.toml @@ -12,16 +12,13 @@ name = "uu_cp" path = "cp.rs" [dependencies] +clap = "2.32.0" +filetime = "0.2" getopts = "0.2.18" libc = "0.2.42" -walkdir = "2.2.8" -clap = "2.32.0" quick-error = "1.2.3" -filetime = "0.2" - -[dependencies.uucore] -version = "0.0.1" -features = ["fs"] +uucore = { version = "0.0.1", features = ["fs"] } +walkdir = "2.2.8" [target.'cfg(target_os = "linux")'.dependencies] ioctl-sys = "0.5.2" diff --git a/src/env/Cargo.toml b/src/env/Cargo.toml index 96d2b5a35..beaf38217 100644 --- a/src/env/Cargo.toml +++ b/src/env/Cargo.toml @@ -13,8 +13,8 @@ path = "env.rs" [dependencies] clap = "2.33" libc = "0.2.42" -uucore = "0.0.1" rust-ini = "0.13.0" +uucore = "0.0.1" [[bin]] name = "env" diff --git a/src/expand/Cargo.toml b/src/expand/Cargo.toml index 3e7f7eb57..00933635f 100644 --- a/src/expand/Cargo.toml +++ b/src/expand/Cargo.toml @@ -9,8 +9,8 @@ name = "uu_expand" path = "expand.rs" [dependencies] -unicode-width = "0.1.5" getopts = "0.2.18" +unicode-width = "0.1.5" uucore = "0.0.1" [[bin]] diff --git a/src/groups/Cargo.toml b/src/groups/Cargo.toml index bf2acd8bc..ae2fb6db1 100644 --- a/src/groups/Cargo.toml +++ b/src/groups/Cargo.toml @@ -8,9 +8,8 @@ build = "../#common/mkmain.rs" name = "uu_groups" path = "groups.rs" -[dependencies.uucore] -version = "0.0.1" -features = ["entries"] +[dependencies] +uucore = { version = "0.0.1", features = ["entries"] } [[bin]] name = "groups" diff --git a/src/hostname/Cargo.toml b/src/hostname/Cargo.toml index a667dbea4..5d6c2a561 100644 --- a/src/hostname/Cargo.toml +++ b/src/hostname/Cargo.toml @@ -9,10 +9,10 @@ name = "uu_hostname" path = "hostname.rs" [dependencies] -libc = "0.2.42" -winapi = { version = "0.3", features = ["sysinfoapi", "winsock2"] } getopts = "0.2" +libc = "0.2.42" uucore = "0.0.1" +winapi = { version = "0.3", features = ["sysinfoapi", "winsock2"] } [[bin]] name = "hostname" diff --git a/src/id/Cargo.toml b/src/id/Cargo.toml index 5a50a7382..cfc438b5a 100644 --- a/src/id/Cargo.toml +++ b/src/id/Cargo.toml @@ -8,9 +8,8 @@ build = "../#common/mkmain.rs" name = "uu_id" path = "id.rs" -[dependencies.uucore] -version = "0.0.1" -features = ["entries", "process"] +[dependencies] +uucore = { version = "0.0.1", features = ["entries", "process"] } [[bin]] name = "id" diff --git a/src/kill/Cargo.toml b/src/kill/Cargo.toml index ea50e7945..db402da19 100644 --- a/src/kill/Cargo.toml +++ b/src/kill/Cargo.toml @@ -10,10 +10,7 @@ path = "kill.rs" [dependencies] libc = "0.2.42" - -[dependencies.uucore] -version = "0.0.1" -features = ["signals"] +uucore = { version = "0.0.1", features = ["signals"] } [[bin]] name = "kill" diff --git a/src/ls/Cargo.toml b/src/ls/Cargo.toml index b7b447be5..7a623b7ae 100644 --- a/src/ls/Cargo.toml +++ b/src/ls/Cargo.toml @@ -11,16 +11,13 @@ path = "ls.rs" [dependencies] getopts = "0.2.18" isatty = "0.1" +lazy_static = "1.0.1" number_prefix = "0.2.8" term_grid = "0.1.5" termsize = "0.1.6" time = "0.1.40" -lazy_static = "1.0.1" unicode-width = "0.1.5" - -[dependencies.uucore] -version = "0.0.1" -features = ["entries", "fs"] +uucore = { version = "0.0.1", features = ["entries", "fs"] } [[bin]] name = "ls" diff --git a/src/mktemp/Cargo.toml b/src/mktemp/Cargo.toml index e79247837..0976d00c8 100644 --- a/src/mktemp/Cargo.toml +++ b/src/mktemp/Cargo.toml @@ -9,10 +9,10 @@ name = "uu_mktemp" path = "mktemp.rs" [dependencies] -uucore = "0.0.1" getopts = "0.2.18" rand = "0.5" tempfile = "2.1.5" +uucore = "0.0.1" [[bin]] name = "mktemp" diff --git a/src/nl/Cargo.toml b/src/nl/Cargo.toml index ec25e21af..4c6004b20 100644 --- a/src/nl/Cargo.toml +++ b/src/nl/Cargo.toml @@ -9,9 +9,9 @@ name = "uu_nl" path = "nl.rs" [dependencies] +aho-corasick = "0.7.3" getopts = "0.2.18" libc = "0.2.42" -aho-corasick = "0.7.3" memchr = "2.2.0" regex = "1.0.1" regex-syntax = "0.6.7" diff --git a/src/nohup/Cargo.toml b/src/nohup/Cargo.toml index 6ab835dec..8f26acb44 100644 --- a/src/nohup/Cargo.toml +++ b/src/nohup/Cargo.toml @@ -11,10 +11,7 @@ path = "nohup.rs" [dependencies] getopts = "0.2.18" libc = "0.2.42" - -[dependencies.uucore] -version = "0.0.1" -features = ["fs"] +uucore = { version = "0.0.1", features = ["fs"] } [[bin]] name = "nohup" diff --git a/src/od/Cargo.toml b/src/od/Cargo.toml index 607702fe2..fb5aaba2d 100644 --- a/src/od/Cargo.toml +++ b/src/od/Cargo.toml @@ -9,10 +9,10 @@ name = "uu_od" path = "od.rs" [dependencies] -getopts = "0.2.18" -libc = "0.2.42" byteorder = "1.3.2" +getopts = "0.2.18" half = "1.1.1" +libc = "0.2.42" uucore = "0.0.1" [[bin]] diff --git a/src/pinky/Cargo.toml b/src/pinky/Cargo.toml index 7f9093880..6ba0e8d68 100644 --- a/src/pinky/Cargo.toml +++ b/src/pinky/Cargo.toml @@ -8,9 +8,8 @@ build = "../#common/mkmain.rs" name = "uu_pinky" path = "pinky.rs" -[dependencies.uucore] -version = "0.0.1" -features = ["utmpx", "entries"] +[dependencies] +uucore = { version = "0.0.1", features = ["utmpx", "entries"] } [[bin]] name = "pinky" diff --git a/src/ptx/Cargo.toml b/src/ptx/Cargo.toml index 0cb6d1853..3766b8f8e 100644 --- a/src/ptx/Cargo.toml +++ b/src/ptx/Cargo.toml @@ -9,12 +9,12 @@ name = "uu_ptx" path = "ptx.rs" [dependencies] +aho-corasick = "0.7.3" getopts = "0.2.18" libc = "0.2.42" -aho-corasick = "0.7.3" memchr = "2.2.0" -regex-syntax = "0.6.7" regex = "1.0.1" +regex-syntax = "0.6.7" uucore = "0.0.1" [[bin]] diff --git a/src/readlink/Cargo.toml b/src/readlink/Cargo.toml index 53dbba423..4f1c2eef5 100644 --- a/src/readlink/Cargo.toml +++ b/src/readlink/Cargo.toml @@ -11,10 +11,7 @@ path = "readlink.rs" [dependencies] getopts = "0.2.18" libc = "0.2.42" - -[dependencies.uucore] -version = "0.0.1" -features = ["fs"] +uucore = { version = "0.0.1", features = ["fs"] } [[bin]] name = "readlink" diff --git a/src/realpath/Cargo.toml b/src/realpath/Cargo.toml index 2f9b186ec..12536443e 100644 --- a/src/realpath/Cargo.toml +++ b/src/realpath/Cargo.toml @@ -10,10 +10,7 @@ path = "realpath.rs" [dependencies] getopts = "0.2.18" - -[dependencies.uucore] -version = "0.0.1" -features = ["fs"] +uucore = { version = "0.0.1", features = ["fs"] } [[bin]] name = "realpath" diff --git a/src/relpath/Cargo.toml b/src/relpath/Cargo.toml index 75f258a0a..811ff0856 100644 --- a/src/relpath/Cargo.toml +++ b/src/relpath/Cargo.toml @@ -10,10 +10,7 @@ path = "relpath.rs" [dependencies] getopts = "0.2.18" - -[dependencies.uucore] -version = "0.0.1" -features = ["fs"] +uucore = { version = "0.0.1", features = ["fs"] } [[bin]] name = "relpath" diff --git a/src/shred/Cargo.toml b/src/shred/Cargo.toml index 5bbf3262c..07c087384 100644 --- a/src/shred/Cargo.toml +++ b/src/shred/Cargo.toml @@ -9,10 +9,10 @@ name = "uu_shred" path = "shred.rs" [dependencies] -rand = "0.5" filetime = "0.2.1" getopts = "0.2.18" libc = "0.2.42" +rand = "0.5" time = "0.1.40" uucore = "0.0.1" diff --git a/src/sleep/Cargo.toml b/src/sleep/Cargo.toml index cf3fd3a75..b858cd175 100644 --- a/src/sleep/Cargo.toml +++ b/src/sleep/Cargo.toml @@ -10,10 +10,7 @@ path = "sleep.rs" [dependencies] getopts = "0.2.18" - -[dependencies.uucore] -version = "0.0.1" -features = ["parse_time"] +uucore = { version = "0.0.1", features = ["parse_time"] } [[bin]] name = "sleep" diff --git a/src/sort/Cargo.toml b/src/sort/Cargo.toml index 10ebc4b88..1cb758f39 100644 --- a/src/sort/Cargo.toml +++ b/src/sort/Cargo.toml @@ -10,12 +10,9 @@ path = "sort.rs" [dependencies] getopts = "0.2.18" -semver = "0.9.0" itertools = "0.8.0" - -[dependencies.uucore] -version = "0.0.1" -features = ["fs"] +semver = "0.9.0" +uucore = { version = "0.0.1", features = ["fs"] } [[bin]] name = "sort" diff --git a/src/stat/Cargo.toml b/src/stat/Cargo.toml index 445ee0b1f..f6f2f4036 100644 --- a/src/stat/Cargo.toml +++ b/src/stat/Cargo.toml @@ -11,10 +11,7 @@ path = "stat.rs" [dependencies] getopts = "0.2.18" time = "0.1.40" - -[dependencies.uucore] -version = "0.0.1" -features = ["entries"] +uucore = { version = "0.0.1", features = ["entries"] } [[bin]] name = "stat" diff --git a/src/stdbuf/libstdbuf/Cargo.toml b/src/stdbuf/libstdbuf/Cargo.toml index 3ee7ef0bd..917541203 100644 --- a/src/stdbuf/libstdbuf/Cargo.toml +++ b/src/stdbuf/libstdbuf/Cargo.toml @@ -10,9 +10,9 @@ path = "libstdbuf.rs" crate-type = ["cdylib", "rlib"] [dependencies] -uucore = "0.0.1" -libc = "0.2" cpp = "0.4" +libc = "0.2" +uucore = "0.0.1" [build-dependencies] cpp_build = "0.4" diff --git a/src/sync/Cargo.toml b/src/sync/Cargo.toml index f8cc22f56..ad02e3b52 100644 --- a/src/sync/Cargo.toml +++ b/src/sync/Cargo.toml @@ -10,13 +10,10 @@ path = "sync.rs" [dependencies] getopts = "0.2.18" -libc = "0.2.42" -winapi = { version = "0.3", features = ["handleapi", "winerror"] } kernel32-sys = "0.2.2" - -[dependencies.uucore] -version = "0.0.1" -features = ["wide"] +libc = "0.2.42" +uucore = { version = "0.0.1", features = ["wide"] } +winapi = { version = "0.3", features = ["handleapi", "winerror"] } [[bin]] name = "sync" diff --git a/src/timeout/Cargo.toml b/src/timeout/Cargo.toml index 7299be4e7..27262364f 100644 --- a/src/timeout/Cargo.toml +++ b/src/timeout/Cargo.toml @@ -12,10 +12,7 @@ path = "timeout.rs" getopts = "0.2.18" libc = "0.2.42" time = "0.1.40" - -[dependencies.uucore] -version = "0.0.1" -features = ["parse_time", "process"] +uucore = { version = "0.0.1", features = ["parse_time", "process"] } [[bin]] name = "timeout" diff --git a/src/touch/Cargo.toml b/src/touch/Cargo.toml index cd5b0bcb0..471210880 100644 --- a/src/touch/Cargo.toml +++ b/src/touch/Cargo.toml @@ -12,10 +12,7 @@ path = "touch.rs" filetime = "0.2.1" getopts = "0.2.18" time = "0.1.40" - -[dependencies.uucore] -version = "0.0.1" -features = ["libc"] +uucore = { version = "0.0.1", features = ["libc"] } [[bin]] name = "touch" diff --git a/src/tr/Cargo.toml b/src/tr/Cargo.toml index d1f1d9537..8bc7ed985 100644 --- a/src/tr/Cargo.toml +++ b/src/tr/Cargo.toml @@ -9,9 +9,9 @@ name = "uu_tr" path = "tr.rs" [dependencies] -getopts = "0.2.18" bit-set = "0.5.0" fnv = "1.0.5" +getopts = "0.2.18" uucore = "0.0.1" [[bin]] diff --git a/src/tty/Cargo.toml b/src/tty/Cargo.toml index 3841144ce..c9e049664 100644 --- a/src/tty/Cargo.toml +++ b/src/tty/Cargo.toml @@ -11,10 +11,7 @@ path = "tty.rs" [dependencies] getopts = "0.2.18" libc = "0.2.42" - -[dependencies.uucore] -version = "0.0.1" -features = ["fs"] +uucore = { version = "0.0.1", features = ["fs"] } [[bin]] name = "tty" diff --git a/src/uptime/Cargo.toml b/src/uptime/Cargo.toml index 1ee3c4cbb..77afc7538 100644 --- a/src/uptime/Cargo.toml +++ b/src/uptime/Cargo.toml @@ -11,10 +11,7 @@ path = "uptime.rs" [dependencies] getopts = "0.2.18" time = "0.1.40" - -[dependencies.uucore] -version = "0.0.1" -features = ["utmpx"] +uucore = { version = "0.0.1", features = ["utmpx"] } [[bin]] name = "uptime" diff --git a/src/users/Cargo.toml b/src/users/Cargo.toml index 7622dda72..239648455 100644 --- a/src/users/Cargo.toml +++ b/src/users/Cargo.toml @@ -10,10 +10,7 @@ path = "users.rs" [dependencies] getopts = "0.2.18" - -[dependencies.uucore] -features = ["utmpx"] -version = "0.0.1" +uucore = { version = "0.0.1", features = ["utmpx"] } [[bin]] name = "users" diff --git a/src/who/Cargo.toml b/src/who/Cargo.toml index e0663e7d0..2f3ef82f4 100644 --- a/src/who/Cargo.toml +++ b/src/who/Cargo.toml @@ -8,13 +8,10 @@ build = "../#common/mkmain.rs" name = "uu_who" path = "who.rs" -[dependencies.uucore] -version = "0.0.1" -features = ["utmpx"] - -[dependencies.clippy] -version = "0.0.212" -optional = true +[dependencies] +uucore = { version = "0.0.1", features = ["utmpx"] } +## optional +clippy = { version = "0.0.212", optional = true } [[bin]] name = "who" diff --git a/src/whoami/Cargo.toml b/src/whoami/Cargo.toml index 1d35dc5ad..ea0afd49c 100644 --- a/src/whoami/Cargo.toml +++ b/src/whoami/Cargo.toml @@ -10,13 +10,10 @@ name = "uu_whoami" path = "whoami.rs" [dependencies] -clap = "2.32" -winapi = { version = "0.3", features = ["lmcons"] } advapi32-sys = "0.2.0" - -[dependencies.uucore] -version = "0.0.1" -features = ["entries", "wide"] +clap = "2.32" +uucore = { version = "0.0.1", features = ["entries", "wide"] } +winapi = { version = "0.3", features = ["lmcons"] } [[bin]] name = "whoami"