From cca2b19b4e6c892a963e94d6c7b28211fe17d9d9 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 12 Sep 2021 22:23:12 +0200 Subject: [PATCH 1/5] tail: only set the winapi dep on Windows --- src/uu/tail/Cargo.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/uu/tail/Cargo.toml b/src/uu/tail/Cargo.toml index 6928330de..0fe84670e 100644 --- a/src/uu/tail/Cargo.toml +++ b/src/uu/tail/Cargo.toml @@ -19,6 +19,8 @@ clap = { version = "2.33", features = ["wrap_help"] } libc = "0.2.42" uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["ringbuffer"] } uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } + +[target.'cfg(windows)'.dependencies] winapi = { version="0.3", features=["fileapi", "handleapi", "processthreadsapi", "synchapi", "winbase"] } [target.'cfg(target_os = "redox")'.dependencies] From 2d67252dc4c2d282d8f311681fdc0be4fee13260 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 12 Sep 2021 19:20:30 +0200 Subject: [PATCH 2/5] rm: only set the winapi dep on Windows --- src/uu/rm/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/uu/rm/Cargo.toml b/src/uu/rm/Cargo.toml index 2c30446e8..c356f03e4 100644 --- a/src/uu/rm/Cargo.toml +++ b/src/uu/rm/Cargo.toml @@ -18,11 +18,11 @@ path = "src/rm.rs" clap = { version = "2.33", features = ["wrap_help"] } walkdir = "2.2" remove_dir_all = "0.5.1" -winapi = { version="0.3", features=[] } - uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs"] } uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } +[target.'cfg(windows)'.dependencies] +winapi = { version="0.3", features=[] } [[bin]] name = "rm" From 826c948234ab903e0df731761703b8fbcadeab0a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 12 Sep 2021 19:21:40 +0200 Subject: [PATCH 3/5] ls: remove the unused dep on locale --- Cargo.lock | 10 ---------- src/uu/ls/Cargo.toml | 1 - 2 files changed, 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8759a133d..56464ef98 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1004,15 +1004,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "locale" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fdbe492a9c0238da900a1165c42fc5067161ce292678a6fe80921f30fe307fd" -dependencies = [ - "libc", -] - [[package]] name = "lock_api" version = "0.4.4" @@ -2615,7 +2606,6 @@ dependencies = [ "clap", "globset", "lazy_static", - "locale", "lscolors", "number_prefix", "once_cell", diff --git a/src/uu/ls/Cargo.toml b/src/uu/ls/Cargo.toml index dbe6bacaa..6c4858a1c 100644 --- a/src/uu/ls/Cargo.toml +++ b/src/uu/ls/Cargo.toml @@ -15,7 +15,6 @@ edition = "2018" path = "src/ls.rs" [dependencies] -locale = "0.2.2" chrono = "0.4.19" clap = { version = "2.33", features = ["wrap_help"] } unicode-width = "0.1.8" From a6c235bcd10864db63b16556c45c74aa172ad4b0 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 12 Sep 2021 19:22:22 +0200 Subject: [PATCH 4/5] csplit: remove the unused dep on glob --- Cargo.lock | 1 - src/uu/csplit/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 56464ef98..b4c8aa9b1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2292,7 +2292,6 @@ name = "uu_csplit" version = "0.0.7" dependencies = [ "clap", - "glob", "regex", "thiserror", "uucore", diff --git a/src/uu/csplit/Cargo.toml b/src/uu/csplit/Cargo.toml index 82389a93b..3bc44b90c 100644 --- a/src/uu/csplit/Cargo.toml +++ b/src/uu/csplit/Cargo.toml @@ -18,7 +18,6 @@ path = "src/csplit.rs" clap = { version = "2.33", features = ["wrap_help"] } thiserror = "1.0" regex = "1.0.0" -glob = "0.3" uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["entries", "fs"] } uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } From a74e4bf09599d1fd8dfd16190b6317055052c52e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 12 Sep 2021 19:59:54 +0200 Subject: [PATCH 5/5] shred: remove the unused dep on filetime --- Cargo.lock | 1 - src/uu/shred/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b4c8aa9b1..eb2c709ff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2913,7 +2913,6 @@ name = "uu_shred" version = "0.0.7" dependencies = [ "clap", - "filetime", "libc", "rand 0.7.3", "uucore", diff --git a/src/uu/shred/Cargo.toml b/src/uu/shred/Cargo.toml index d6bb61c76..5f7bebb4e 100644 --- a/src/uu/shred/Cargo.toml +++ b/src/uu/shred/Cargo.toml @@ -16,7 +16,6 @@ path = "src/shred.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -filetime = "0.2.1" libc = "0.2.42" rand = "0.7" uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }