RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-30 12:37:49 +00:00
Code Issues Activity

deps ~ change from 'humantime_to_duration' to 'parse_datetime'

Browse source
This commit is contained in:
Roy Ivy III 2023-06-11 10:35:32 -05:00 • committed by Daniel Hofstetter
parent a5272e1344
commit 9aef5ac35b
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -1,7 +1,7 @@
# coreutils (uutils) # coreutils (uutils)
# * see the repository LICENSE, README, and CONTRIBUTING files for more information # * see the repository LICENSE, README, and CONTRIBUTING files for more information
# spell-checker:ignore (libs) libselinux gethostid procfs bigdecimal kqueue fundu mangen datetime uuhelp memmap # spell-checker:ignore (libs) bigdecimal datetime fundu gethostid kqueue libselinux mangen memmap procfs uuhelp
[package] [package]
name = "coreutils" name = "coreutils"

5
src/uu/touch/Cargo.toml
View file

@ -1,4 +1,4 @@
# spell-checker:ignore humantime # spell-checker:ignore datetime
[package] [package]
name = "uu_touch" name = "uu_touch"
version = "0.0.19" version = "0.0.19"
@ -18,8 +18,7 @@ path = "src/touch.rs"
[dependencies] [dependencies]
filetime = { workspace = true } filetime = { workspace = true }
clap = { workspace = true } clap = { workspace = true }
# TODO: use workspace dependency (0.3) when switching from time to chrono parse_datetime = { workspace = true }
humantime_to_duration = "0.2.1"
time = { workspace = true, features = [ time = { workspace = true, features = [
"parsing", "parsing",
"formatting", "formatting",

4
src/uu/touch/src/touch.rs
View file

@ -84,7 +84,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
) { ) {
(Some(reference), Some(date)) => { (Some(reference), Some(date)) => {
let (atime, mtime) = stat(Path::new(reference), !matches.get_flag(options::NO_DEREF))?; let (atime, mtime) = stat(Path::new(reference), !matches.get_flag(options::NO_DEREF))?;
if let Ok(offset) = humantime_to_duration::from_str(date) { if let Ok(offset) = parse_datetime::from_str(date) {
let mut seconds = offset.whole_seconds(); let mut seconds = offset.whole_seconds();
let mut nanos = offset.subsec_nanoseconds(); let mut nanos = offset.subsec_nanoseconds();
if nanos < 0 { if nanos < 0 {
@ -445,7 +445,7 @@ fn parse_date(s: &str) -> UResult<FileTime> {
} }
} }
if let Ok(duration) = humantime_to_duration::from_str(s) { if let Ok(duration) = parse_datetime::from_str(s) {
let now_local = time::OffsetDateTime::now_local().unwrap(); let now_local = time::OffsetDateTime::now_local().unwrap();
let diff = now_local.checked_add(duration).unwrap(); let diff = now_local.checked_add(duration).unwrap();
return Ok(local_dt_to_filetime(diff)); return Ok(local_dt_to_filetime(diff));