Use workspace inheritance for dependencies

This commit is contained in:
Terts Diepraam
2023-02-11 15:05:28 +01:00
parent d60fc40f2f
commit ae27c82020
107 changed files with 472 additions and 402 deletions
Generated
-2
View File
@@ -1332,8 +1332,6 @@ dependencies = [
"bitflags",
"cfg-if",
"libc",
"memoffset",
"pin-utils",
"static_assertions",
]
+93 -19
View File
@@ -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"
@@ -262,17 +262,91 @@ 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]
[dependencies]
[workspace.dependencies]
atty = "0.2"
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"
retain_mut = "0.1.7"
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 +462,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"
glob = "0.3.0"
libc = "0.2"
filetime = { workspace=true }
glob = { workspace=true }
libc = { workspace=true }
pretty_assertions = "1"
rand = "0.8"
regex = "1.7"
rand = { workspace=true }
regex = { workspace=true }
sha1 = { version="0.10", features=["std"] }
tempfile = "3"
time = {version="0.3", features=["local-offset"]}
tempfile = { workspace=true }
time = { workspace=true, features=["local-offset"] }
unindent = "0.1"
uucore = { version=">=0.0.17", package="uucore", path="src/uucore", features=["entries", "process", "signals"] }
walkdir = "2.2"
atty = "0.2"
uucore = { workspace=true, features=["entries", "process", "signals"] }
walkdir = { workspace=true }
atty = { workspace=true }
hex-literal = "0.3.1"
rstest = "0.16.0"
@@ -411,12 +485,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"
+3 -3
View File
@@ -15,9 +15,9 @@ edition = "2021"
path = "src/arch.rs"
[dependencies]
platform-info = "1.0.2"
clap = { version = "4.0", features = ["wrap_help", "cargo"] }
uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
platform-info = { workspace=true }
clap = { workspace=true }
uucore = { workspace=true }
[[bin]]
name = "arch"
+2 -2
View File
@@ -15,8 +15,8 @@ edition = "2021"
path = "src/base32.rs"
[dependencies]
clap = { version = "4.0", features = ["wrap_help", "cargo"] }
uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features = ["encoding"] }
clap = { workspace=true }
uucore = { workspace=true, features = ["encoding"] }
[[bin]]
name = "base32"
+2 -2
View File
@@ -15,8 +15,8 @@ edition = "2021"
path = "src/base64.rs"
[dependencies]
uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features = ["encoding"] }
uu_base32 = { version=">=0.0.17", package="uu_base32", path="../base32"}
uucore = { workspace=true, features = ["encoding"] }
uu_base32 = { workspace=true }
[[bin]]
name = "base64"
+2 -2
View File
@@ -15,8 +15,8 @@ edition = "2021"
path = "src/basename.rs"
[dependencies]
clap = { version = "4.0", features = ["wrap_help", "cargo"] }
uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
clap = { workspace=true }
uucore = { workspace=true }
[[bin]]
name = "basename"
+3 -3
View File
@@ -15,9 +15,9 @@ edition = "2021"
path = "src/basenc.rs"
[dependencies]
clap = { version = "4.0", features = ["wrap_help", "cargo"] }
uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features = ["encoding"] }
uu_base32 = { version=">=0.0.17", package="uu_base32", path="../base32"}
clap = { workspace=true }
uucore = { workspace=true, features = ["encoding"] }
uu_base32 = { workspace=true }
[[bin]]
name = "basenc"
+5 -5
View File
@@ -15,13 +15,13 @@ edition = "2021"
path = "src/cat.rs"
[dependencies]
clap = { version = "4.0", features = ["wrap_help", "cargo"] }
thiserror = "1.0"
atty = "0.2"
uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["fs", "pipes"] }
clap = { workspace=true }
thiserror = { workspace = true }
atty = { workspace=true }
uucore = { workspace=true, features=["fs", "pipes"] }
[target.'cfg(unix)'.dependencies]
nix = { version = "0.26", default-features = false }
nix = { workspace=true }
[[bin]]
name = "cat"
+6 -6
View File
@@ -14,12 +14,12 @@ edition = "2021"
path = "src/chcon.rs"
[dependencies]
clap = { version = "4.0", features = ["wrap_help", "cargo"] }
uucore = { version = ">=0.0.9", package="uucore", path="../../uucore", features=["entries", "fs", "perms"] }
selinux = { version = "0.3" }
fts-sys = { version = "0.2" }
thiserror = { version = "1.0" }
libc = { version = "0.2" }
clap = { workspace=true }
uucore = { workspace=true, features=["entries", "fs", "perms"] }
selinux = { workspace=true }
thiserror = { workspace = true }
libc = { workspace=true }
fts-sys = { workspace=true }
[[bin]]
name = "chcon"
+2 -2
View File
@@ -15,8 +15,8 @@ edition = "2021"
path = "src/chgrp.rs"
[dependencies]
clap = { version = "4.0", features = ["wrap_help", "cargo"] }
uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["entries", "fs", "perms"] }
clap = { workspace=true }
uucore = { workspace=true, features=["entries", "fs", "perms"] }
[[bin]]
name = "chgrp"
+3 -3
View File
@@ -15,9 +15,9 @@ edition = "2021"
path = "src/chmod.rs"
[dependencies]
clap = { version = "4.0", features = ["wrap_help", "cargo"] }
libc = "0.2.137"
uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["fs", "mode"] }
clap = { workspace=true }
libc = { workspace=true }
uucore = { workspace=true, features=["fs", "mode"] }
[[bin]]
name = "chmod"
+2 -2
View File
@@ -15,8 +15,8 @@ edition = "2021"
path = "src/chown.rs"
[dependencies]
clap = { version = "4.0", features = ["wrap_help", "cargo"] }
uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["entries", "fs", "perms"] }
clap = { workspace=true }
uucore = { workspace=true, features=["entries", "fs", "perms"] }
[[bin]]
name = "chown"
+2 -2
View File
@@ -15,8 +15,8 @@ edition = "2021"
path = "src/chroot.rs"
[dependencies]
clap = { version = "4.0", features = ["wrap_help", "cargo"] }
uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["entries", "fs"] }
clap = { workspace=true }
uucore = { workspace=true, features=["entries", "fs"] }
[[bin]]
name = "chroot"
+2 -2
View File
@@ -15,8 +15,8 @@ edition = "2021"
path = "src/cksum.rs"
[dependencies]
clap = { version = "4.0", features = ["wrap_help", "cargo"] }
uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
clap = { workspace=true }
uucore = { workspace=true }
[[bin]]
name = "cksum"
+2 -2
View File
@@ -15,8 +15,8 @@ edition = "2021"
path = "src/comm.rs"
[dependencies]
clap = { version = "4.0", features = ["wrap_help", "cargo"] }
uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
clap = { workspace=true }
uucore = { workspace=true }
[[bin]]
name = "comm"
+10 -10
View File
@@ -19,18 +19,18 @@ edition = "2021"
path = "src/cp.rs"
[dependencies]
clap = { version = "4.0", features = ["wrap_help", "cargo"] }
filetime = "0.2"
libc = "0.2.137"
quick-error = "2.0.1"
selinux = { version="0.3", optional=true }
uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["entries", "fs", "perms", "mode"] }
walkdir = "2.2"
indicatif = "0.17"
clap = { workspace=true }
filetime = { workspace=true }
libc = { workspace=true }
quick-error = { workspace=true }
selinux = { workspace=true, optional=true }
uucore = { workspace=true, features=["entries", "fs", "perms", "mode"] }
walkdir = { workspace=true }
indicatif = { workspace=true }
[target.'cfg(unix)'.dependencies]
xattr="0.2.3"
exacl= { version = "0.9.0", optional=true }
xattr = { workspace=true }
exacl = { workspace=true, optional=true }
[[bin]]
name = "cp"
+4 -4
View File
@@ -15,10 +15,10 @@ edition = "2021"
path = "src/csplit.rs"
[dependencies]
clap = { version = "4.0", features = ["wrap_help", "cargo"] }
thiserror = "1.0"
regex = "1.7.1"
uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["entries", "fs"] }
clap = { workspace=true }
thiserror = { workspace = true }
regex = { workspace=true }
uucore = { workspace=true, features=["entries", "fs"] }
[[bin]]
name = "csplit"
+5 -5
View File
@@ -15,11 +15,11 @@ edition = "2021"
path = "src/cut.rs"
[dependencies]
clap = { version = "4.0", features = ["wrap_help", "cargo"] }
uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
memchr = "2"
bstr = "1.0"
atty = "0.2"
clap = { workspace=true }
uucore = { workspace=true }
memchr = { workspace=true }
bstr = { workspace=true }
atty = { workspace=true }
[[bin]]
name = "cut"
+5 -5
View File
@@ -15,15 +15,15 @@ edition = "2021"
path = "src/date.rs"
[dependencies]
chrono = { version="^0.4.23", default-features=false, features=["std", "alloc", "clock"]}
clap = { version = "4.0", features = ["wrap_help", "cargo"] }
uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
chrono = { workspace=true }
clap = { workspace=true }
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"
+5 -5
View File
@@ -15,13 +15,13 @@ edition = "2021"
path = "src/dd.rs"
[dependencies]
clap = { version = "4.0", features = ["wrap_help", "cargo"] }
gcd = "2.2"
libc = "0.2"
uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
clap = { workspace=true }
gcd = { workspace=true }
libc = { workspace=true }
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"

Some files were not shown because too many files have changed in this diff Show More