From 510c73ae4f4afc19a0cd3fcbd15aa0538a3fa66f Mon Sep 17 00:00:00 2001 From: Krishna Nagam <40730166+KrishnaNagam@users.noreply.github.com> Date: Tue, 15 Aug 2023 16:53:19 +0000 Subject: [PATCH 01/10] fix: replace %Z specifier with locale TZ abbr --- src/uu/date/Cargo.toml | 2 ++ src/uu/date/src/date.rs | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/uu/date/Cargo.toml b/src/uu/date/Cargo.toml index de5b5f2a2cc..ca4101f89c4 100644 --- a/src/uu/date/Cargo.toml +++ b/src/uu/date/Cargo.toml @@ -20,6 +20,8 @@ chrono = { workspace = true } clap = { workspace = true } uucore = { workspace = true } parse_datetime = { workspace = true } +chrono-tz = "0.8.3" +iana-time-zone = "0.1.57" [target.'cfg(unix)'.dependencies] libc = { workspace = true } diff --git a/src/uu/date/src/date.rs b/src/uu/date/src/date.rs index adfb74128f0..5ddcdd1c8de 100644 --- a/src/uu/date/src/date.rs +++ b/src/uu/date/src/date.rs @@ -9,7 +9,9 @@ // spell-checker:ignore (chrono) Datelike Timelike ; (format) DATEFILE MMDDhhmm ; (vars) datetime datetimes use chrono::format::{Item, StrftimeItems}; -use chrono::{DateTime, Duration, FixedOffset, Local, Offset, Utc}; +use chrono::{DateTime, Duration, FixedOffset, Local, Offset, Utc, TimeZone}; +use chrono_tz::{OffsetName, Tz}; +use iana_time_zone::get_timezone; #[cfg(windows)] use chrono::{Datelike, Timelike}; use clap::{crate_version, Arg, ArgAction, Command}; @@ -255,8 +257,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { for date in dates { match date { Ok(date) => { + let tz_str = get_timezone().unwrap_or_default(); + let tz: Tz = tz_str.parse().unwrap(); + let offset = tz.offset_from_utc_date(&Utc::now().date_naive()); + let tz_abbreviation = offset.abbreviation(); // GNU `date` uses `%N` for nano seconds, however crate::chrono uses `%f` - let format_string = &format_string.replace("%N", "%f"); + let format_string = &format_string.replace("%N", "%f").replace("%Z", tz_abbreviation); // Refuse to pass this string to chrono as it is crashing in this crate if format_string.contains("%#z") { return Err(USimpleError::new( @@ -386,7 +392,7 @@ fn make_format_string(settings: &Settings) -> &str { Rfc3339Format::Ns => "%F %T.%f%:z", }, Format::Custom(ref fmt) => fmt, - Format::Default => "%c", + Format::Default => "%a %b %-d %X %Z %Y", } } From 1fad29c7fc021b237f69279370054884db3a391c Mon Sep 17 00:00:00 2001 From: Krishna Nagam <40730166+KrishnaNagam@users.noreply.github.com> Date: Tue, 15 Aug 2023 18:15:39 +0000 Subject: [PATCH 02/10] formatted code with cargo fmt --- src/uu/date/src/date.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/uu/date/src/date.rs b/src/uu/date/src/date.rs index 5ddcdd1c8de..a75c5d2280a 100644 --- a/src/uu/date/src/date.rs +++ b/src/uu/date/src/date.rs @@ -9,12 +9,12 @@ // spell-checker:ignore (chrono) Datelike Timelike ; (format) DATEFILE MMDDhhmm ; (vars) datetime datetimes use chrono::format::{Item, StrftimeItems}; -use chrono::{DateTime, Duration, FixedOffset, Local, Offset, Utc, TimeZone}; -use chrono_tz::{OffsetName, Tz}; -use iana_time_zone::get_timezone; +use chrono::{DateTime, Duration, FixedOffset, Local, Offset, TimeZone, Utc}; #[cfg(windows)] use chrono::{Datelike, Timelike}; +use chrono_tz::{OffsetName, Tz}; use clap::{crate_version, Arg, ArgAction, Command}; +use iana_time_zone::get_timezone; #[cfg(all(unix, not(target_os = "macos"), not(target_os = "redox")))] use libc::{clock_settime, timespec, CLOCK_REALTIME}; use std::fs::File; @@ -262,7 +262,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { let offset = tz.offset_from_utc_date(&Utc::now().date_naive()); let tz_abbreviation = offset.abbreviation(); // GNU `date` uses `%N` for nano seconds, however crate::chrono uses `%f` - let format_string = &format_string.replace("%N", "%f").replace("%Z", tz_abbreviation); + let format_string = &format_string + .replace("%N", "%f") + .replace("%Z", tz_abbreviation); // Refuse to pass this string to chrono as it is crashing in this crate if format_string.contains("%#z") { return Err(USimpleError::new( From f5a4e54c60c30ad22722ac3e47dc886cd6adf535 Mon Sep 17 00:00:00 2001 From: Krishna Nagam <40730166+KrishnaNagam@users.noreply.github.com> Date: Wed, 16 Aug 2023 16:19:37 +0000 Subject: [PATCH 03/10] date: added cargo.lock changes --- Cargo.lock | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bd15fc341ee..961da11f1c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -259,6 +259,28 @@ dependencies = [ "winapi", ] +[[package]] +name = "chrono-tz" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1369bc6b9e9a7dfdae2055f6ec151fe9c554a9d23d357c0237cee2e25eaabb7" +dependencies = [ + "chrono", + "chrono-tz-build", + "phf", +] + +[[package]] +name = "chrono-tz-build" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2f5ebdc942f57ed96d560a6d1a459bae5851102a25d5bf89dc04ae453e31ecf" +dependencies = [ + "parse-zoneinfo", + "phf", + "phf_codegen", +] + [[package]] name = "clang-sys" version = "1.4.0" @@ -1083,16 +1105,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows", ] [[package]] @@ -1531,6 +1553,15 @@ dependencies = [ "windows-targets 0.48.0", ] +[[package]] +name = "parse-zoneinfo" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41" +dependencies = [ + "regex", +] + [[package]] name = "parse_datetime" version = "0.4.0" @@ -2430,7 +2461,9 @@ name = "uu_date" version = "0.0.20" dependencies = [ "chrono", + "chrono-tz", "clap", + "iana-time-zone", "libc", "parse_datetime", "uucore", @@ -3460,6 +3493,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.0", +] + [[package]] name = "windows-sys" version = "0.45.0" From ab2b30ca347a9bf8b507f90339b430fdc269f060 Mon Sep 17 00:00:00 2001 From: Krishna Nagam <40730166+KrishnaNagam@users.noreply.github.com> Date: Sat, 19 Aug 2023 06:32:50 +0000 Subject: [PATCH 04/10] Moved iana-time-zone, chrono-tz to root cargo.toml --- Cargo.toml | 2 ++ src/uu/date/Cargo.toml | 4 ++-- src/uu/date/src/date.rs | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c3413d86bdb..a670e227661 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -267,6 +267,8 @@ chrono = { version = "^0.4.26", default-features = false, features = [ "alloc", "clock", ] } +chrono-tz = "0.8.3" +iana-time-zone = "0.1.57" clap = { version = "4.3", features = ["wrap_help", "cargo"] } clap_complete = "4.3" clap_mangen = "0.2" diff --git a/src/uu/date/Cargo.toml b/src/uu/date/Cargo.toml index ca4101f89c4..6017b76f0e9 100644 --- a/src/uu/date/Cargo.toml +++ b/src/uu/date/Cargo.toml @@ -20,8 +20,8 @@ chrono = { workspace = true } clap = { workspace = true } uucore = { workspace = true } parse_datetime = { workspace = true } -chrono-tz = "0.8.3" -iana-time-zone = "0.1.57" +chrono-tz = { workspace = true } +iana-time-zone = { workspace = true } [target.'cfg(unix)'.dependencies] libc = { workspace = true } diff --git a/src/uu/date/src/date.rs b/src/uu/date/src/date.rs index a75c5d2280a..84607b70e2e 100644 --- a/src/uu/date/src/date.rs +++ b/src/uu/date/src/date.rs @@ -257,7 +257,8 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { for date in dates { match date { Ok(date) => { - let tz_str = get_timezone().unwrap_or_default(); + // TODO - Revisit when chrono 0.5 is released. https://github.com/chronotope/chrono/issues/970 + let tz_str = get_timezone().unwrap_or("Etc/UTC".to_string()); let tz: Tz = tz_str.parse().unwrap(); let offset = tz.offset_from_utc_date(&Utc::now().date_naive()); let tz_abbreviation = offset.abbreviation(); From 140e10812111ccd7ca209888318fd358cac3567f Mon Sep 17 00:00:00 2001 From: Krishna Nagam <40730166+KrishnaNagam@users.noreply.github.com> Date: Sat, 20 Apr 2024 09:52:16 +0000 Subject: [PATCH 05/10] fix chrono imports --- Cargo.lock | 178 +++++++++++++++++++--------------------- src/uu/date/src/date.rs | 2 +- 2 files changed, 84 insertions(+), 96 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ce29db41dbc..4d06e85e9d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -149,9 +149,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "blake2b_simd" @@ -256,9 +256,9 @@ dependencies = [ [[package]] name = "chrono-tz" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1369bc6b9e9a7dfdae2055f6ec151fe9c554a9d23d357c0237cee2e25eaabb7" +checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e" dependencies = [ "chrono", "chrono-tz-build", @@ -267,9 +267,9 @@ dependencies = [ [[package]] name = "chrono-tz-build" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2f5ebdc942f57ed96d560a6d1a459bae5851102a25d5bf89dc04ae453e31ecf" +checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" dependencies = [ "parse-zoneinfo", "phf", @@ -403,7 +403,7 @@ dependencies = [ "glob", "hex-literal", "libc", - "nix", + "nix 0.28.0", "once_cell", "phf", "phf_codegen", @@ -559,7 +559,7 @@ dependencies = [ "lazy_static", "proc-macro2", "regex", - "syn 2.0.32", + "syn 2.0.23", "unicode-xid", ] @@ -571,7 +571,7 @@ checksum = "3e1a2532e4ed4ea13031c13bc7bc0dbca4aae32df48e9d77f0d1e743179f2ea1" dependencies = [ "lazy_static", "proc-macro2", - "syn 2.0.32", + "syn 2.0.23", ] [[package]] @@ -586,7 +586,7 @@ dependencies = [ "lazy_static", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.23", ] [[package]] @@ -654,7 +654,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "crossterm_winapi", "libc", "mio", @@ -691,12 +691,12 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.4" +version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" +checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf" dependencies = [ - "nix", - "windows-sys 0.52.0", + "nix 0.27.1", + "windows-sys 0.48.0", ] [[package]] @@ -806,7 +806,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22be12de19decddab85d09f251ec8363f060ccb22ec9c81bc157c0c8433946d8" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "log", "scopeguard", "uuid", @@ -814,9 +814,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "file_diff" @@ -948,7 +948,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.23", ] [[package]] @@ -1022,9 +1022,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "half" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "cfg-if", "crunchy", @@ -1067,16 +1067,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows-core", ] [[package]] @@ -1242,9 +1242,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "lscolors" @@ -1297,9 +1297,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.11" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "log", @@ -1307,13 +1307,24 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "libc", +] + [[package]] name = "nix" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", "cfg_aliases", "libc", @@ -1599,11 +1610,11 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "hex", "lazy_static", "procfs-core", - "rustix 0.38.31", + "rustix 0.38.32", ] [[package]] @@ -1612,7 +1623,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "hex", ] @@ -1712,11 +1723,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c178f952cc7eac391f3124bd9851d1ac0bdbc4c9de2d892ccd5f0d8b160e96" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", ] [[package]] @@ -1800,7 +1811,7 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.32", + "syn 2.0.23", "unicode-ident", ] @@ -1846,11 +1857,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys 0.4.12", @@ -1912,23 +1923,9 @@ checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.193" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.32", -] +checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" [[package]] name = "sha1" @@ -1964,9 +1961,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.3.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "signal-hook" @@ -1991,9 +1988,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" dependencies = [ "libc", ] @@ -2024,9 +2021,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3b187f0231d56fe41bfb12034819dd2bf336422a5866de41bc3fec4b2e3883e8" [[package]] name = "smawk" @@ -2063,9 +2060,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.32" +version = "2.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" dependencies = [ "proc-macro2", "quote", @@ -2080,7 +2077,7 @@ checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "rustix 0.38.31", + "rustix 0.38.32", "windows-sys 0.52.0", ] @@ -2100,7 +2097,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.31", + "rustix 0.38.32", "windows-sys 0.48.0", ] @@ -2275,7 +2272,7 @@ name = "uu_cat" version = "0.0.26" dependencies = [ "clap", - "nix", + "nix 0.28.0", "thiserror", "uucore", ] @@ -2399,7 +2396,7 @@ dependencies = [ "clap", "gcd", "libc", - "nix", + "nix 0.28.0", "signal-hook", "uucore", ] @@ -2463,7 +2460,7 @@ name = "uu_env" version = "0.0.26" dependencies = [ "clap", - "nix", + "nix 0.28.0", "rust-ini", "uucore", ] @@ -2607,7 +2604,7 @@ name = "uu_kill" version = "0.0.26" dependencies = [ "clap", - "nix", + "nix 0.28.0", "uucore", ] @@ -2696,7 +2693,7 @@ version = "0.0.26" dependencies = [ "clap", "crossterm", - "nix", + "nix 0.28.0", "unicode-segmentation", "unicode-width", "uucore", @@ -2718,7 +2715,7 @@ version = "0.0.26" dependencies = [ "clap", "libc", - "nix", + "nix 0.28.0", "uucore", ] @@ -2986,7 +2983,7 @@ name = "uu_stty" version = "0.0.26" dependencies = [ "clap", - "nix", + "nix 0.28.0", "uucore", ] @@ -3004,7 +3001,7 @@ version = "0.0.26" dependencies = [ "clap", "libc", - "nix", + "nix 0.28.0", "uucore", "windows-sys 0.48.0", ] @@ -3051,7 +3048,7 @@ version = "0.0.26" dependencies = [ "clap", "libc", - "redox_syscall 0.5.0", + "redox_syscall 0.5.1", "uucore", ] @@ -3061,7 +3058,7 @@ version = "0.0.26" dependencies = [ "clap", "libc", - "nix", + "nix 0.28.0", "uucore", ] @@ -3115,7 +3112,7 @@ name = "uu_tty" version = "0.0.26" dependencies = [ "clap", - "nix", + "nix 0.28.0", "uucore", ] @@ -3186,7 +3183,7 @@ dependencies = [ "bytecount", "clap", "libc", - "nix", + "nix 0.28.0", "thiserror", "unicode-width", "uucore", @@ -3216,7 +3213,7 @@ version = "0.0.26" dependencies = [ "clap", "itertools", - "nix", + "nix 0.28.0", "uucore", ] @@ -3238,7 +3235,7 @@ dependencies = [ "libc", "md-5", "memchr", - "nix", + "nix 0.28.0", "once_cell", "os_display", "sha1", @@ -3272,9 +3269,9 @@ version = "0.0.26" [[package]] name = "uuid" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" [[package]] name = "uutils_term_grid" @@ -3328,7 +3325,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.23", "wasm-bindgen-shared", ] @@ -3350,7 +3347,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.23", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3374,9 +3371,9 @@ dependencies = [ [[package]] name = "wild" -version = "2.2.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3131afc8c575281e1e80f36ed6a092aa502c08b18ed7524e86fbbb12bb410e1" +checksum = "10d01931a94d5a115a53f95292f51d316856b68a035618eb831bbba593a30b67" dependencies = [ "glob", ] @@ -3412,15 +3409,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.0", -] - [[package]] name = "windows" version = "0.52.0" @@ -3646,7 +3634,7 @@ checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", "linux-raw-sys 0.4.12", - "rustix 0.38.31", + "rustix 0.38.32", ] [[package]] diff --git a/src/uu/date/src/date.rs b/src/uu/date/src/date.rs index 8fd6ab60d27..f4c72338e1f 100644 --- a/src/uu/date/src/date.rs +++ b/src/uu/date/src/date.rs @@ -6,7 +6,7 @@ // spell-checker:ignore (chrono) Datelike Timelike ; (format) DATEFILE MMDDhhmm ; (vars) datetime datetimes use chrono::format::{Item, StrftimeItems}; -use chrono::{DateTime, Duration, FixedOffset, Local, Offset, TimeZone, Utc}; +use chrono::{DateTime, TimeDelta, FixedOffset, Local, Offset, TimeZone, Utc}; #[cfg(windows)] use chrono::{Datelike, Timelike}; use chrono_tz::{OffsetName, Tz}; From 4dd0dfcaea88ed7efa64261ddb12ddaeeea997ed Mon Sep 17 00:00:00 2001 From: Krishna Nagam <40730166+KrishnaNagam@users.noreply.github.com> Date: Sat, 20 Apr 2024 10:56:54 +0000 Subject: [PATCH 06/10] fix test cases; added space padding for day in default format --- src/uu/date/src/date.rs | 2 +- tests/by-util/test_date.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/uu/date/src/date.rs b/src/uu/date/src/date.rs index f4c72338e1f..5df46dcf9be 100644 --- a/src/uu/date/src/date.rs +++ b/src/uu/date/src/date.rs @@ -414,7 +414,7 @@ fn make_format_string(settings: &Settings) -> &str { Rfc3339Format::Ns => "%F %T.%f%:z", }, Format::Custom(ref fmt) => fmt, - Format::Default => "%a %b %-d %X %Z %Y", + Format::Default => "%a %b %e %X %Z %Y", } } diff --git a/tests/by-util/test_date.rs b/tests/by-util/test_date.rs index 16a01c6558d..90a46a69a6d 100644 --- a/tests/by-util/test_date.rs +++ b/tests/by-util/test_date.rs @@ -439,8 +439,8 @@ fn test_date_from_stdin() { ) .succeeds() .stdout_is( - "Mon Mar 27 08:30:00 2023\n\ - Sat Apr 1 12:00:00 2023\n\ - Sat Apr 15 18:30:00 2023\n", + "Mon Mar 27 08:30:00 UTC 2023\n\ + Sat Apr 1 12:00:00 UTC 2023\n\ + Sat Apr 15 18:30:00 UTC 2023\n", ); } From 9f9796992f3f3337e1b3de97f1d07a233466735b Mon Sep 17 00:00:00 2001 From: Krishna Nagam <40730166+KrishnaNagam@users.noreply.github.com> Date: Sat, 20 Apr 2024 11:06:03 +0000 Subject: [PATCH 07/10] cargo fmt date.rs --- src/uu/date/src/date.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/uu/date/src/date.rs b/src/uu/date/src/date.rs index 5df46dcf9be..dce4b6088a8 100644 --- a/src/uu/date/src/date.rs +++ b/src/uu/date/src/date.rs @@ -6,7 +6,7 @@ // spell-checker:ignore (chrono) Datelike Timelike ; (format) DATEFILE MMDDhhmm ; (vars) datetime datetimes use chrono::format::{Item, StrftimeItems}; -use chrono::{DateTime, TimeDelta, FixedOffset, Local, Offset, TimeZone, Utc}; +use chrono::{DateTime, FixedOffset, Local, Offset, TimeDelta, TimeZone, Utc}; #[cfg(windows)] use chrono::{Datelike, Timelike}; use chrono_tz::{OffsetName, Tz}; From a196ea62b9496496ecdb5d22a0b808f509d18898 Mon Sep 17 00:00:00 2001 From: Krishna Nagam <40730166+KrishnaNagam@users.noreply.github.com> Date: Sat, 20 Apr 2024 11:28:17 +0000 Subject: [PATCH 08/10] Seperated test case for macos --- tests/by-util/test_date.rs | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/by-util/test_date.rs b/tests/by-util/test_date.rs index 90a46a69a6d..fb2cf8976a7 100644 --- a/tests/by-util/test_date.rs +++ b/tests/by-util/test_date.rs @@ -428,6 +428,7 @@ fn test_date_parse_from_format() { } #[test] +#[cfg(not(target_os = "macos"))] fn test_date_from_stdin() { new_ucmd!() .arg("-f") @@ -444,3 +445,22 @@ fn test_date_from_stdin() { Sat Apr 15 18:30:00 UTC 2023\n", ); } + +#[test] +#[cfg(target_os = "macos")] +fn test_date_from_stdin() { + new_ucmd!() + .arg("-f") + .arg("-") + .pipe_in( + "2023-03-27 08:30:00\n\ + 2023-04-01 12:00:00\n\ + 2023-04-15 18:30:00\n", + ) + .succeeds() + .stdout_is( + "Mon Mar 27 08:30:00 GMT 2023\n\ + Sat Apr 1 12:00:00 GMT 2023\n\ + Sat Apr 15 18:30:00 GMT 2023\n", + ); +} \ No newline at end of file From 543b017a541d0ad716320e20d3d982f2b1f4def7 Mon Sep 17 00:00:00 2001 From: Krishna Nagam <40730166+KrishnaNagam@users.noreply.github.com> Date: Sat, 20 Apr 2024 11:37:42 +0000 Subject: [PATCH 09/10] cargo fmt --- tests/by-util/test_date.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/by-util/test_date.rs b/tests/by-util/test_date.rs index fb2cf8976a7..227df394653 100644 --- a/tests/by-util/test_date.rs +++ b/tests/by-util/test_date.rs @@ -463,4 +463,4 @@ fn test_date_from_stdin() { Sat Apr 1 12:00:00 GMT 2023\n\ Sat Apr 15 18:30:00 GMT 2023\n", ); -} \ No newline at end of file +} From 260958273715de0e2519e853401d2a05c8e209b5 Mon Sep 17 00:00:00 2001 From: Krishna Nagam <40730166+KrishnaNagam@users.noreply.github.com> Date: Sun, 21 Apr 2024 02:26:53 +0000 Subject: [PATCH 10/10] fix Cargo.lock --- Cargo.lock | 155 +++++++++++++++++++++++++++-------------------------- 1 file changed, 79 insertions(+), 76 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4d06e85e9d8..be34da73ce5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -149,9 +149,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "blake2b_simd" @@ -403,7 +403,7 @@ dependencies = [ "glob", "hex-literal", "libc", - "nix 0.28.0", + "nix", "once_cell", "phf", "phf_codegen", @@ -559,7 +559,7 @@ dependencies = [ "lazy_static", "proc-macro2", "regex", - "syn 2.0.23", + "syn 2.0.32", "unicode-xid", ] @@ -571,7 +571,7 @@ checksum = "3e1a2532e4ed4ea13031c13bc7bc0dbca4aae32df48e9d77f0d1e743179f2ea1" dependencies = [ "lazy_static", "proc-macro2", - "syn 2.0.23", + "syn 2.0.32", ] [[package]] @@ -586,7 +586,7 @@ dependencies = [ "lazy_static", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.32", ] [[package]] @@ -654,7 +654,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.2", "crossterm_winapi", "libc", "mio", @@ -691,12 +691,12 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.1" +version = "3.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf" +checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" dependencies = [ - "nix 0.27.1", - "windows-sys 0.48.0", + "nix", + "windows-sys 0.52.0", ] [[package]] @@ -806,7 +806,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22be12de19decddab85d09f251ec8363f060ccb22ec9c81bc157c0c8433946d8" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.2", "log", "scopeguard", "uuid", @@ -814,9 +814,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "file_diff" @@ -948,7 +948,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.32", ] [[package]] @@ -1022,9 +1022,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "half" -version = "2.4.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" dependencies = [ "cfg-if", "crunchy", @@ -1242,9 +1242,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lscolors" @@ -1297,9 +1297,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -1307,24 +1307,13 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "nix" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" -dependencies = [ - "bitflags 2.5.0", - "cfg-if", - "libc", -] - [[package]] name = "nix" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.2", "cfg-if", "cfg_aliases", "libc", @@ -1610,11 +1599,11 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.2", "hex", "lazy_static", "procfs-core", - "rustix 0.38.32", + "rustix 0.38.31", ] [[package]] @@ -1623,7 +1612,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.2", "hex", ] @@ -1723,11 +1712,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "13c178f952cc7eac391f3124bd9851d1ac0bdbc4c9de2d892ccd5f0d8b160e96" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.2", ] [[package]] @@ -1811,7 +1800,7 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.23", + "syn 2.0.32", "unicode-ident", ] @@ -1857,11 +1846,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.2", "errno", "libc", "linux-raw-sys 0.4.12", @@ -1923,9 +1912,23 @@ checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" [[package]] name = "serde" -version = "1.0.147" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.193" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] [[package]] name = "sha1" @@ -1961,9 +1964,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook" @@ -1988,9 +1991,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] @@ -2021,9 +2024,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b187f0231d56fe41bfb12034819dd2bf336422a5866de41bc3fec4b2e3883e8" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "smawk" @@ -2060,9 +2063,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.23" +version = "2.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" dependencies = [ "proc-macro2", "quote", @@ -2077,7 +2080,7 @@ checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "rustix 0.38.32", + "rustix 0.38.31", "windows-sys 0.52.0", ] @@ -2097,7 +2100,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.32", + "rustix 0.38.31", "windows-sys 0.48.0", ] @@ -2272,7 +2275,7 @@ name = "uu_cat" version = "0.0.26" dependencies = [ "clap", - "nix 0.28.0", + "nix", "thiserror", "uucore", ] @@ -2396,7 +2399,7 @@ dependencies = [ "clap", "gcd", "libc", - "nix 0.28.0", + "nix", "signal-hook", "uucore", ] @@ -2460,7 +2463,7 @@ name = "uu_env" version = "0.0.26" dependencies = [ "clap", - "nix 0.28.0", + "nix", "rust-ini", "uucore", ] @@ -2604,7 +2607,7 @@ name = "uu_kill" version = "0.0.26" dependencies = [ "clap", - "nix 0.28.0", + "nix", "uucore", ] @@ -2693,7 +2696,7 @@ version = "0.0.26" dependencies = [ "clap", "crossterm", - "nix 0.28.0", + "nix", "unicode-segmentation", "unicode-width", "uucore", @@ -2715,7 +2718,7 @@ version = "0.0.26" dependencies = [ "clap", "libc", - "nix 0.28.0", + "nix", "uucore", ] @@ -2983,7 +2986,7 @@ name = "uu_stty" version = "0.0.26" dependencies = [ "clap", - "nix 0.28.0", + "nix", "uucore", ] @@ -3001,7 +3004,7 @@ version = "0.0.26" dependencies = [ "clap", "libc", - "nix 0.28.0", + "nix", "uucore", "windows-sys 0.48.0", ] @@ -3048,7 +3051,7 @@ version = "0.0.26" dependencies = [ "clap", "libc", - "redox_syscall 0.5.1", + "redox_syscall 0.5.0", "uucore", ] @@ -3058,7 +3061,7 @@ version = "0.0.26" dependencies = [ "clap", "libc", - "nix 0.28.0", + "nix", "uucore", ] @@ -3112,7 +3115,7 @@ name = "uu_tty" version = "0.0.26" dependencies = [ "clap", - "nix 0.28.0", + "nix", "uucore", ] @@ -3183,7 +3186,7 @@ dependencies = [ "bytecount", "clap", "libc", - "nix 0.28.0", + "nix", "thiserror", "unicode-width", "uucore", @@ -3213,7 +3216,7 @@ version = "0.0.26" dependencies = [ "clap", "itertools", - "nix 0.28.0", + "nix", "uucore", ] @@ -3235,7 +3238,7 @@ dependencies = [ "libc", "md-5", "memchr", - "nix 0.28.0", + "nix", "once_cell", "os_display", "sha1", @@ -3269,9 +3272,9 @@ version = "0.0.26" [[package]] name = "uuid" -version = "1.8.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" [[package]] name = "uutils_term_grid" @@ -3325,7 +3328,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.32", "wasm-bindgen-shared", ] @@ -3347,7 +3350,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.32", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3371,9 +3374,9 @@ dependencies = [ [[package]] name = "wild" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d01931a94d5a115a53f95292f51d316856b68a035618eb831bbba593a30b67" +checksum = "a3131afc8c575281e1e80f36ed6a092aa502c08b18ed7524e86fbbb12bb410e1" dependencies = [ "glob", ] @@ -3634,7 +3637,7 @@ checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", "linux-raw-sys 0.4.12", - "rustix 0.38.32", + "rustix 0.38.31", ] [[package]]