Skip to content

Commit 755b7eb

Browse files
authored
Merge pull request #10118 from aaron-ang/migrate-jiff
refactor: use `jiff` for safer time features
2 parents 478daa1 + 6a84481 commit 755b7eb

File tree

12 files changed

+132
-172
lines changed

12 files changed

+132
-172
lines changed

Cargo.lock

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -311,11 +311,6 @@ binary-heap-plus = "0.5.0"
311311
bstr = "1.9.1"
312312
bytecount = "0.6.8"
313313
byteorder = "1.5.0"
314-
chrono = { version = "0.4.41", default-features = false, features = [
315-
"std",
316-
"alloc",
317-
"clock",
318-
] }
319314
clap = { version = "4.5", features = ["wrap_help", "cargo", "color"] }
320315
clap_complete = "4.4"
321316
clap_mangen = "0.2"
@@ -341,11 +336,7 @@ icu_locale = "2.0.0"
341336
icu_provider = "2.0.0"
342337
indicatif = "0.18.0"
343338
itertools = "0.14.0"
344-
jiff = { version = "0.2.10", default-features = false, features = [
345-
"std",
346-
"alloc",
347-
"tz-system",
348-
] }
339+
jiff = "0.2.18"
349340
libc = "0.2.172"
350341
linux-raw-sys = "0.12"
351342
lscolors = { version = "0.21.0", default-features = false, features = [
@@ -541,7 +532,6 @@ yes = { optional = true, version = "0.5.0", package = "uu_yes", path = "src/uu/y
541532
#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()`)
542533

543534
[dev-dependencies]
544-
chrono.workspace = true
545535
ctor.workspace = true
546536
filetime.workspace = true
547537
glob.workspace = true

fuzz/Cargo.lock

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/uu/touch/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ path = "src/touch.rs"
2121
[dependencies]
2222
filetime = { workspace = true }
2323
clap = { workspace = true }
24-
chrono = { workspace = true }
25-
jiff = "0.2.15"
24+
jiff = { workspace = true }
2625
parse_datetime = { workspace = true }
2726
thiserror = { workspace = true }
2827
uucore = { workspace = true, features = ["libc", "parser"] }

src/uu/touch/src/error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub enum TouchError {
1616
#[error("{}", translate!("touch-error-unable-to-parse-date", "date" => .0.clone()))]
1717
InvalidDateFormat(String),
1818

19-
/// The source time couldn't be converted to a [`chrono::DateTime`]
19+
/// The source time couldn't be converted to a [`jiff::Zoned`]
2020
#[error("{}", translate!("touch-error-invalid-filetime", "time" => .0))]
2121
InvalidFiletime(FileTime),
2222

0 commit comments

Comments
 (0)