1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-27 11:07:44 +00:00

update ~ (maint!) use fixed/patched uucore (v0.0.2); await upgrade upstream

- fixes musl (no-utmpx) build bug
- fixes failing windows real{link,path} tests
This commit is contained in:
Roy Ivy III 2020-01-01 20:40:58 +00:00
parent 7eeb58ae3a
commit 6a18d7f7be
95 changed files with 98 additions and 95 deletions

View file

@ -187,7 +187,7 @@ feat_common_core = [
[workspace]
[dependencies]
uucore = "0.0.1"
uucore = "0.0.2"
arch = { optional=true, path="src/arch" }
base32 = { optional=true, path="src/base32" }
base64 = { optional=true, path="src/base64" }
@ -306,3 +306,6 @@ path = "src/uutils/uutils.rs"
[[test]]
name = "tests"
[patch.crates-io]
uucore = { git = "https://github.com/rivy/rust.uucore", tag = "0.0.2" }

View file

@ -11,7 +11,7 @@ path = "arch.rs"
[dependencies]
platform-info = "0.0.1"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "arch"

View file

@ -10,7 +10,7 @@ name = "uu_base32"
path = "base32.rs"
[dependencies]
uucore = { version = "0.0.1", features = ["encoding"] }
uucore = { version = "0.0.2", features = ["encoding"] }
## optional
clippy = { version = "0.0.212", optional = true }

View file

@ -10,7 +10,7 @@ name = "uu_base64"
path = "base64.rs"
[dependencies]
uucore = { version = "0.0.1", features = ["encoding"] }
uucore = { version = "0.0.2", features = ["encoding"] }
[[bin]]
name = "base64"

View file

@ -10,7 +10,7 @@ name = "uu_basename"
path = "basename.rs"
[dependencies]
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "basename"

View file

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

View file

@ -10,7 +10,7 @@ name = "uu_chgrp"
path = "chgrp.rs"
[dependencies]
uucore = { version = "0.0.1", features = ["entries", "fs"] }
uucore = { version = "0.0.2", features = ["entries", "fs"] }
walkdir = "2.2.8"
[[bin]]

View file

@ -11,7 +11,7 @@ path = "chmod.rs"
[dependencies]
libc = "0.2.42"
uucore = { version = "0.0.1", features = ["mode"] }
uucore = { version = "0.0.2", features = ["mode"] }
walker = "1.0.0"
[[bin]]

View file

@ -11,7 +11,7 @@ path = "chown.rs"
[dependencies]
glob = "0.3.0"
uucore = { version = "0.0.1", features = ["entries", "fs"] }
uucore = { version = "0.0.2", features = ["entries", "fs"] }
walkdir = "2.2"
[dependencies.clippy]

View file

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

View file

@ -10,7 +10,7 @@ path = "cksum.rs"
[dependencies]
libc = "0.2.42"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "cksum"

View file

@ -12,7 +12,7 @@ path = "comm.rs"
[dependencies]
getopts = "0.2.18"
libc = "0.2.42"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "comm"

View file

@ -18,7 +18,7 @@ filetime = "0.2"
getopts = "0.2.18"
libc = "0.2.42"
quick-error = "1.2.3"
uucore = { version = "0.0.1", features = ["fs"] }
uucore = { version = "0.0.2", features = ["fs"] }
walkdir = "2.2.8"
[target.'cfg(target_os = "linux")'.dependencies]

View file

@ -10,7 +10,7 @@ name = "uu_cut"
path = "cut.rs"
[dependencies]
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "cut"

View file

@ -12,7 +12,7 @@ path = "date.rs"
[dependencies]
chrono = "0.4.4"
clap = "2.32.0"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "date"

View file

@ -11,7 +11,7 @@ path = "dircolors.rs"
[dependencies]
glob = "0.3.0"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "dircolors"

View file

@ -11,7 +11,7 @@ path = "dirname.rs"
[dependencies]
libc = "0.2.42"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "dirname"

View file

@ -11,7 +11,7 @@ path = "du.rs"
[dependencies]
time = "0.1.40"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "du"

View file

@ -10,7 +10,7 @@ name = "uu_echo"
path = "echo.rs"
[dependencies]
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "echo"

2
src/env/Cargo.toml vendored
View file

@ -15,7 +15,7 @@ path = "env.rs"
clap = "2.33"
libc = "0.2.42"
rust-ini = "0.13.0"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "env"

View file

@ -12,7 +12,7 @@ path = "expand.rs"
[dependencies]
getopts = "0.2.18"
unicode-width = "0.1.5"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "expand"

View file

@ -12,7 +12,7 @@ path = "expr.rs"
[dependencies]
libc = "0.2.42"
onig = "~4.3.2"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "expr"

View file

@ -10,7 +10,7 @@ path = "factor.rs"
[dependencies]
rand = "0.5"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "factor"

View file

@ -10,7 +10,7 @@ name = "uu_false"
path = "false.rs"
[dependencies]
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "false"

View file

@ -12,7 +12,7 @@ path = "fmt.rs"
[dependencies]
libc = "0.2.42"
unicode-width = "0.1.5"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "fmt"

View file

@ -10,7 +10,7 @@ name = "uu_fold"
path = "fold.rs"
[dependencies]
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "fold"

View file

@ -10,7 +10,7 @@ name = "uu_groups"
path = "groups.rs"
[dependencies]
uucore = { version = "0.0.1", features = ["entries"] }
uucore = { version = "0.0.2", features = ["entries"] }
[[bin]]
name = "groups"

View file

@ -20,7 +20,7 @@ regex-syntax = "0.6.7"
sha1 = "0.6.0"
sha2 = "0.6.0"
sha3 = "0.6.0"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "hashsum"

View file

@ -11,7 +11,7 @@ path = "head.rs"
[dependencies]
libc = "0.2.42"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "head"

View file

@ -11,7 +11,7 @@ path = "hostid.rs"
[dependencies]
libc = "0.2.42"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "hostid"

View file

@ -12,7 +12,7 @@ path = "hostname.rs"
[dependencies]
getopts = "0.2"
libc = "0.2.42"
uucore = "0.0.1"
uucore = "0.0.2"
winapi = { version = "0.3", features = ["sysinfoapi", "winsock2"] }
[[bin]]

View file

@ -10,7 +10,7 @@ name = "uu_id"
path = "id.rs"
[dependencies]
uucore = { version = "0.0.1", features = ["entries", "process"] }
uucore = { version = "0.0.2", features = ["entries", "process"] }
[[bin]]
name = "id"

View file

@ -12,7 +12,7 @@ path = "install.rs"
[dependencies]
getopts = "0.2.18"
libc = ">= 0.2"
uucore = "0.0.1"
uucore = "0.0.2"
[dev-dependencies]
time = "0.1.40"

View file

@ -11,7 +11,7 @@ path = "join.rs"
[dependencies]
clap = "2.32.0"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "join"

View file

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

View file

@ -11,7 +11,7 @@ path = "link.rs"
[dependencies]
libc = "0.2.42"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "link"

View file

@ -11,7 +11,7 @@ path = "ln.rs"
[dependencies]
libc = "0.2.42"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "ln"

View file

@ -11,7 +11,7 @@ path = "logname.rs"
[dependencies]
libc = "0.2.42"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "logname"

View file

@ -18,7 +18,7 @@ term_grid = "0.1.5"
termsize = "0.1.6"
time = "0.1.40"
unicode-width = "0.1.5"
uucore = { version = "0.0.1", features = ["entries", "fs"] }
uucore = { version = "0.0.2", features = ["entries", "fs"] }
[[bin]]
name = "ls"

View file

@ -12,7 +12,7 @@ path = "mkdir.rs"
[dependencies]
getopts = "0.2.18"
libc = "0.2.42"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "mkdir"

View file

@ -12,7 +12,7 @@ path = "mkfifo.rs"
[dependencies]
getopts = "0.2.18"
libc = "0.2.42"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "mkfifo"

View file

@ -12,7 +12,7 @@ path = "mknod.rs"
[dependencies]
getopts = "0.2.18"
libc = "^0.2.42"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "mknod"

View file

@ -13,7 +13,7 @@ path = "mktemp.rs"
getopts = "0.2.18"
rand = "0.5"
tempfile = "2.1.5"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "mktemp"

View file

@ -11,7 +11,7 @@ path = "more.rs"
[dependencies]
getopts = "0.2.18"
uucore = "0.0.1"
uucore = "0.0.2"
[target.'cfg(target_os = "redox")'.dependencies]
redox_termios = "0.1"

View file

@ -11,7 +11,7 @@ path = "mv.rs"
[dependencies]
getopts = "0.2.18"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "mv"

View file

@ -12,7 +12,7 @@ path = "nice.rs"
[dependencies]
getopts = "0.2.18"
libc = "0.2.42"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "nice"

View file

@ -16,7 +16,7 @@ libc = "0.2.42"
memchr = "2.2.0"
regex = "1.0.1"
regex-syntax = "0.6.7"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "nl"

View file

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

View file

@ -13,7 +13,7 @@ path = "nproc.rs"
getopts = "0.2.18"
libc = "0.2.42"
num_cpus = "1.10"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "nproc"

View file

@ -11,7 +11,7 @@ path = "numfmt.rs"
[dependencies]
getopts = "0.2.18"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "numfmt"

View file

@ -14,7 +14,7 @@ byteorder = "1.3.2"
getopts = "0.2.18"
half = "1.1.1"
libc = "0.2.42"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "od"

View file

@ -11,7 +11,7 @@ path = "paste.rs"
[dependencies]
getopts = "0.2.18"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "paste"

View file

@ -12,7 +12,7 @@ path = "pathchk.rs"
[dependencies]
getopts = "0.2.18"
libc = "0.2.42"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "pathchk"

View file

@ -10,7 +10,7 @@ name = "uu_pinky"
path = "pinky.rs"
[dependencies]
uucore = { version = "0.0.1", features = ["utmpx", "entries"] }
uucore = { version = "0.0.2", features = ["utmpx", "entries"] }
[[bin]]
name = "pinky"

View file

@ -11,7 +11,7 @@ path = "printenv.rs"
[dependencies]
getopts = "0.2.18"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "printenv"

View file

@ -11,7 +11,7 @@ path = "printf.rs"
[dependencies]
itertools = "0.8.0"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "printf"

View file

@ -16,7 +16,7 @@ libc = "0.2.42"
memchr = "2.2.0"
regex = "1.0.1"
regex-syntax = "0.6.7"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "ptx"

View file

@ -11,7 +11,7 @@ path = "pwd.rs"
[dependencies]
getopts = "0.2.18"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "pwd"

View file

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

View file

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

View file

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

View file

@ -13,7 +13,7 @@ path = "rm.rs"
getopts = "0.2.18"
walkdir = "2.2.8"
remove_dir_all = "0.5.1"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "rm"

View file

@ -11,7 +11,7 @@ path = "rmdir.rs"
[dependencies]
getopts = "0.2.18"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "rmdir"

View file

@ -11,7 +11,7 @@ path = "seq.rs"
[dependencies]
getopts = "0.2.18"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "seq"

View file

@ -15,7 +15,7 @@ getopts = "0.2.18"
libc = "0.2.42"
rand = "0.5"
time = "0.1.40"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "shred"

View file

@ -12,7 +12,7 @@ path = "shuf.rs"
[dependencies]
getopts = "0.2.18"
rand = "0.5"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "shuf"

View file

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

View file

@ -13,7 +13,7 @@ path = "sort.rs"
getopts = "0.2.18"
itertools = "0.8.0"
semver = "0.9.0"
uucore = { version = "0.0.1", features = ["fs"] }
uucore = { version = "0.0.2", features = ["fs"] }
[[bin]]
name = "sort"

View file

@ -11,7 +11,7 @@ path = "split.rs"
[dependencies]
getopts = "0.2.18"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "split"

View file

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

View file

@ -12,7 +12,7 @@ path = "stdbuf.rs"
[dependencies]
getopts = "0.2.18"
tempdir = "0.3.7"
uucore = "0.0.1"
uucore = "0.0.2"
[build-dependencies]
libstdbuf = { path="libstdbuf" }

View file

@ -13,7 +13,7 @@ crate-type = ["cdylib", "rlib"]
[dependencies]
cpp = "0.4"
libc = "0.2"
uucore = "0.0.1"
uucore = "0.0.2"
[build-dependencies]
cpp_build = "0.4"

View file

@ -11,7 +11,7 @@ path = "sum.rs"
[dependencies]
getopts = "0.2.18"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "sum"

View file

@ -13,7 +13,7 @@ path = "sync.rs"
getopts = "0.2.18"
kernel32-sys = "0.2.2"
libc = "0.2.42"
uucore = { version = "0.0.1", features = ["wide"] }
uucore = { version = "0.0.2", features = ["wide"] }
winapi = { version = "0.3", features = ["handleapi", "winerror"] }
[[bin]]

View file

@ -11,7 +11,7 @@ path = "tac.rs"
[dependencies]
getopts = "0.2.18"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "tac"

View file

@ -14,7 +14,7 @@ getopts = "0.2.18"
kernel32-sys = "0.2.2"
libc = "0.2.42"
winapi = "0.3"
uucore = "0.0.1"
uucore = "0.0.2"
[target.'cfg(target_os = "redox")'.dependencies]
redox_syscall = "0.1"

View file

@ -12,7 +12,7 @@ path = "tee.rs"
[dependencies]
getopts = "0.2.18"
libc = "0.2.42"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "tee"

View file

@ -11,7 +11,7 @@ path = "test.rs"
[dependencies]
libc = "0.2.42"
uucore = "0.0.1"
uucore = "0.0.2"
[target.'cfg(target_os = "redox")'.dependencies]
redox_syscall = "0.1"

View file

@ -13,7 +13,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"] }
uucore = { version = "0.0.2", features = ["parse_time", "process"] }
[[bin]]
name = "timeout"

View file

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

View file

@ -13,7 +13,7 @@ path = "tr.rs"
bit-set = "0.5.0"
fnv = "1.0.5"
getopts = "0.2.18"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "tr"

View file

@ -10,7 +10,7 @@ name = "uu_true"
path = "true.rs"
[dependencies]
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "true"

View file

@ -11,7 +11,7 @@ path = "truncate.rs"
[dependencies]
getopts = "0.2.18"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "truncate"

View file

@ -11,7 +11,7 @@ path = "tsort.rs"
[dependencies]
getopts = "0.2.18"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "tsort"

View file

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

View file

@ -12,7 +12,7 @@ path = "uname.rs"
[dependencies]
clap = "2.32.0"
platform-info = "0.0.1"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "uname"

View file

@ -12,7 +12,7 @@ path = "unexpand.rs"
[dependencies]
getopts = "0.2.18"
unicode-width = "0.1.5"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "unexpand"

View file

@ -11,7 +11,7 @@ path = "uniq.rs"
[dependencies]
getopts = "0.2.18"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "uniq"

View file

@ -12,7 +12,7 @@ path = "unlink.rs"
[dependencies]
getopts = "0.2.18"
libc = "0.2.42"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "unlink"

View file

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

View file

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

View file

@ -11,7 +11,7 @@ path = "wc.rs"
[dependencies]
getopts = "0.2.18"
uucore = "0.0.1"
uucore = "0.0.2"
[[bin]]
name = "wc"

View file

@ -10,7 +10,7 @@ name = "uu_who"
path = "who.rs"
[dependencies]
uucore = { version = "0.0.1", features = ["utmpx"] }
uucore = { version = "0.0.2", features = ["utmpx"] }
## optional
clippy = { version = "0.0.212", optional = true }

View file

@ -13,7 +13,7 @@ path = "whoami.rs"
[dependencies]
advapi32-sys = "0.2.0"
clap = "2.32"
uucore = { version = "0.0.1", features = ["entries", "wide"] }
uucore = { version = "0.0.2", features = ["entries", "wide"] }
winapi = { version = "0.3", features = ["lmcons"] }
[[bin]]

View file

@ -12,7 +12,7 @@ path = "yes.rs"
[dependencies]
clap = "2.32"
uucore = { version = "0.0.1", features = ["zero-copy"] }
uucore = { version = "0.0.2", features = ["zero-copy"] }
[features]
latency = []