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

Merge pull request #7146 from cakebaker/bump_chrono_tz

Browse source 
Bump `chrono-tz` to `0.10.0`
This commit is contained in:
Sylvestre Ledru 2025-01-16 12:39:50 +01:00 • committed by GitHub
commit f39fdd2831
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Cargo.lock generated
View file

@ -304,9 +304,9 @@ dependencies = [
[[package]] [[package]]
name = "chrono-tz" name = "chrono-tz"
version = "0.8.6" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e" checksum = "cd6dd8046d00723a59a2f8c5f295c515b9bb9a331ee4f8f3d4dd49e428acd3b6"
dependencies = [ dependencies = [
"chrono", "chrono",
"chrono-tz-build", "chrono-tz-build",
@ -315,12 +315,11 @@ dependencies = [
[[package]] [[package]]
name = "chrono-tz-build" name = "chrono-tz-build"
version = "0.2.1" version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" checksum = "e94fea34d77a245229e7746bd2beb786cd2a896f306ff491fb8cecb3074b10a7"
dependencies = [ dependencies = [
"parse-zoneinfo", "parse-zoneinfo",
"phf",
"phf_codegen", "phf_codegen",
] ]

4
Cargo.toml
View file

@ -278,10 +278,9 @@ chrono = { version = "0.4.38", default-features = false, features = [
"alloc", "alloc",
"clock", "clock",
] } ] }
chrono-tz = "0.10.0"
clap = { version = "4.5", features = ["wrap_help", "cargo"] } clap = { version = "4.5", features = ["wrap_help", "cargo"] }
clap_complete = "4.4" clap_complete = "4.4"
chrono-tz = "0.8.3"
iana-time-zone = "0.1.57"
clap_mangen = "0.2" clap_mangen = "0.2"
compare = "0.1.0" compare = "0.1.0"
coz = { version = "0.1.3" } coz = { version = "0.1.3" }
@ -299,6 +298,7 @@ gcd = "2.3"
glob = "0.3.1" glob = "0.3.1"
half = "2.4.1" half = "2.4.1"
hostname = "0.4" hostname = "0.4"
iana-time-zone = "0.1.57"
indicatif = "0.17.8" indicatif = "0.17.8"
itertools = "0.14.0" itertools = "0.14.0"
libc = "0.2.153" libc = "0.2.153"

9
fuzz/Cargo.lock generated
View file

@ -232,9 +232,9 @@ dependencies = [
[[package]] [[package]]
name = "chrono-tz" name = "chrono-tz"
version = "0.8.6" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e" checksum = "cd6dd8046d00723a59a2f8c5f295c515b9bb9a331ee4f8f3d4dd49e428acd3b6"
dependencies = [ dependencies = [
"chrono", "chrono",
"chrono-tz-build", "chrono-tz-build",
@ -243,12 +243,11 @@ dependencies = [
[[package]] [[package]]
name = "chrono-tz-build" name = "chrono-tz-build"
version = "0.2.1" version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" checksum = "e94fea34d77a245229e7746bd2beb786cd2a896f306ff491fb8cecb3074b10a7"
dependencies = [ dependencies = [
"parse-zoneinfo", "parse-zoneinfo",
"phf",
"phf_codegen", "phf_codegen",
] ]

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

@ -277,7 +277,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
// TODO - Revisit when chrono 0.5 is released. https://github.com/chronotope/chrono/issues/970 // TODO - Revisit when chrono 0.5 is released. https://github.com/chronotope/chrono/issues/970
let tz = match std::env::var("TZ") { let tz = match std::env::var("TZ") {
// TODO Support other time zones... // TODO Support other time zones...
Ok(s) if s == "UTC0" => Tz::Etc__UTC, Ok(s) if s == "UTC0" || s.is_empty() => Tz::Etc__UTC,
_ => match get_timezone() { _ => match get_timezone() {
Ok(tz_str) => tz_str.parse().unwrap(), Ok(tz_str) => tz_str.parse().unwrap(),
Err(_) => Tz::Etc__UTC, Err(_) => Tz::Etc__UTC,
@ -288,7 +288,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
// GNU `date` uses `%N` for nano seconds, however crate::chrono uses `%f` // GNU `date` uses `%N` for nano seconds, however crate::chrono uses `%f`
let format_string = &format_string let format_string = &format_string
.replace("%N", "%f") .replace("%N", "%f")
.replace("%Z", tz_abbreviation); .replace("%Z", tz_abbreviation.unwrap_or("UTC"));
// Refuse to pass this string to chrono as it is crashing in this crate // Refuse to pass this string to chrono as it is crashing in this crate
if format_string.contains("%#z") { if format_string.contains("%#z") {
return Err(USimpleError::new( return Err(USimpleError::new(

9
tests/by-util/test_date.rs
View file

@ -482,3 +482,12 @@ fn test_date_from_stdin() {
Sat Apr 15 18:30:00 UTC 2023\n", Sat Apr 15 18:30:00 UTC 2023\n",
); );
} }
#[test]
fn test_date_empty_tz() {
new_ucmd!()
.env("TZ", "")
.arg("+%Z")
.succeeds()
.stdout_only("UTC\n");
}