From 9dd8d8ab0d84d9f91bb2e9f8338230ef9121cdcc Mon Sep 17 00:00:00 2001 From: Dorian Peron Date: Fri, 4 Apr 2025 18:43:37 +0200 Subject: [PATCH 1/3] uucore: make chrono, chrono-tz, iana-time-zone deps optional under the custom-tz-fmt feature --- src/uucore/Cargo.toml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/uucore/Cargo.toml b/src/uucore/Cargo.toml index 67e1bd3e5..719aa9781 100644 --- a/src/uucore/Cargo.toml +++ b/src/uucore/Cargo.toml @@ -21,8 +21,8 @@ all-features = true path = "src/lib/lib.rs" [dependencies] -chrono = { workspace = true } -chrono-tz = { workspace = true } +chrono = { workspace = true, optional = true } +chrono-tz = { workspace = true, optional = true } clap = { workspace = true } uucore_procs = { workspace = true } number_prefix = { workspace = true } @@ -30,8 +30,7 @@ dns-lookup = { workspace = true, optional = true } dunce = { version = "1.0.4", optional = true } wild = "2.2.1" glob = { workspace = true } -iana-time-zone = { workspace = true } -# * optional +iana-time-zone = { workspace = true, optional = true } itertools = { workspace = true, optional = true } thiserror = { workspace = true, optional = true } time = { workspace = true, optional = true, features = [ @@ -134,6 +133,6 @@ utf8 = [] utmpx = ["time", "time/macros", "libc", "dns-lookup"] version-cmp = [] wide = [] -custom-tz-fmt = [] +custom-tz-fmt = ["chrono", "chrono-tz", "iana-time-zone"] tty = [] uptime = ["libc", "windows-sys", "utmpx", "utmp-classic", "thiserror"] From a3f770fbe8e6c169ed32408c4e737fbf9932e68a Mon Sep 17 00:00:00 2001 From: Dorian Peron Date: Fri, 4 Apr 2025 18:48:48 +0200 Subject: [PATCH 2/3] uucore: make glob dependence optional under the parser feature --- src/uucore/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/uucore/Cargo.toml b/src/uucore/Cargo.toml index 719aa9781..73780346b 100644 --- a/src/uucore/Cargo.toml +++ b/src/uucore/Cargo.toml @@ -29,7 +29,7 @@ number_prefix = { workspace = true } dns-lookup = { workspace = true, optional = true } dunce = { version = "1.0.4", optional = true } wild = "2.2.1" -glob = { workspace = true } +glob = { workspace = true, optional = true } iana-time-zone = { workspace = true, optional = true } itertools = { workspace = true, optional = true } thiserror = { workspace = true, optional = true } @@ -113,7 +113,7 @@ proc-info = ["tty", "walkdir"] quoting-style = [] ranges = [] ringbuffer = [] -parser = ["extendedbigdecimal", "num-traits"] +parser = ["extendedbigdecimal", "glob", "num-traits"] signals = [] sum = [ "digest", From 273a0500d8d01a9efa9fcd037c29a5206b9ccece Mon Sep 17 00:00:00 2001 From: Dorian Peron Date: Fri, 4 Apr 2025 18:53:20 +0200 Subject: [PATCH 3/3] uucore: remove clap dev dependency as it is already mentionned in regular dependencies --- src/uucore/Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/uucore/Cargo.toml b/src/uucore/Cargo.toml index 73780346b..268c775ec 100644 --- a/src/uucore/Cargo.toml +++ b/src/uucore/Cargo.toml @@ -66,7 +66,6 @@ nix = { workspace = true, features = ["fs", "uio", "zerocopy", "signal"] } xattr = { workspace = true, optional = true } [dev-dependencies] -clap = { workspace = true } tempfile = { workspace = true } [target.'cfg(target_os = "windows")'.dependencies]