maint/build ~ refactor dependency specifications (sorted, single lines) of 'Cargo.toml'

src/base32/Cargo.toml

@@ -8,13 +8,10 @@ build = "../#common/mkmain.rs"
 name = "uu_base32"
 path = "base32.rs"
 
-[dependencies.uucore]
+[dependencies]
-version = "0.0.1"
+uucore = { version = "0.0.1", features = ["encoding"] }
-features = ["encoding"]
+## optional
-
+clippy = { version = "0.0.212", optional = true }
-[dependencies.clippy]
-version = "0.0.212"
-optional = true
 
 [[bin]]
 name = "base32"

src/base64/Cargo.toml

@@ -8,9 +8,8 @@ build = "../#common/mkmain.rs"
 name = "uu_base64"
 path = "base64.rs"
 
-[dependencies.uucore]
+[dependencies]
-version = "0.0.1"
+uucore = { version = "0.0.1", features = ["encoding"] }
-features = ["encoding"]
 
 [[bin]]
 name = "base64"

src/cat/Cargo.toml

@@ -10,10 +10,7 @@ path = "cat.rs"
 
 [dependencies]
 quick-error = "1.2.3"
-
+uucore = { version = "0.0.1", features = ["fs"] }
-[dependencies.uucore]
-version = "0.0.1"
-features = ["fs"]
 
 [target.'cfg(unix)'.dependencies]
 unix_socket = "0.5.0"

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"

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"

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

src/chroot/Cargo.toml

@@ -10,10 +10,7 @@ path = "chroot.rs"
 
 [dependencies]
 getopts = "0.2.18"
-
+uucore = { version = "0.0.1", features = ["entries"] }
-[dependencies.uucore]
-version = "0.0.1"
-features = ["entries"]
 
 [[bin]]
 name = "chroot"

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]]

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"
+uucore = { version = "0.0.1", features = ["fs"] }
-
+walkdir = "2.2.8"
-[dependencies.uucore]
-version = "0.0.1"
-features = ["fs"]
 
 [target.'cfg(target_os = "linux")'.dependencies]
 ioctl-sys = "0.5.2"

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"

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]]

src/groups/Cargo.toml

@@ -8,9 +8,8 @@ build = "../#common/mkmain.rs"
 name = "uu_groups"
 path = "groups.rs"
 
-[dependencies.uucore]
+[dependencies]
-version = "0.0.1"
+uucore = { version = "0.0.1", features = ["entries"] }
-features = ["entries"]
 
 [[bin]]
 name = "groups"

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"

src/id/Cargo.toml

@@ -8,9 +8,8 @@ build = "../#common/mkmain.rs"
 name = "uu_id"
 path = "id.rs"
 
-[dependencies.uucore]
+[dependencies]
-version = "0.0.1"
+uucore = { version = "0.0.1", features = ["entries", "process"] }
-features = ["entries", "process"]
 
 [[bin]]
 name = "id"

src/kill/Cargo.toml

@@ -10,10 +10,7 @@ path = "kill.rs"
 
 [dependencies]
 libc = "0.2.42"
-
+uucore = { version = "0.0.1", features = ["signals"] }
-[dependencies.uucore]
-version = "0.0.1"
-features = ["signals"]
 
 [[bin]]
 name = "kill"

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"
-
+uucore = { version = "0.0.1", features = ["entries", "fs"] }
-[dependencies.uucore]
-version = "0.0.1"
-features = ["entries", "fs"]
 
 [[bin]]
 name = "ls"

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"

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"

src/nohup/Cargo.toml

@@ -11,10 +11,7 @@ path = "nohup.rs"
 [dependencies]
 getopts = "0.2.18"
 libc = "0.2.42"
-
+uucore = { version = "0.0.1", features = ["fs"] }
-[dependencies.uucore]
-version = "0.0.1"
-features = ["fs"]
 
 [[bin]]
 name = "nohup"

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]]

src/pinky/Cargo.toml

@@ -8,9 +8,8 @@ build = "../#common/mkmain.rs"
 name = "uu_pinky"
 path = "pinky.rs"
 
-[dependencies.uucore]
+[dependencies]
-version = "0.0.1"
+uucore = { version = "0.0.1", features = ["utmpx", "entries"] }
-features = ["utmpx", "entries"]
 
 [[bin]]
 name = "pinky"

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]]

src/readlink/Cargo.toml

@@ -11,10 +11,7 @@ path = "readlink.rs"
 [dependencies]
 getopts = "0.2.18"
 libc = "0.2.42"
-
+uucore = { version = "0.0.1", features = ["fs"] }
-[dependencies.uucore]
-version = "0.0.1"
-features = ["fs"]
 
 [[bin]]
 name = "readlink"

src/realpath/Cargo.toml

@@ -10,10 +10,7 @@ path = "realpath.rs"
 
 [dependencies]
 getopts = "0.2.18"
-
+uucore = { version = "0.0.1", features = ["fs"] }
-[dependencies.uucore]
-version = "0.0.1"
-features = ["fs"]
 
 [[bin]]
 name = "realpath"

src/relpath/Cargo.toml

@@ -10,10 +10,7 @@ path = "relpath.rs"
 
 [dependencies]
 getopts = "0.2.18"
-
+uucore = { version = "0.0.1", features = ["fs"] }
-[dependencies.uucore]
-version = "0.0.1"
-features = ["fs"]
 
 [[bin]]
 name = "relpath"

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"
 

src/sleep/Cargo.toml

@@ -10,10 +10,7 @@ path = "sleep.rs"
 
 [dependencies]
 getopts = "0.2.18"
-
+uucore = { version = "0.0.1", features = ["parse_time"] }
-[dependencies.uucore]
-version = "0.0.1"
-features = ["parse_time"]
 
 [[bin]]
 name = "sleep"

src/sort/Cargo.toml

@@ -10,12 +10,9 @@ path = "sort.rs"
 
 [dependencies]
 getopts = "0.2.18"
-semver = "0.9.0"
 itertools = "0.8.0"
-
+semver = "0.9.0"
-[dependencies.uucore]
+uucore = { version = "0.0.1", features = ["fs"] }
-version = "0.0.1"
-features = ["fs"]
 
 [[bin]]
 name = "sort"

src/stat/Cargo.toml

@@ -11,10 +11,7 @@ path = "stat.rs"
 [dependencies]
 getopts = "0.2.18"
 time = "0.1.40"
-
+uucore = { version = "0.0.1", features = ["entries"] }
-[dependencies.uucore]
-version = "0.0.1"
-features = ["entries"]
 
 [[bin]]
 name = "stat"

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"

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"
-
+libc = "0.2.42"
-[dependencies.uucore]
+uucore = { version = "0.0.1", features = ["wide"] }
-version = "0.0.1"
+winapi = { version = "0.3", features = ["handleapi", "winerror"] }
-features = ["wide"]
 
 [[bin]]
 name = "sync"

src/timeout/Cargo.toml

@@ -12,10 +12,7 @@ path = "timeout.rs"
 getopts = "0.2.18"
 libc = "0.2.42"
 time = "0.1.40"
-
+uucore = { version = "0.0.1", features = ["parse_time", "process"] }
-[dependencies.uucore]
-version = "0.0.1"
-features = ["parse_time", "process"]
 
 [[bin]]
 name = "timeout"

src/touch/Cargo.toml

@@ -12,10 +12,7 @@ path = "touch.rs"
 filetime = "0.2.1"
 getopts = "0.2.18"
 time = "0.1.40"
-
+uucore = { version = "0.0.1", features = ["libc"] }
-[dependencies.uucore]
-version = "0.0.1"
-features = ["libc"]
 
 [[bin]]
 name = "touch"

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]]

src/tty/Cargo.toml

@@ -11,10 +11,7 @@ path = "tty.rs"
 [dependencies]
 getopts = "0.2.18"
 libc = "0.2.42"
-
+uucore = { version = "0.0.1", features = ["fs"] }
-[dependencies.uucore]
-version = "0.0.1"
-features = ["fs"]
 
 [[bin]]
 name = "tty"

src/uptime/Cargo.toml

@@ -11,10 +11,7 @@ path = "uptime.rs"
 [dependencies]
 getopts = "0.2.18"
 time = "0.1.40"
-
+uucore = { version = "0.0.1", features = ["utmpx"] }
-[dependencies.uucore]
-version = "0.0.1"
-features = ["utmpx"]
 
 [[bin]]
 name = "uptime"

src/users/Cargo.toml

@@ -10,10 +10,7 @@ path = "users.rs"
 
 [dependencies]
 getopts = "0.2.18"
-
+uucore = { version = "0.0.1", features = ["utmpx"] }
-[dependencies.uucore]
-features = ["utmpx"]
-version = "0.0.1"
 
 [[bin]]
 name = "users"

src/who/Cargo.toml

@@ -8,13 +8,10 @@ build = "../#common/mkmain.rs"
 name = "uu_who"
 path = "who.rs"
 
-[dependencies.uucore]
+[dependencies]
-version = "0.0.1"
+uucore = { version = "0.0.1", features = ["utmpx"] }
-features = ["utmpx"]
+## optional
-
+clippy = { version = "0.0.212", optional = true }
-[dependencies.clippy]
-version = "0.0.212"
-optional = true
 
 [[bin]]
 name = "who"

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"
-
+clap = "2.32"
-[dependencies.uucore]
+uucore = { version = "0.0.1", features = ["entries", "wide"] }
-version = "0.0.1"
+winapi = { version = "0.3", features = ["lmcons"] }
-features = ["entries", "wide"]
 
 [[bin]]
 name = "whoami"