Merge pull request #4344 from tertsdiepraam/msrv-1.64

MSRV 1.64 & Workspace inheritance for dependencies

.clippy.toml

@@ -1 +1 @@
-msrv = "1.60.0"
+msrv = "1.64.0"

.github/workflows/CICD.yml

@@ -11,7 +11,7 @@ env:
   PROJECT_NAME: coreutils
   PROJECT_DESC: "Core universal (cross-platform) utilities"
   PROJECT_AUTH: "uutils"
-  RUST_MIN_SRV: "1.60.0" ## MSRV v1.60.0
+  RUST_MIN_SRV: "1.64.0"
   # * style job configuration
   STYLE_FAIL_ON_FAULT: true ## (bool) fail the build if a style job contains a fault (error or warning); may be overridden on a per-job basis
 

Cargo.lock

@@ -1332,8 +1332,6 @@ dependencies = [
  "bitflags",
  "cfg-if",
  "libc",
- "memoffset",
- "pin-utils",
  "static_assertions",
 ]
 
@@ -1827,12 +1825,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "retain_mut"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c31b5c4033f8fdde8700e4657be2c497e7288f01515be52168c631e2e4d4086"
-
 [[package]]
 name = "rlimit"
 version = "0.8.3"
@@ -3118,7 +3110,6 @@ version = "0.0.17"
 dependencies = [
  "clap",
  "libc",
- "retain_mut",
  "uucore",
 ]
 

Cargo.toml

@@ -1,7 +1,7 @@
 # coreutils (uutils)
 # * see the repository LICENSE, README, and CONTRIBUTING files for more information
 
-# spell-checker:ignore (libs) libselinux gethostid procfs
+# spell-checker:ignore (libs) libselinux gethostid procfs bigdecimal kqueue
 
 [package]
 name = "coreutils"
@@ -16,7 +16,7 @@ repository = "https://github.com/uutils/coreutils"
 readme = "README.md"
 keywords = ["coreutils", "uutils", "cross-platform", "cli", "utility"]
 categories = ["command-line-utilities"]
-rust-version = "1.60.0"
+rust-version = "1.64.0"
 edition = "2021"
 
 build = "build.rs"
@@ -262,17 +262,90 @@ feat_os_windows_legacy = [
 # * bypass/override ~ translate 'test' feature name to avoid dependency collision with rust core 'test' crate (o/w surfaces as compiler errors during testing)
 test = [ "uu_test" ]
 
-[workspace]
+[workspace.dependencies]
-
+atty = "0.2"
-[dependencies]
+bigdecimal = "0.3"
+binary-heap-plus = "0.5.0"
+bstr = "1.0"
+bytecount = "0.6.3"
+byteorder = "1.3.2"
+chrono = { version="^0.4.23", default-features=false, features=["std", "alloc", "clock"]}
 clap = { version = "4.0", features = ["wrap_help", "cargo"] }
 clap_complete = "4.0"
+compare = "0.1.0"
+coz = { version = "0.1.3" }
+crossterm = ">=0.19"
+ctrlc = { version = "3.0", features = ["termination"] }
+exacl = "0.9.0"
+file_diff = "1.0.0"
+filetime = "0.2"
+fnv = "1.0.7"
+fs_extra = "1.1.0"
+fts-sys = "0.2"
+gcd = "2.2"
+glob = "0.3.0"
+half = "2.1"
+indicatif = "0.17"
+itertools = "0.10.0"
+libc = "0.2.139"
+lscolors = { version = "0.13.0", default-features=false, features = ["nu-ansi-term"] }
+memchr = "2"
+nix = { version="0.26", default-features=false }
+nom = "7.1.1"
+notify = { version = "=5.0.0", features=["macos_kqueue"]}
+num_cpus = "1.14"
+num-bigint = "0.4.0"
+num-traits = "0.2.15"
+number_prefix = "0.4"
 once_cell = "1.13.1"
+onig = { version = "~6.4", default-features = false }
+ouroboros = "0.15.5"
 phf = "0.11.1"
-selinux = { version="0.3", optional = true }
+phf_codegen = "0.11.1"
+platform-info = "1.0.2"
+quick-error = "2.0.1"
+rand = { version = "0.8", features = ["small_rng"] }
+rand_core = "0.6"
+rayon = "1.5"
+redox_syscall = "0.2"
+regex = "1.7.1"
+rust-ini = "0.18.0"
+same-file = "1.0.6"
+selinux = "0.3"
+signal-hook = "0.3.14"
+smallvec = { version = "1.10", features = ["union"] }
+strum = "0.24.1"
+strum_macros = "0.24.2"
+tempfile = "3.3.0"
+term_grid = "0.1.5"
+terminal_size = "0.2.2"
 textwrap = { version="0.16.0", features=["terminal_size"] }
+thiserror = "1.0"
+time = { version="0.3" }
+unicode-segmentation = "1.9.0"
+unicode-width = "0.1.8"
+utf-8 = "0.7.6"
+walkdir = "2.2"
+winapi-util = "0.1.5"
+windows-sys = { version="0.42.0", default-features=false }
+xattr = "0.2.3"
+zip = { version = "0.6.3", default_features=false, features=["deflate"] }
+
 uucore = { version=">=0.0.17", package="uucore", path="src/uucore" }
-zip = { version = "0.6.3", optional=true, default_features=false, features=["deflate"] }
+uucore_procs = { version=">=0.0.17", package="uucore_procs", path="src/uucore_procs" }
+uu_ls = { version=">=0.0.17", path="src/uu/ls" }
+uu_base32 = { version=">=0.0.17", path="src/uu/base32"}
+
+[dependencies]
+clap = { workspace=true }
+once_cell = { workspace=true }
+uucore = { workspace=true }
+clap_complete = { workspace=true }
+phf = { workspace=true }
+selinux = { workspace=true, optional = true }
+textwrap = { workspace=true }
+zip = { workspace=true, optional = true }
+
 # * uutils
 uu_test  = { optional=true, version="0.0.17", package="uu_test", path="src/uu/test" }
 #
@@ -388,21 +461,21 @@ yes      = { optional=true, version="0.0.17", package="uu_yes", path="src/uu/yes
 #pin_cc = { version="1.0.61, < 1.0.62", package="cc" } ## cc v1.0.62 has compiler errors for MinRustV v1.32.0, requires 1.34 (for `std::str::split_ascii_whitespace()`)
 
 [dev-dependencies]
-chrono = { version="^0.4.23", default-features=false, features=["std", "alloc", "clock"]}
+chrono = { workspace=true }
 conv = "0.3"
-filetime = "0.2"
+filetime = { workspace=true }
-glob = "0.3.0"
+glob = { workspace=true }
-libc = "0.2"
+libc = { workspace=true }
 pretty_assertions = "1"
-rand = "0.8"
+rand = { workspace=true }
-regex = "1.7"
+regex = { workspace=true }
 sha1 = { version="0.10", features=["std"] }
-tempfile = "3"
+tempfile = { workspace=true }
-time = {version="0.3", features=["local-offset"]}
+time = { workspace=true, features=["local-offset"] }
 unindent = "0.1"
-uucore = { version=">=0.0.17", package="uucore", path="src/uucore", features=["entries", "process", "signals"] }
+uucore = { workspace=true, features=["entries", "process", "signals"] }
-walkdir = "2.2"
+walkdir = { workspace=true }
-atty = "0.2"
+atty = { workspace=true }
 hex-literal = "0.3.1"
 rstest = "0.16.0"
 
@@ -411,12 +484,12 @@ procfs = { version = "0.14", default-features = false }
 rlimit = "0.8.3"
 
 [target.'cfg(unix)'.dev-dependencies]
-nix = { version = "0.26", default-features = false, features = ["process", "signal", "user"] }
+nix = { workspace=true, features=["process", "signal", "user"] }
 rust-users = { version="0.11", package="users" }
 rand_pcg = "0.3"
 
 [build-dependencies]
-phf_codegen = "0.11.1"
+phf_codegen = { workspace=true }
 
 [[bin]]
 name = "coreutils"

README.md

@@ -7,7 +7,7 @@
 [![dependency status](https://deps.rs/repo/github/uutils/coreutils/status.svg)](https://deps.rs/repo/github/uutils/coreutils)
 
 [![CodeCov](https://codecov.io/gh/uutils/coreutils/branch/master/graph/badge.svg)](https://codecov.io/gh/uutils/coreutils)
-![MSRV](https://img.shields.io/badge/MSRV-1.60.0-brightgreen)
+![MSRV](https://img.shields.io/badge/MSRV-1.64.0-brightgreen)
 
 -----------------------------------------------
 
@@ -52,7 +52,7 @@ Both can also be generated locally, the instructions for that can be found in th
 ### Rust Version
 
 uutils follows Rust's release channels and is tested against stable, beta and nightly.
-The current Minimum Supported Rust Version (MSRV) is `1.60.0`.
+The current Minimum Supported Rust Version (MSRV) is `1.64.0`.
 
 ## Building
 

src/uu/arch/Cargo.toml

@@ -15,9 +15,9 @@ edition = "2021"
 path = "src/arch.rs"
 
 [dependencies]
-platform-info = "1.0.2"
+platform-info = { workspace=true }
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "arch"

src/uu/base32/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/base32.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features = ["encoding"] }
+uucore = { workspace=true, features = ["encoding"] }
 
 [[bin]]
 name = "base32"

src/uu/base64/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/base64.rs"
 
 [dependencies]
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features = ["encoding"] }
+uucore = { workspace=true, features = ["encoding"] }
-uu_base32 = { version=">=0.0.17", package="uu_base32", path="../base32"}
+uu_base32 = { workspace=true }
 
 [[bin]]
 name = "base64"

src/uu/basename/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/basename.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "basename"

src/uu/basenc/Cargo.toml

@@ -15,9 +15,9 @@ edition = "2021"
 path = "src/basenc.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features = ["encoding"] }
+uucore = { workspace=true, features = ["encoding"] }
-uu_base32 = { version=">=0.0.17", package="uu_base32", path="../base32"}
+uu_base32 = { workspace=true }
 
 [[bin]]
 name = "basenc"

src/uu/cat/Cargo.toml

@@ -15,13 +15,13 @@ edition = "2021"
 path = "src/cat.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-thiserror = "1.0"
+thiserror = { workspace = true }
-atty = "0.2"
+atty = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["fs", "pipes"] }
+uucore = { workspace=true, features=["fs", "pipes"] }
 
 [target.'cfg(unix)'.dependencies]
-nix = { version = "0.26", default-features = false }
+nix = { workspace=true }
 
 [[bin]]
 name = "cat"

src/uu/chcon/Cargo.toml

@@ -14,12 +14,12 @@ edition = "2021"
 path = "src/chcon.rs"
 
 [dependencies]
-clap         = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore       = { version = ">=0.0.9", package="uucore", path="../../uucore", features=["entries", "fs", "perms"] }
+uucore = { workspace=true, features=["entries", "fs", "perms"] }
-selinux      = { version = "0.3"   }
+selinux = { workspace=true }
-fts-sys      = { version = "0.2"   }
+thiserror = { workspace = true }
-thiserror    = { version = "1.0"   }
+libc = { workspace=true }
-libc         = { version = "0.2"   }
+fts-sys = { workspace=true }
 
 [[bin]]
 name = "chcon"

src/uu/chgrp/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/chgrp.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["entries", "fs", "perms"] }
+uucore = { workspace=true, features=["entries", "fs", "perms"] }
 
 [[bin]]
 name = "chgrp"

src/uu/chmod/Cargo.toml

@@ -15,9 +15,9 @@ edition = "2021"
 path = "src/chmod.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-libc = "0.2.137"
+libc = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["fs", "mode"] }
+uucore = { workspace=true, features=["fs", "mode"] }
 
 [[bin]]
 name = "chmod"

src/uu/chown/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/chown.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["entries", "fs", "perms"] }
+uucore = { workspace=true, features=["entries", "fs", "perms"] }
 
 [[bin]]
 name = "chown"

src/uu/chroot/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/chroot.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["entries", "fs"] }
+uucore = { workspace=true, features=["entries", "fs"] }
 
 [[bin]]
 name = "chroot"

src/uu/cksum/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/cksum.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "cksum"

src/uu/comm/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/comm.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "comm"

src/uu/cp/Cargo.toml

@@ -19,18 +19,18 @@ edition = "2021"
 path = "src/cp.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-filetime = "0.2"
+filetime = { workspace=true }
-libc = "0.2.137"
+libc = { workspace=true }
-quick-error = "2.0.1"
+quick-error = { workspace=true }
-selinux = { version="0.3", optional=true }
+selinux = { workspace=true, optional=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["entries", "fs", "perms", "mode"] }
+uucore = { workspace=true, features=["entries", "fs", "perms", "mode"] }
-walkdir = "2.2"
+walkdir = { workspace=true }
-indicatif = "0.17"
+indicatif = { workspace=true }
 
 [target.'cfg(unix)'.dependencies]
-xattr="0.2.3"
+xattr = { workspace=true }
-exacl= { version = "0.9.0", optional=true }
+exacl = { workspace=true, optional=true }
 
 [[bin]]
 name = "cp"

src/uu/csplit/Cargo.toml

@@ -15,10 +15,10 @@ edition = "2021"
 path = "src/csplit.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-thiserror = "1.0"
+thiserror = { workspace = true }
-regex = "1.7.1"
+regex = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["entries", "fs"] }
+uucore = { workspace=true, features=["entries", "fs"] }
 
 [[bin]]
 name = "csplit"

src/uu/cut/Cargo.toml

@@ -15,11 +15,11 @@ edition = "2021"
 path = "src/cut.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
-memchr = "2"
+memchr = { workspace=true }
-bstr = "1.0"
+bstr = { workspace=true }
-atty = "0.2"
+atty = { workspace=true }
 
 [[bin]]
 name = "cut"

src/uu/date/Cargo.toml

@@ -15,15 +15,15 @@ edition = "2021"
 path = "src/date.rs"
 
 [dependencies]
-chrono = { version="^0.4.23", default-features=false, features=["std", "alloc", "clock"]}
+chrono = { workspace=true }
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [target.'cfg(unix)'.dependencies]
-libc = "0.2"
+libc = { workspace=true }
 
 [target.'cfg(windows)'.dependencies]
-windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_Foundation", "Win32_System_SystemInformation"] }
+windows-sys = { workspace=true, features = ["Win32_Foundation", "Win32_System_SystemInformation"] }
 
 [[bin]]
 name = "date"

src/uu/dd/Cargo.toml

@@ -15,13 +15,13 @@ edition = "2021"
 path = "src/dd.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-gcd = "2.2"
+gcd = { workspace=true }
-libc = "0.2"
+libc = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
-signal-hook = "0.3.14"
+signal-hook = { workspace=true }
 
 [[bin]]
 name = "dd"

src/uu/df/Cargo.toml

@@ -15,9 +15,9 @@ edition = "2021"
 path = "src/df.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["libc", "fsext"] }
+uucore = { workspace=true, features=["libc", "fsext"] }
-unicode-width = "0.1.9"
+unicode-width = { workspace=true }
 
 [[bin]]
 name = "df"

src/uu/df/src/df.rs

@@ -240,7 +240,7 @@ impl Options {
             }
         }
 
-        (!intersected_types.is_empty()).then(|| intersected_types)
+        (!intersected_types.is_empty()).then_some(intersected_types)
     }
 }
 

src/uu/dir/Cargo.toml

@@ -15,9 +15,9 @@ edition = "2021"
 path = "src/dir.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo", "env"] }
+clap = { workspace=true, features = ["env"] }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["entries", "fs"] }
+uucore = { workspace=true, features=["entries", "fs"] }
-uu_ls = { version = ">=0.0.17", path="../ls"}
+uu_ls = { workspace=true }
 
 [[bin]]
 name = "dir"

src/uu/dircolors/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/dircolors.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "dircolors"

src/uu/dirname/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/dirname.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "dirname"

src/uu/du/Cargo.toml

@@ -15,14 +15,14 @@ edition = "2021"
 path = "src/du.rs"
 
 [dependencies]
-chrono = { version="^0.4.23", default-features=false, features=["std", "alloc", "clock"]}
+chrono = { workspace=true }
 # For the --exclude & --exclude-from options
-glob = "0.3.0"
+glob = { workspace=true }
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_Storage_FileSystem", "Win32_Foundation"] }
+windows-sys = { workspace=true, features = ["Win32_Storage_FileSystem", "Win32_Foundation"] }
 
 [[bin]]
 name = "du"

src/uu/echo/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/echo.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "echo"

src/uu/env/Cargo.toml

@@ -15,12 +15,12 @@ edition = "2021"
 path = "src/env.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-rust-ini = "0.18.0"
+rust-ini = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["signals"]}
+uucore = { workspace=true, features=["signals"]}
 
 [target.'cfg(unix)'.dependencies]
-nix = { version = "0.26", default-features = false, features = ["signal"] }
+nix = { workspace=true, features = ["signal"] }
 
 
 [[bin]]

src/uu/expand/Cargo.toml

@@ -15,9 +15,9 @@ edition = "2021"
 path = "src/expand.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-unicode-width = "0.1.5"
+unicode-width = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "expand"

src/uu/expr/Cargo.toml

@@ -15,11 +15,11 @@ edition = "2021"
 path = "src/expr.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-num-bigint = "0.4.0"
+num-bigint = { workspace=true }
-num-traits = "0.2.15"
+num-traits = { workspace=true }
-onig = { version = "~6.4", default-features = false }
+onig = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "expr"

src/uu/factor/Cargo.toml

@@ -12,15 +12,15 @@ categories = ["command-line-utilities"]
 edition = "2021"
 
 [build-dependencies]
-num-traits = "0.2.15" # used in src/numerics.rs, which is included by build.rs
+num-traits = { workspace=true } # used in src/numerics.rs, which is included by build.rs
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-coz = { version = "0.1.3", optional = true }
+coz = { workspace=true, optional = true }
-num-traits = "0.2.15" # Needs at least version 0.2.15 for "OverflowingAdd"
+num-traits = { workspace=true }
-rand = { version = "0.8", features = ["small_rng"] }
+rand = { workspace=true }
-smallvec = { version = "1.10", features = ["union"] }
+smallvec = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [dev-dependencies]
 paste = "1.0.6"

src/uu/false/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/false.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "false"

src/uu/fmt/Cargo.toml

@@ -15,9 +15,9 @@ edition = "2021"
 path = "src/fmt.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-unicode-width = "0.1.5"
+unicode-width = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "fmt"

src/uu/fold/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/fold.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "fold"

src/uu/groups/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/groups.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["entries", "process"] }
+uucore = { workspace=true, features=["entries", "process"] }
 
 [[bin]]
 name = "groups"

src/uu/hashsum/Cargo.toml

@@ -16,17 +16,17 @@ path = "src/hashsum.rs"
 
 [dependencies]
 digest = "0.10.6"
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
 hex = "0.4.3"
-memchr = "2"
+memchr = { workspace=true }
 md-5 = "0.10.5"
-regex = "1.7.1"
+regex = { workspace=true }
 sha1 = "0.10.1"
 sha2 = "0.10.2"
 sha3 = "0.10.6"
 blake2b_simd = "1.0.1"
 blake3 = "1.3.2"
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "hashsum"

src/uu/head/Cargo.toml

@@ -15,9 +15,9 @@ edition = "2021"
 path = "src/head.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-memchr = "2"
+memchr = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["ringbuffer", "lines"] }
+uucore = { workspace=true, features=["ringbuffer", "lines"] }
 
 [[bin]]
 name = "head"

src/uu/hostid/Cargo.toml

@@ -15,9 +15,9 @@ edition = "2021"
 path = "src/hostid.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-libc = "0.2.137"
+libc = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "hostid"

src/uu/hostname/Cargo.toml

@@ -15,12 +15,12 @@ edition = "2021"
 path = "src/hostname.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
 hostname = { version = "0.3", features = ["set"] }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["wide"] }
+uucore = { workspace=true, features=["wide"] }
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_Networking_WinSock", "Win32_Foundation"] }
+windows-sys = { workspace=true, features = ["Win32_Networking_WinSock", "Win32_Foundation"] }
 
 [[bin]]
 name = "hostname"

src/uu/id/Cargo.toml

@@ -15,9 +15,9 @@ edition = "2021"
 path = "src/id.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["entries", "process"] }
+uucore = { workspace=true, features=["entries", "process"] }
-selinux = { version="0.3", optional = true }
+selinux = { workspace=true, optional=true }
 
 [[bin]]
 name = "id"

src/uu/install/Cargo.toml

@@ -18,14 +18,14 @@ edition = "2021"
 path = "src/install.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-filetime = "0.2"
+filetime = { workspace=true }
-file_diff = "1.0.0"
+file_diff = { workspace=true }
-libc = ">= 0.2"
+libc = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["fs", "mode", "perms", "entries"] }
+uucore = { workspace=true, features=["fs", "mode", "perms", "entries"] }
 
 [dev-dependencies]
-time = "0.3"
+time = { workspace=true }
 
 [[bin]]
 name = "install"

src/uu/join/Cargo.toml

@@ -15,9 +15,9 @@ edition = "2021"
 path = "src/join.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
-memchr = "2"
+memchr = { workspace=true }
 
 [[bin]]
 name = "join"

src/uu/kill/Cargo.toml

@@ -15,9 +15,9 @@ edition = "2021"
 path = "src/kill.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-nix = { version = "0.26", features = ["signal"] }
+nix = { workspace=true, features = ["signal"] }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["signals"] }
+uucore = { workspace=true, features=["signals"] }
 
 [[bin]]
 name = "kill"

src/uu/link/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/link.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "link"

src/uu/ln/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/ln.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["fs"] }
+uucore = { workspace=true, features=["fs"] }
 
 [[bin]]
 name = "ln"

src/uu/logname/Cargo.toml

@@ -15,9 +15,9 @@ edition = "2021"
 path = "src/logname.rs"
 
 [dependencies]
-libc = "0.2.137"
+libc = { workspace=true }
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "logname"

src/uu/ls/Cargo.toml

@@ -15,18 +15,18 @@ edition = "2021"
 path = "src/ls.rs"
 
 [dependencies]
-chrono = { version="^0.4.23", default-features=false, features=["std", "alloc", "clock"]}
+clap = { workspace=true, features = ["env"] }
-clap = { version = "4.0", features = ["wrap_help", "cargo", "env"] }
+chrono = { workspace=true }
-unicode-width = "0.1.8"
+unicode-width = { workspace=true }
-number_prefix = "0.4"
+number_prefix = { workspace=true }
-term_grid = "0.1.5"
+term_grid = { workspace=true }
-terminal_size = "0.2.2"
+terminal_size = { workspace=true }
-glob = "0.3.0"
+glob = { workspace=true }
-lscolors = { version = "0.13.0", default-features=false, features = ["nu-ansi-term"] }
+lscolors = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features = ["entries", "fs"] }
+uucore = { workspace=true, features = ["entries", "fs"] }
-once_cell = "1.13.1"
+once_cell = { workspace=true }
-atty = "0.2"
+atty = { workspace=true }
-selinux = { version="0.3", optional = true }
+selinux = { workspace=true, optional = true }
 
 [[bin]]
 name = "ls"

src/uu/mkdir/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/mkdir.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["fs", "mode"] }
+uucore = { workspace=true, features=["fs", "mode"] }
 
 [[bin]]
 name = "mkdir"

src/uu/mkfifo/Cargo.toml

@@ -15,9 +15,9 @@ edition = "2021"
 path = "src/mkfifo.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-libc = "0.2.137"
+libc = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "mkfifo"

src/uu/mknod/Cargo.toml

@@ -16,9 +16,9 @@ name = "uu_mknod"
 path = "src/mknod.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-libc = "^0.2.137"
+libc = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["mode"] }
+uucore = { workspace=true, features=["mode"] }
 
 [[bin]]
 name = "mknod"

src/uu/mktemp/Cargo.toml

@@ -15,10 +15,10 @@ edition = "2021"
 path = "src/mktemp.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-rand = "0.8"
+rand = { workspace=true }
-tempfile = "3"
+tempfile = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "mktemp"

src/uu/more/Cargo.toml

@@ -15,15 +15,15 @@ edition = "2021"
 path = "src/more.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
-crossterm = ">=0.19"
+crossterm = { workspace=true }
-atty = "0.2"
+atty = { workspace=true }
-unicode-width = "0.1.7"
+unicode-width = { workspace=true }
-unicode-segmentation = "1.9.0"
+unicode-segmentation = { workspace=true }
 
 [target.'cfg(all(unix, not(target_os = "fuchsia")))'.dependencies]
-nix = { version = "0.26", default-features = false }
+nix = { workspace=true }
 
 [[bin]]
 name = "more"

src/uu/mv/Cargo.toml

@@ -15,11 +15,10 @@ edition = "2021"
 path = "src/mv.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-fs_extra = "1.1.0"
+fs_extra = { workspace=true }
-indicatif = "0.17"
+indicatif = { workspace=true }
-
+uucore = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
 
 [[bin]]
 name = "mv"

src/uu/nice/Cargo.toml

@@ -15,10 +15,10 @@ edition = "2021"
 path = "src/nice.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-libc = "0.2.137"
+libc = { workspace=true }
-nix = { version = "0.26", default-features = false }
+nix = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "nice"

src/uu/nl/Cargo.toml

@@ -15,9 +15,9 @@ edition = "2021"
 path = "src/nl.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-regex = "1.7.1"
+regex = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "nl"

src/uu/nohup/Cargo.toml

@@ -15,10 +15,10 @@ edition = "2021"
 path = "src/nohup.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-libc = "0.2.137"
+libc = { workspace=true }
-atty = "0.2"
+atty = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["fs"] }
+uucore = { workspace=true, features=["fs"] }
 
 [[bin]]
 name = "nohup"

src/uu/nproc/Cargo.toml

@@ -15,10 +15,10 @@ edition = "2021"
 path = "src/nproc.rs"
 
 [dependencies]
-libc = "0.2.137"
+libc = { workspace=true }
-num_cpus = "1.14"
+num_cpus = { workspace=true }
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["fs"] }
+uucore = { workspace=true, features=["fs"] }
 
 [[bin]]
 name = "nproc"

src/uu/numfmt/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/numfmt.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "numfmt"

src/uu/od/Cargo.toml

@@ -15,10 +15,10 @@ edition = "2021"
 path = "src/od.rs"
 
 [dependencies]
-byteorder = "1.3.2"
+byteorder = { workspace=true }
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-half = "2.1"
+half = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "od"

src/uu/paste/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/paste.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "paste"

src/uu/pathchk/Cargo.toml

@@ -15,9 +15,9 @@ edition = "2021"
 path = "src/pathchk.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-libc = "0.2.137"
+libc = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "pathchk"

src/uu/pinky/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/pinky.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["utmpx", "entries"] }
+uucore = { workspace=true, features=["utmpx", "entries"] }
 
 [[bin]]
 name = "pinky"

src/uu/pr/Cargo.toml

@@ -15,12 +15,12 @@ edition = "2021"
 path = "src/pr.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-time = { version = "0.3", features = ["local-offset", "macros", "formatting"] }
+time = { workspace=true, features = ["local-offset", "macros", "formatting"] }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["entries"] }
+uucore = { workspace=true, features=["entries"] }
-quick-error = "2.0.1"
+quick-error = { workspace=true }
-itertools = "0.10.0"
+itertools = { workspace=true }
-regex = "1.7"
+regex = { workspace=true }
 
 [[bin]]
 name = "pr"

src/uu/printenv/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/printenv.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "printenv"

src/uu/printf/Cargo.toml

@@ -18,8 +18,8 @@ edition = "2021"
 path = "src/printf.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["memo"] }
+uucore = { workspace=true, features=["memo"] }
 
 [[bin]]
 name = "printf"

src/uu/ptx/Cargo.toml

@@ -15,9 +15,9 @@ edition = "2021"
 path = "src/ptx.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-regex = "1.7.1"
+regex = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "ptx"

src/uu/pwd/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/pwd.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "pwd"

src/uu/readlink/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/readlink.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["fs"] }
+uucore = { workspace=true, features=["fs"] }
 
 [[bin]]
 name = "readlink"

src/uu/realpath/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/realpath.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["fs"] }
+uucore = { workspace=true, features=["fs"] }
 
 [[bin]]
 name = "realpath"

src/uu/relpath/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/relpath.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["fs"] }
+uucore = { workspace=true, features=["fs"] }
 
 [[bin]]
 name = "relpath"

src/uu/rm/Cargo.toml

@@ -15,15 +15,15 @@ edition = "2021"
 path = "src/rm.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-walkdir = "2.2"
+walkdir = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["fs"] }
+uucore = { workspace=true, features=["fs"] }
 
 [target.'cfg(unix)'.dependencies]
-libc = "0.2.137"
+libc = { workspace=true }
 
 [target.'cfg(windows)'.dependencies]
-windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_Storage_FileSystem"] }
+windows-sys = { workspace=true, features = ["Win32_Storage_FileSystem"] }
 
 [[bin]]
 name = "rm"

src/uu/rmdir/Cargo.toml

@@ -15,9 +15,9 @@ edition = "2021"
 path = "src/rmdir.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["fs"] }
+uucore = { workspace=true, features=["fs"] }
-libc = "0.2.137"
+libc = { workspace=true }
 
 [[bin]]
 name = "rmdir"

src/uu/runcon/Cargo.toml

@@ -14,11 +14,11 @@ edition = "2021"
 path = "src/runcon.rs"
 
 [dependencies]
-clap         = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore       = { version = ">=0.0.9", package="uucore", path="../../uucore", features=["entries", "fs", "perms"] }
+uucore = { workspace=true, features=["entries", "fs", "perms"] }
-selinux      = { version = "0.3"   }
+selinux = { workspace=true }
-thiserror    = { version = "1.0"   }
+thiserror = { workspace=true }
-libc         = { version = "0.2"   }
+libc = { workspace=true }
 
 [[bin]]
 name = "runcon"

src/uu/seq/Cargo.toml

@@ -16,11 +16,11 @@ edition = "2021"
 path = "src/seq.rs"
 
 [dependencies]
-bigdecimal = "0.3"
+bigdecimal = { workspace=true }
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-num-bigint = "0.4.0"
+num-bigint = { workspace=true }
-num-traits = "0.2.15"
+num-traits = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["memo"] }
+uucore = { workspace=true, features=["memo"] }
 
 [[bin]]
 name = "seq"

src/uu/shred/Cargo.toml

@@ -15,9 +15,9 @@ edition = "2021"
 path = "src/shred.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-rand = "0.8"
+rand = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "shred"

src/uu/shuf/Cargo.toml

@@ -15,11 +15,11 @@ edition = "2021"
 path = "src/shuf.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-memchr = "2.5.0"
+memchr = { workspace=true }
-rand = "0.8"
+rand = { workspace=true }
-rand_core = "0.6"
+rand_core = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "shuf"

src/uu/sleep/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/sleep.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "sleep"

src/uu/sort/Cargo.toml

@@ -15,19 +15,19 @@ edition = "2021"
 path = "src/sort.rs"
 
 [dependencies]
-binary-heap-plus = "0.5.0"
+binary-heap-plus = { workspace=true }
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-compare = "0.1.0"
+compare = { workspace=true }
-ctrlc = { version = "3.0", features = ["termination"] }
+ctrlc = { workspace=true }
-fnv = "1.0.7"
+fnv = { workspace=true }
-itertools = "0.10.0"
+itertools = { workspace=true }
-memchr = "2.5.0"
+memchr = { workspace=true }
-ouroboros = "0.15.5"
+ouroboros = { workspace=true }
-rand = "0.8"
+rand = { workspace=true }
-rayon = "1.5"
+rayon = { workspace=true }
-tempfile = "3"
+tempfile = { workspace=true }
-unicode-width = "0.1.8"
+unicode-width = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["fs"] }
+uucore = { workspace=true, features=["fs"] }
 
 [[bin]]
 name = "sort"

src/uu/split/Cargo.toml

@@ -15,9 +15,9 @@ edition = "2021"
 path = "src/split.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-memchr = "2"
+memchr = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["fs"] }
+uucore = { workspace=true, features=["fs"] }
 
 [[bin]]
 name = "split"

src/uu/stat/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/stat.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["entries", "libc", "fs", "fsext"] }
+uucore = { workspace=true, features=["entries", "libc", "fs", "fsext"] }
 
 [[bin]]
 name = "stat"

src/uu/stdbuf/Cargo.toml

@@ -15,9 +15,9 @@ edition = "2021"
 path = "src/stdbuf.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-tempfile = "3"
+tempfile = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [build-dependencies]
 libstdbuf = { version="0.0.17", package="uu_stdbuf_libstdbuf", path="src/libstdbuf" }

src/uu/stdbuf/src/libstdbuf/Cargo.toml

@@ -18,7 +18,7 @@ crate-type = ["cdylib", "rlib"] # XXX: note: the rlib is just to prevent Cargo f
 
 [dependencies]
 cpp = "0.5"
-libc = "0.2"
+libc = { workspace=true }
 uucore = { version=">=0.0.17", package="uucore", path="../../../../uucore" }
 
 [build-dependencies]

src/uu/stty/Cargo.toml

@@ -15,9 +15,9 @@ edition = "2021"
 path = "src/stty.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
-nix = { version="0.26", features = ["term"] }
+nix = { workspace=true, features = ["term", "ioctl"] }
 
 [[bin]]
 name = "stty"

src/uu/sum/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/sum.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "sum"

src/uu/sync/Cargo.toml

@@ -15,15 +15,15 @@ edition = "2021"
 path = "src/sync.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-libc = "0.2.137"
+libc = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["wide"] }
+uucore = { workspace=true, features=["wide"] }
 
 [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
-nix = "0.26"
+nix = { workspace=true }
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_Storage_FileSystem", "Win32_System_WindowsProgramming", "Win32_Foundation"] }
+windows-sys = { workspace=true, features = ["Win32_Storage_FileSystem", "Win32_System_WindowsProgramming", "Win32_Foundation"] }
 
 [[bin]]
 name = "sync"

src/uu/tac/Cargo.toml

@@ -17,11 +17,11 @@ edition = "2021"
 path = "src/tac.rs"
 
 [dependencies]
-memchr = "2"
+memchr = { workspace=true }
 memmap2 = "0.5"
-regex = "1"
+regex = { workspace=true }
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "tac"

src/uu/tail/Cargo.toml

@@ -1,4 +1,3 @@
-# spell-checker:ignore (libs) kqueue
 [package]
 name = "uu_tail"
 version = "0.0.17"
@@ -16,20 +15,20 @@ edition = "2021"
 path = "src/tail.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-libc = "0.2.137"
+libc = { workspace=true }
-memchr = "2.5.0"
+memchr = { workspace=true }
-notify = { version = "=5.0.0", features=["macos_kqueue"]}
+notify = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["ringbuffer", "lines"] }
+uucore = { workspace=true, features=["ringbuffer", "lines"] }
-same-file = "1.0.6"
+same-file = { workspace=true }
-atty = "0.2"
+atty = { workspace=true }
 
 [target.'cfg(windows)'.dependencies]
-windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_System_Threading", "Win32_Foundation"] }
+windows-sys = { workspace=true, features = ["Win32_System_Threading", "Win32_Foundation"] }
-winapi-util = { version="0.1.5" }
+winapi-util = { workspace=true }
 
 [target.'cfg(unix)'.dependencies]
-nix = { version = "0.26", features = ["fs"] }
+nix = { workspace=true, features = ["fs"] }
 
 [[bin]]
 name = "tail"

src/uu/tee/Cargo.toml

@@ -15,10 +15,9 @@ edition = "2021"
 path = "src/tee.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-libc = "0.2.137"
+libc = { workspace=true }
-retain_mut = "=0.1.7" # ToDO: [2021-01-01; rivy; maint/MinSRV] ~ v0.1.5 uses const generics which aren't stabilized until rust v1.51.0
+uucore = { workspace=true, features=["libc"] }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["libc"] }
 
 [[bin]]
 name = "tee"

src/uu/tee/src/tee.rs

@@ -6,7 +6,6 @@
 //  * file that was distributed with this source code.
 
 use clap::{builder::PossibleValue, crate_version, Arg, ArgAction, Command};
-use retain_mut::RetainMut;
 use std::fs::OpenOptions;
 use std::io::{copy, sink, stdin, stdout, Error, ErrorKind, Read, Result, Write};
 use std::path::PathBuf;
@@ -301,7 +300,7 @@ impl Write for MultiWriter {
         let mut aborted = None;
         let mode = self.output_error_mode.clone();
         let mut errors = 0;
-        RetainMut::retain_mut(&mut self.writers, |writer| {
+        self.writers.retain_mut(|writer| {
             let result = writer.write_all(buf);
             match result {
                 Err(f) => {
@@ -332,7 +331,7 @@ impl Write for MultiWriter {
         let mut aborted = None;
         let mode = self.output_error_mode.clone();
         let mut errors = 0;
-        RetainMut::retain_mut(&mut self.writers, |writer| {
+        self.writers.retain_mut(|writer| {
             let result = writer.flush();
             match result {
                 Err(f) => {

src/uu/test/Cargo.toml

@@ -15,12 +15,12 @@ edition = "2021"
 path = "src/test.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-libc = "0.2.137"
+libc = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [target.'cfg(target_os = "redox")'.dependencies]
-redox_syscall = "0.2"
+redox_syscall = { workspace=true }
 
 [[bin]]
 name = "test"

src/uu/timeout/Cargo.toml

@@ -15,10 +15,10 @@ edition = "2021"
 path = "src/timeout.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-libc = "0.2.137"
+libc = { workspace=true }
-nix = { version = "0.26", default-features = false, features = ["signal"] }
+nix = { workspace=true, features = ["signal"] }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["process", "signals"] }
+uucore = { workspace=true, features=["process", "signals"] }
 
 [[bin]]
 name = "timeout"

src/uu/touch/Cargo.toml

@@ -15,13 +15,13 @@ edition = "2021"
 path = "src/touch.rs"
 
 [dependencies]
-filetime = "0.2.18"
+filetime = { workspace=true }
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-time = { version = "0.3", features = ["parsing", "formatting", "local-offset", "macros"] }
+time = { workspace=true, features = ["parsing", "formatting", "local-offset", "macros"] }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["libc"] }
+uucore = { workspace=true, features=["libc"] }
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_Storage_FileSystem", "Win32_Foundation"] }
+windows-sys = { workspace=true, features = ["Win32_Storage_FileSystem", "Win32_Foundation"] }
 
 [[bin]]
 name = "touch"

src/uu/tr/Cargo.toml

@@ -15,9 +15,9 @@ edition = "2021"
 path = "src/tr.rs"
 
 [dependencies]
-nom = "7.1.1"
+nom = { workspace=true }
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "tr"

src/uu/true/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/true.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "true"

src/uu/truncate/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/truncate.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "truncate"

src/uu/tsort/Cargo.toml

@@ -15,8 +15,8 @@ edition = "2021"
 path = "src/tsort.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+uucore = { workspace=true }
 
 [[bin]]
 name = "tsort"

src/uu/tty/Cargo.toml

@@ -15,10 +15,10 @@ edition = "2021"
 path = "src/tty.rs"
 
 [dependencies]
-clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+clap = { workspace=true }
-nix = "0.26"
+nix = { workspace=true, features=["term"] }
-atty = "0.2"
+atty = { workspace=true }
-uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["fs"] }
+uucore = { workspace=true, features=["fs"] }
 
 [[bin]]
 name = "tty"