diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d40a3728..f0e9f37f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ concurrency: env: CARGO_INCREMENTAL: "0" CARGO_TERM_COLOR: always - RUST_MIN_SRV: "1.71.1" + RUST_MIN_SRV: "1.85" jobs: quality: diff --git a/Cargo.lock b/Cargo.lock index 8097c81e..be6ce7eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "aho-corasick" @@ -369,9 +369,9 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "jiff" -version = "0.2.46" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175dc66334db3b9ab9985bf8b61cfed50dc16d20964bb47f9e479adcae984a7f" +checksum = "9cc767b5763de45e810109520123bb2829a653f3a7ed9be40b2bc4f81158f595" dependencies = [ "jiff-core", "jiff-static", @@ -385,36 +385,36 @@ dependencies = [ [[package]] name = "jiff-core" -version = "0.1.8" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e599b80292e597019b8b3e392de3f4bea2959ddfb8c7dff60e035e9e311a2c1b" +checksum = "894f7ac42105f584100691b3bf6e6b92dd12fcfa225f6c397f95c8a94b47b68f" dependencies = [ "log", ] [[package]] name = "jiff-static" -version = "0.2.46" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7b1af7547d47354bc438d797e3854601bde8f8d185780c5ba4ab27afa54f1ba" +checksum = "955491488dc99b572ea6d67b172dcd98787d00744b1fb44a5689b4e6413695a6" dependencies = [ "jiff-core", "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.8", ] [[package]] name = "jiff-tzdb" -version = "0.1.9" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8377070c6bae868759445e5a77f66d84f0b72f3a054bfb00e6d038b8282da7" +checksum = "12e71a1b68a875a44a33bb7a1dd84392cb77145a3367a552a3cfe6a4f5cf3afc" [[package]] name = "jiff-tzdb-platform" -version = "0.1.3" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8" +checksum = "dc65b284afcfa8f6cf189c7274c805505314a7ab975c60e1f548bff56525420e" dependencies = [ "jiff-tzdb", ] diff --git a/Cargo.toml b/Cargo.toml index 6606f1f5..5f20020a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,12 +6,12 @@ edition = "2021" license = "MIT" repository = "https://github.com/uutils/parse_datetime" readme = "README.md" -rust-version = "1.71.1" +rust-version = "1.85" [dependencies] winnow = "1.0.0" num-traits = "0.2.19" -jiff = { version = "0.2.15", default-features = false, features = ["tz-system", "tzdb-bundle-platform", "tzdb-zoneinfo"] } +jiff = { version = "1.0.0", default-features = false, features = ["tz-system", "tzdb-bundle-platform", "tzdb-zoneinfo"] } [dev-dependencies] rstest = "0.28" diff --git a/benches/parse_datetime.rs b/benches/parse_datetime.rs index 6aff8037..9b0f1505 100644 --- a/benches/parse_datetime.rs +++ b/benches/parse_datetime.rs @@ -1,5 +1,5 @@ use codspeed_criterion_compat::{criterion_group, criterion_main, Criterion}; -use jiff::Zoned; +use jiff::ZonedDateTime; use parse_datetime::{parse_datetime, parse_datetime_at_date}; fn bench_iso_datetime(c: &mut Criterion) { @@ -33,14 +33,14 @@ fn bench_epoch_timestamp(c: &mut Criterion) { } fn bench_relative_time(c: &mut Criterion) { - let now = Zoned::now(); + let now = ZonedDateTime::now(); c.bench_function("parse_relative_time", |b| { b.iter(|| parse_datetime_at_date(now.clone(), "+3 days")) }); } fn bench_relative_time_complex(c: &mut Criterion) { - let now = Zoned::now(); + let now = ZonedDateTime::now(); c.bench_function("parse_relative_time_complex", |b| { b.iter(|| parse_datetime_at_date(now.clone(), "1 year 3 months 2 days ago")) }); @@ -60,7 +60,7 @@ fn bench_weekday(c: &mut Criterion) { // makes the measurement vary with the day the benchmark runs. // 2000-01-03 is a Monday, so "wednesday" resolves two days ahead. let base = jiff::civil::DateTime::from(jiff::civil::date(2000, 1, 3)) - .to_zoned(jiff::tz::TimeZone::UTC) + .to_zoned_datetime(jiff::tz::TimeZone::UTC) .unwrap(); c.bench_function("parse_weekday", |b| { b.iter(|| parse_datetime_at_date(base.clone(), "wednesday")) @@ -117,7 +117,7 @@ fn bench_extended_year_rollover(c: &mut Criterion) { fn bench_extended_year_relative(c: &mut Criterion) { let base = jiff::civil::DateTime::from(jiff::civil::date(2000, 1, 1)) - .to_zoned(jiff::tz::TimeZone::UTC) + .to_zoned_datetime(jiff::tz::TimeZone::UTC) .unwrap(); c.bench_function("parse_extended_year_relative", |b| { b.iter(|| parse_datetime_at_date(base.clone(), "10000-01-01 +1 day")) diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index ad2c4e31..ab5f265b 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -43,7 +43,7 @@ checksum = "1b034bd7d5f032402a2479444dcc6f74e36a03f31854d41680fb240ef682a1ac" dependencies = [ "proc-macro2", "quote", - "syn 3.0.8", + "syn", ] [[package]] @@ -75,9 +75,9 @@ dependencies = [ [[package]] name = "jiff" -version = "0.2.46" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175dc66334db3b9ab9985bf8b61cfed50dc16d20964bb47f9e479adcae984a7f" +checksum = "9cc767b5763de45e810109520123bb2829a653f3a7ed9be40b2bc4f81158f595" dependencies = [ "jiff-core", "jiff-static", @@ -91,36 +91,36 @@ dependencies = [ [[package]] name = "jiff-core" -version = "0.1.8" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e599b80292e597019b8b3e392de3f4bea2959ddfb8c7dff60e035e9e311a2c1b" +checksum = "894f7ac42105f584100691b3bf6e6b92dd12fcfa225f6c397f95c8a94b47b68f" dependencies = [ "log", ] [[package]] name = "jiff-static" -version = "0.2.46" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7b1af7547d47354bc438d797e3854601bde8f8d185780c5ba4ab27afa54f1ba" +checksum = "955491488dc99b572ea6d67b172dcd98787d00744b1fb44a5689b4e6413695a6" dependencies = [ "jiff-core", "proc-macro2", "quote", - "syn 2.0.119", + "syn", ] [[package]] name = "jiff-tzdb" -version = "0.1.9" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8377070c6bae868759445e5a77f66d84f0b72f3a054bfb00e6d038b8282da7" +checksum = "12e71a1b68a875a44a33bb7a1dd84392cb77145a3367a552a3cfe6a4f5cf3afc" [[package]] name = "jiff-tzdb-platform" -version = "0.1.3" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8" +checksum = "dc65b284afcfa8f6cf189c7274c805505314a7ab975c60e1f548bff56525420e" dependencies = [ "jiff-tzdb", ] @@ -237,7 +237,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" dependencies = [ "proc-macro2", "quote", - "syn 3.0.8", + "syn", ] [[package]] @@ -246,17 +246,6 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" -[[package]] -name = "syn" -version = "2.0.119" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - [[package]] name = "syn" version = "3.0.8" diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index 69ebb92a..ad8c1172 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -9,7 +9,7 @@ cargo-fuzz = true [dependencies] libfuzzer-sys = "0.4.7" arbitrary = { version = "1", features = ["derive"] } -jiff = "0.2" +jiff = "1.0.0" [dependencies.parse_datetime] path = "../" diff --git a/fuzz/fuzz_targets/large_year.rs b/fuzz/fuzz_targets/large_year.rs index ace853ff..6e264880 100644 --- a/fuzz/fuzz_targets/large_year.rs +++ b/fuzz/fuzz_targets/large_year.rs @@ -53,7 +53,7 @@ fuzz_target!(|input: Input| { // Test parse_datetime_at_date with a controlled base. let by = base_year(input.base_year_selector); if let Ok(base) = DateTime::new(by, 1, 1, 0, 0, 0, 0) { - if let Ok(base) = base.to_zoned(TimeZone::UTC) { + if let Ok(base) = base.to_zoned_datetime(TimeZone::UTC) { let _ = parse_datetime::parse_datetime_at_date(base, &date_str); } } diff --git a/src/items/builder.rs b/src/items/builder.rs index 77826749..4fd6aca2 100644 --- a/src/items/builder.rs +++ b/src/items/builder.rs @@ -1,7 +1,7 @@ // For the full copyright and license information, please view the LICENSE // file that was distributed with this source code. -use jiff::{civil, Span, ToSpan, Zoned}; +use jiff::{civil, Span, ToSpan, ZonedDateTime}; use super::{date, epoch, error, offset, relative, time, weekday, year, Item}; use crate::extended::{DateParts, TimeParts}; @@ -14,7 +14,7 @@ use crate::{ExtendedDateTime, ParsedDateTime}; /// leave it unset to use the current date and time as the base. #[derive(Debug, Default, Clone)] pub(crate) struct DateTimeBuilder { - base: Option, + base: Option, timestamp: Option, date: Option, time: Option, @@ -35,7 +35,7 @@ impl DateTimeBuilder { /// Sets the base date and time for the builder. If not set, the current /// date and time will be used. - pub(super) fn set_base(mut self, base: Zoned) -> Self { + pub(super) fn set_base(mut self, base: ZonedDateTime) -> Self { self.base = Some(base); self } @@ -189,7 +189,7 @@ impl DateTimeBuilder { /// Build a parsed datetime result from the pieces accumulated in this builder. /// /// Returns [`ParsedDateTime::InRange`] when the result is representable as a - /// [`jiff::Zoned`], or [`ParsedDateTime::Extended`] for large/out-of-range + /// [`jiff::ZonedDateTime`], or [`ParsedDateTime::Extended`] for large/out-of-range /// year scenarios. /// /// Resolution order (mirrors GNU `date` semantics): @@ -251,22 +251,22 @@ impl DateTimeBuilder { || self.base.as_ref().is_some_and(|b| b.year() >= 9999) } - fn build_in_range(self) -> Result { + fn build_in_range(self) -> Result { // 1. Choose the base instant. // If a TZ="..." prefix was parsed, it should override the base's timezone // while keeping the base's timestamp for relative date calculations. let has_timezone = self.timezone.is_some(); let base = match (self.base, self.timezone) { - (Some(b), Some(tz)) => b.timestamp().to_zoned(tz), + (Some(b), Some(tz)) => b.timestamp().to_zoned_datetime(tz), (Some(b), None) => b, - (None, Some(tz)) => jiff::Timestamp::now().to_zoned(tz), - (None, None) => Zoned::now(), + (None, Some(tz)) => jiff::Timestamp::now().to_zoned_datetime(tz), + (None, None) => ZonedDateTime::now(), }; // 2. Absolute timestamp override everything else. if let Some(ts) = self.timestamp { let ts = jiff::Timestamp::try_from(ts)?; - return Ok(ts.to_zoned(base.offset().to_time_zone())); + return Ok(ts.to_zoned_datetime(base.offset().to_time_zone())); } // 3. Determine whether to truncate the time of day. Like GNU, a @@ -300,7 +300,7 @@ impl DateTimeBuilder { // 4b. Apply time. if let Some(time) = self.time.clone() { if let Some(offset) = &time.offset { - dt = dt.datetime().to_zoned(offset.try_into()?)?; + dt = dt.datetime().to_zoned_datetime(offset.try_into()?)?; } let t: civil::Time = time.try_into()?; @@ -356,7 +356,7 @@ impl DateTimeBuilder { if let Some(offset) = self.offset { let (offset, hour_adjustment) = offset.normalize(); dt = dt.checked_add(Span::new().hours(hour_adjustment))?; - dt = dt.datetime().to_zoned((&offset).try_into()?)?; + dt = dt.datetime().to_zoned_datetime((&offset).try_into()?)?; } // 4e. Apply relative adjustments. @@ -401,10 +401,10 @@ impl DateTimeBuilder { let has_timezone = timezone.is_some(); let base = match (base, timezone) { - (Some(b), Some(tz)) => b.timestamp().to_zoned(tz), + (Some(b), Some(tz)) => b.timestamp().to_zoned_datetime(tz), (Some(b), None) => b, - (None, Some(tz)) => jiff::Timestamp::now().to_zoned(tz), - (None, None) => Zoned::now(), + (None, Some(tz)) => jiff::Timestamp::now().to_zoned_datetime(tz), + (None, None) => ZonedDateTime::now(), }; let rule_tz = base.time_zone().clone(); @@ -504,7 +504,9 @@ impl DateTimeBuilder { jiff::Timestamp::new(dt.unix_seconds(), dt.nanosecond as i32), jiff::tz::Offset::from_seconds(dt.offset_seconds), ) { - return Ok(ParsedDateTime::InRange(ts.to_zoned(offset.to_time_zone()))); + return Ok(ParsedDateTime::InRange( + ts.to_zoned_datetime(offset.to_time_zone()), + )); } } @@ -534,7 +536,7 @@ fn resolve_rule_offset_for_extended( dt.second as i8, dt.nanosecond as i32, )?; - let zoned = tz.to_ambiguous_zoned(surrogate_dt).compatible()?; + let zoned = tz.to_ambiguous_zoned_datetime(surrogate_dt).compatible()?; Ok(zoned.offset().seconds()) } @@ -804,7 +806,7 @@ mod tests { let base = "2000-01-01 00:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); let builder = DateTimeBuilder::try_from(vec![ Item::Date(date_large("9999-12-31")), @@ -820,7 +822,7 @@ mod tests { let base = "2000-01-01 00:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); let builder = DateTimeBuilder::try_from(vec![ Item::Date(date_large("10000-01-01")), @@ -911,7 +913,7 @@ mod tests { let base = "2000-01-01 00:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); let builder = DateTimeBuilder::try_from(vec![ Item::Date(date_large("10000-01-01")), @@ -934,7 +936,7 @@ mod tests { let base = "2000-01-01 00:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); let builder = DateTimeBuilder::try_from(vec![ Item::Date(date_large("10000-06-01")), @@ -951,7 +953,7 @@ mod tests { let base = "2000-01-01 00:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); let builder = DateTimeBuilder::try_from(vec![ Item::Date(date_large("9999-01-31")), @@ -967,7 +969,7 @@ mod tests { let base = "2000-01-01 00:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); let builder = DateTimeBuilder::try_from(vec![ Item::Date(date_large("9999-12-31")), @@ -985,7 +987,7 @@ mod tests { let base = "2000-01-01 00:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); let builder = DateTimeBuilder::try_from(vec![ Item::Date(date_large("2021-01-31")), @@ -1001,7 +1003,7 @@ mod tests { let base = "2000-01-01 10:11:12" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); let tz = jiff::tz::TimeZone::get("Europe/Paris").unwrap(); let builder = DateTimeBuilder::try_from(vec![ @@ -1030,7 +1032,7 @@ mod tests { let base = "2000-01-01 10:11:12.123456789" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); let mut builder = DateTimeBuilder::new(); builder.base = Some(base); @@ -1046,7 +1048,7 @@ mod tests { let base = "2000-01-01 10:11:12" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); let builder = DateTimeBuilder::try_from(vec![ Item::Date(date_large("10000-01-01")), @@ -1058,7 +1060,7 @@ mod tests { } #[test] - #[should_panic(expected = "ParsedDateTime is not representable as jiff::Zoned")] + #[should_panic(expected = "ParsedDateTime is not representable as jiff::ZonedDateTime")] fn expect_in_range_panics_for_extended_input() { let parsed = DateTimeBuilder::try_from(vec![Item::Date(date_large("10000-01-01"))]) .unwrap() diff --git a/src/items/mod.rs b/src/items/mod.rs index 0f31f062..ebf58e91 100644 --- a/src/items/mod.rs +++ b/src/items/mod.rs @@ -51,7 +51,7 @@ pub(crate) mod error; use std::borrow::Cow; use crate::ParsedDateTime; -use jiff::Zoned; +use jiff::ZonedDateTime; use primitive::space; use winnow::{ combinator::{alt, eof, preceded, repeat_till, terminated, trace}, @@ -82,7 +82,7 @@ enum Item { /// Parse a date and time string and resolve it against the given base date and /// time, returning a [`ParsedDateTime`] result. pub(crate) fn parse_at_date + Clone>( - base: Zoned, + base: ZonedDateTime, input: S, ) -> Result { match parse(&mut input.as_ref()) { @@ -307,16 +307,16 @@ fn expect_error(input: &mut &str, reason: &'static str) -> ErrMode #[cfg(test)] mod tests { use crate::ParsedDateTime; - use jiff::{civil::DateTime, tz::TimeZone, ToSpan, Zoned}; + use jiff::{civil::DateTime, tz::TimeZone, ToSpan, ZonedDateTime}; use super::*; - fn at_date(builder: DateTimeBuilder, base: Zoned) -> Zoned { + fn at_date(builder: DateTimeBuilder, base: ZonedDateTime) -> ZonedDateTime { builder.set_base(base).build().unwrap().expect_in_range() } - fn at_utc(builder: DateTimeBuilder) -> Zoned { - at_date(builder, Zoned::now().with_time_zone(TimeZone::UTC)) + fn at_utc(builder: DateTimeBuilder) -> ZonedDateTime { + at_date(builder, ZonedDateTime::now().with_time_zone(TimeZone::UTC)) } fn test_eq_fmt(fmt: &str, input: &str) -> String { @@ -329,7 +329,7 @@ mod tests { .to_string() } - fn assert_extended_datetime(input: &str, base: Zoned, expected: &str) { + fn assert_extended_datetime(input: &str, base: ZonedDateTime, expected: &str) { let parsed = parse_at_date(base, input).unwrap(); assert!( matches!(parsed, ParsedDateTime::Extended(_)), @@ -512,7 +512,7 @@ mod tests { fn negative_base_year_with_yearless_date_errors() { let base = DateTime::new(-1, 1, 1, 0, 0, 0, 0) .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); let result = parse_at_date(base, "11/14"); assert!(result.is_err()); @@ -527,7 +527,7 @@ mod tests { let base = "2000-01-01 00:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); assert_extended_datetime("9999-12-31 +1 day", base, "10000-01-01 00:00:00+00:00"); } @@ -537,7 +537,7 @@ mod tests { let base = "2000-01-01 00:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); assert_extended_datetime("9999-12-31", base, "9999-12-31 00:00:00+00:00"); } @@ -547,7 +547,7 @@ mod tests { let base = "2000-01-01 00:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); assert_extended_datetime("9999-12-31 12:00", base, "9999-12-31 12:00:00+00:00"); } @@ -557,7 +557,7 @@ mod tests { let base = "2000-01-01 00:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); assert_extended_datetime("9999-12-31 12:00 UTC", base, "9999-12-31 12:00:00+00:00"); } @@ -567,7 +567,7 @@ mod tests { let base = "2000-01-01 00:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); assert_extended_datetime("9999-12-31 12:00 +01:00", base, "9999-12-31 12:00:00+01:00"); } @@ -577,7 +577,7 @@ mod tests { let base = "2000-01-01 00:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); assert_extended_datetime( @@ -613,7 +613,7 @@ mod tests { let base = "2000-01-01 00:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); let result = parse_at_date(base, "10000-01-01 -1000 years").unwrap(); let z = result.expect_in_range(); @@ -628,7 +628,7 @@ mod tests { let base = "2000-01-01 00:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); let result = parse_at_date(base, "TZ=\"Europe/Paris\" 10000-01-01 -1000 years").unwrap(); let z = result.expect_in_range(); @@ -643,7 +643,7 @@ mod tests { let base = "2000-01-01 00:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); let dt = expect_extended_datetime(parse_at_date(base, "10000-01-01 12:34:56+02:00").unwrap()); @@ -657,7 +657,7 @@ mod tests { let base = "2000-01-01 00:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); let result = parse_at_date(base, "not-a-date"); assert!(result.is_err()); @@ -669,18 +669,18 @@ mod tests { let base = "2000-01-01 00:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); assert_extended_datetime("2001-01-01", base, "2001-01-01 00:00:00+00:00"); } #[test] - #[should_panic(expected = "ParsedDateTime is not representable as jiff::Zoned")] + #[should_panic(expected = "ParsedDateTime is not representable as jiff::ZonedDateTime")] fn expect_in_range_panics_for_extended_input() { let base = "2000-01-01 00:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); let parsed = parse_at_date(base, "10000-01-01").unwrap(); let _ = parsed.expect_in_range(); @@ -692,7 +692,7 @@ mod tests { let now = "2025-01-01 00:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); assert_eq!( @@ -736,7 +736,7 @@ mod tests { #[test] fn relative_date_time() { - let now = Zoned::now().with_time_zone(TimeZone::UTC); + let now = ZonedDateTime::now().with_time_zone(TimeZone::UTC); let result = at_date(parse(&mut "2 days ago").unwrap(), now.clone()); assert_eq!(result, now.checked_sub(2.days()).unwrap()); @@ -772,7 +772,7 @@ mod tests { let base = "2000-01-01 12:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); // Both read "+8 years" as a relative item, not as an offset of +8. @@ -787,7 +787,7 @@ mod tests { let base = "2000-06-15 12:34:56" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); for (input, expected) in [ @@ -808,7 +808,7 @@ mod tests { #[test] fn pure() { - let now = Zoned::now().with_time_zone(TimeZone::UTC); + let now = ZonedDateTime::now().with_time_zone(TimeZone::UTC); // Pure number as year. let result = at_date(parse(&mut "jul 18 12:30 2025").unwrap(), now.clone()); @@ -840,13 +840,13 @@ mod tests { ( r#"TZ="Europe/Paris" 2025-01-02"#, "2025-01-02 00:00:00[Europe/Paris]" - .parse::() + .parse::() .unwrap(), ), ( r#"TZ="Europe/Paris" 2025-01-02 03:04:05"#, "2025-01-02 03:04:05[Europe/Paris]" - .parse::() + .parse::() .unwrap(), ), ] { diff --git a/src/lib.rs b/src/lib.rs index 48ad927a..374e3f2d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -12,7 +12,7 @@ use std::error::Error; use std::fmt::{self, Display}; -use jiff::Zoned; +use jiff::ZonedDateTime; mod extended; mod items; @@ -24,25 +24,25 @@ pub const GNU_MAX_YEAR: u32 = 2_147_485_547; /// Parsed datetime output. /// -/// - [`ParsedDateTime::InRange`] contains a standard [`jiff::Zoned`] value. +/// - [`ParsedDateTime::InRange`] contains a standard [`jiff::ZonedDateTime`] value. /// - [`ParsedDateTime::Extended`] contains an out-of-range year representation /// (for example, years greater than `9999`) that cannot be represented by -/// `jiff::Zoned`. +/// `jiff::ZonedDateTime`. #[derive(Debug, Clone, PartialEq, Eq)] pub enum ParsedDateTime { - InRange(Zoned), + InRange(ZonedDateTime), Extended(ExtendedDateTime), } impl ParsedDateTime { - pub fn as_zoned(&self) -> Option<&Zoned> { + pub fn as_zoned(&self) -> Option<&ZonedDateTime> { match self { ParsedDateTime::InRange(z) => Some(z), ParsedDateTime::Extended(_) => None, } } - pub fn into_zoned(self) -> Option { + pub fn into_zoned(self) -> Option { match self { ParsedDateTime::InRange(z) => Some(z), ParsedDateTime::Extended(_) => None, @@ -105,9 +105,9 @@ impl ParsedDateTime { /// This is a convenience for contexts where the caller is certain the result /// is in range (e.g., tests). Prefer [`into_zoned`](Self::into_zoned) or /// pattern matching in production code. - pub fn expect_in_range(self) -> Zoned { + pub fn expect_in_range(self) -> ZonedDateTime { self.into_zoned() - .expect("ParsedDateTime is not representable as jiff::Zoned") + .expect("ParsedDateTime is not representable as jiff::ZonedDateTime") } } @@ -127,9 +127,9 @@ impl fmt::Display for ParsedDateTime { } } -/// An `Extended` value never compares equal to a `Zoned`. -impl PartialEq for ParsedDateTime { - fn eq(&self, other: &Zoned) -> bool { +/// An `Extended` value never compares equal to a `ZonedDateTime`. +impl PartialEq for ParsedDateTime { + fn eq(&self, other: &ZonedDateTime) -> bool { match self { ParsedDateTime::InRange(z) => z == other, ParsedDateTime::Extended(_) => false, @@ -206,10 +206,10 @@ pub fn parse_datetime + Clone>( /// # Examples /// /// ``` -/// use jiff::Zoned; +/// use jiff::ZonedDateTime; /// use parse_datetime::{parse_datetime_at_date, ParsedDateTime}; /// -/// let now = Zoned::now(); +/// let now = ZonedDateTime::now(); /// let after = parse_datetime_at_date(now, "2024-09-13UTC +3 days").unwrap(); /// /// match after { @@ -228,7 +228,7 @@ pub fn parse_datetime + Clone>( /// This function will return `Err(ParseDateTimeError::InvalidInput)` if the /// input string cannot be parsed. pub fn parse_datetime_at_date + Clone>( - date: Zoned, + date: ZonedDateTime, input: S, ) -> Result { items::parse_at_date(date, input).map_err(|e| e.into()) @@ -238,7 +238,7 @@ pub fn parse_datetime_at_date + Clone>( mod tests { use jiff::{ civil::{date, time, Time, Weekday}, - ToSpan, Zoned, + ToSpan, ZonedDateTime, }; use crate::parse_datetime; @@ -322,14 +322,14 @@ mod tests { mod calendar_date_items { use jiff::{ civil::{date, time}, - Zoned, + ZonedDateTime, }; use crate::parse_datetime; #[test] fn single_digit_month_day() { - let expected = Zoned::now() + let expected = ZonedDateTime::now() .with() .date(date(1987, 5, 7)) .time(time(0, 0, 0, 0)) @@ -367,7 +367,7 @@ mod tests { #[cfg(test)] mod offsets { - use jiff::{civil::DateTime, tz, Zoned}; + use jiff::{civil::DateTime, tz, ZonedDateTime}; use crate::parse_datetime; @@ -382,7 +382,7 @@ mod tests { "Z+07", ]; - let expected = format!("{}{}", Zoned::now().strftime("%Y%m%d"), "0000+0700"); + let expected = format!("{}{}", ZonedDateTime::now().strftime("%Y%m%d"), "0000+0700"); for offset in offsets { let actual = parse_datetime(offset).unwrap().expect_in_range(); assert_eq!(expected, actual.strftime("%Y%m%d%H%M%z").to_string()); @@ -392,7 +392,7 @@ mod tests { #[test] fn test_partial_offset() { let offsets = vec!["UTC+00:15", "UTC+0015", "Z+00:15", "Z+0015"]; - let expected = format!("{}{}", Zoned::now().strftime("%Y%m%d"), "0000+0015"); + let expected = format!("{}{}", ZonedDateTime::now().strftime("%Y%m%d"), "0000+0015"); for offset in offsets { let actual = parse_datetime(offset).unwrap().expect_in_range(); assert_eq!(expected, actual.strftime("%Y%m%d%H%M%z").to_string()); @@ -405,7 +405,7 @@ mod tests { let expected = "1997-01-19 08:17:48" .parse::() .unwrap() - .to_zoned(tz::TimeZone::fixed(tz::offset(2))) + .to_zoned_datetime(tz::TimeZone::fixed(tz::offset(2))) .unwrap(); assert_eq!(actual, expected); } @@ -416,7 +416,7 @@ mod tests { let expected = "1997-01-19 08:17:48" .parse::() .unwrap() - .to_zoned(tz::TimeZone::fixed(tz::offset(-3))) + .to_zoned_datetime(tz::TimeZone::fixed(tz::offset(-3))) .unwrap(); assert_eq!(actual, expected); } @@ -486,11 +486,11 @@ mod tests { #[cfg(test)] mod weekday { - use jiff::{civil::DateTime, tz::TimeZone, Zoned}; + use jiff::{civil::DateTime, tz::TimeZone, ZonedDateTime}; use crate::parse_datetime_at_date; - fn get_formatted_date(date: &Zoned, weekday: &str) -> String { + fn get_formatted_date(date: &ZonedDateTime, weekday: &str) -> String { let result = parse_datetime_at_date(date.clone(), weekday) .unwrap() .expect_in_range(); @@ -504,7 +504,7 @@ mod tests { let date = "2023-02-28 10:12:03" .parse::() .unwrap() - .to_zoned(TimeZone::system()) + .to_zoned_datetime(TimeZone::system()) .unwrap(); // 2023-2-28 is tuesday @@ -545,7 +545,7 @@ mod tests { let date = "2023-02-28 10:12:03" .parse::() .unwrap() - .to_zoned(TimeZone::system()) + .to_zoned_datetime(TimeZone::system()) .unwrap(); assert_eq!( @@ -559,7 +559,7 @@ mod tests { let date = "2023-02-28 10:12:03" .parse::() .unwrap() - .to_zoned(TimeZone::system()) + .to_zoned_datetime(TimeZone::system()) .unwrap(); for (weekday, expected) in [ @@ -626,7 +626,7 @@ mod tests { let expected = "2021-02-14 06:37:47" .parse::() .unwrap() - .to_zoned(TimeZone::system()) + .to_zoned_datetime(TimeZone::system()) .unwrap(); assert_eq!(dt, expected); @@ -650,7 +650,7 @@ mod tests { #[test] fn test_datetime_ending_in_z() { let actual = parse_datetime("2023-06-03 12:00:01Z").unwrap(); - let expected = "2023-06-03 12:00:01[UTC]".parse::().unwrap(); + let expected = "2023-06-03 12:00:01[UTC]".parse::().unwrap(); assert_eq!(actual, expected); } @@ -668,7 +668,7 @@ mod tests { #[test] fn parsed_datetime_extended_never_equals_zoned() { let extended = parse_datetime("10000-01-01").unwrap(); - let zoned = Zoned::now(); + let zoned = ZonedDateTime::now(); assert_ne!(extended, zoned); } @@ -685,7 +685,7 @@ mod tests { #[test] fn test_parse_datetime_tz_nodelta() { // 1997-01-01 00:00:00 +0000 - let expected = "1997-01-01 00:00:00[UTC]".parse::().unwrap(); + let expected = "1997-01-01 00:00:00[UTC]".parse::().unwrap(); for s in [ "1997-01-01 00:00:00 +0000", @@ -704,7 +704,7 @@ mod tests { #[test] fn test_parse_datetime_notz_nodelta() { - let expected = Zoned::now() + let expected = ZonedDateTime::now() .with() .date(date(1997, 1, 1)) .time(time(0, 0, 0, 0)) @@ -725,7 +725,7 @@ mod tests { #[test] fn test_parse_date_notz_nodelta() { - let expected = Zoned::now() + let expected = ZonedDateTime::now() .with() .date(date(1997, 1, 1)) .time(time(0, 0, 0, 0)) @@ -741,7 +741,7 @@ mod tests { #[test] fn test_parse_datetime_tz_delta() { // 1998-01-01 - let expected = "1998-01-01 00:00:00[UTC]".parse::().unwrap(); + let expected = "1998-01-01 00:00:00[UTC]".parse::().unwrap(); for s in [ "1997-01-01 00:00:00 +0000 +1 year", @@ -759,7 +759,7 @@ mod tests { #[test] fn test_parse_datetime_notz_delta() { - let expected = Zoned::now() + let expected = ZonedDateTime::now() .with() .date(date(1998, 1, 1)) .time(time(0, 0, 0, 0)) @@ -788,7 +788,7 @@ mod tests { #[test] fn test_parse_date_notz_delta() { - let expected = Zoned::now() + let expected = ZonedDateTime::now() .with() .date(date(1998, 1, 1)) .time(time(0, 0, 0, 0)) @@ -821,7 +821,7 @@ mod tests { #[test] fn test_weekday_only() { - let now = Zoned::now(); + let now = ZonedDateTime::now(); let midnight = Time::new(0, 0, 0, 0).unwrap(); let today = now.weekday(); let midnight_today = now.with().time(midnight).build().unwrap(); @@ -847,7 +847,7 @@ mod tests { #[test] fn test_hence_suffix() { - let now: jiff::Zoned = "2026-01-15T12:00:00Z[UTC]".parse().unwrap(); + let now: jiff::ZonedDateTime = "2026-01-15T12:00:00Z[UTC]".parse().unwrap(); for relative in [ "2 months", "year", @@ -972,7 +972,7 @@ mod tests { let base = "2024-06-15 08:30:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); let parsed = parse_datetime_at_date(base, "2024-06-15 08:30:00").unwrap(); assert_eq!(parsed.to_string(), "2024-06-15 08:30:00+00:00"); @@ -983,7 +983,7 @@ mod tests { let base = "2024-06-15 08:30:00.123456789" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); // Parsing "now" at a base with subsecond precision preserves it. let parsed = parse_datetime_at_date(base, "now").unwrap(); @@ -1046,7 +1046,7 @@ mod tests { let base = "2024-01-01 00:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); let parsed = parse_datetime_at_date(base, input).unwrap(); (parsed.unix_epoch_second(), parsed.subsec_nanosecond()) @@ -1107,7 +1107,7 @@ mod tests { #[test] fn extended_values_use_extended_epoch_path() { let parsed = parse_datetime("10000-01-01").unwrap(); - // Year 10000 is beyond jiff::Zoned's representable range, so + // Year 10000 is beyond jiff::ZonedDateTime's representable range, so // parse_datetime must route through the ExtendedDateTime branch // of both accessors. assert!(matches!(parsed, ParsedDateTime::Extended(_))); diff --git a/tests/common/mod.rs b/tests/common/mod.rs index 5980fd32..f2c059cd 100644 --- a/tests/common/mod.rs +++ b/tests/common/mod.rs @@ -3,7 +3,7 @@ use std::env; -use jiff::Zoned; +use jiff::ZonedDateTime; use parse_datetime::{parse_datetime, parse_datetime_at_date}; pub fn check_absolute(input: &str, expected: &str) { @@ -17,7 +17,7 @@ pub fn check_absolute(input: &str, expected: &str) { assert_eq!(parsed.to_string(), expected, "Input value: {input}"); } -pub fn check_relative(now: Zoned, input: &str, expected: &str) { +pub fn check_relative(now: ZonedDateTime, input: &str, expected: &str) { env::set_var("TZ", "UTC0"); let parsed = match parse_datetime_at_date(now, input) { diff --git a/tests/date.rs b/tests/date.rs index 65f8ca32..0ef2f013 100644 --- a/tests/date.rs +++ b/tests/date.rs @@ -104,7 +104,7 @@ fn test_date_omitting_year(#[case] input: &str, #[case] year: u32, #[case] expec let now = format!("{year}-06-01 00:00:00") .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); check_relative(now, input, expected); } @@ -121,7 +121,7 @@ fn test_tz_prefix_with_base_date(#[case] input: &str, #[case] expected: &str) { let base = "2020-06-15 12:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); check_relative(base, input, expected); } @@ -139,7 +139,7 @@ fn test_leap_year_overflow(#[case] base: &str, #[case] input: &str, #[case] expe let now = base .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); check_relative(now, input, expected); } @@ -160,7 +160,7 @@ fn test_month_overflow(#[case] base: &str, #[case] input: &str, #[case] expected let now = base .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); check_relative(now, input, expected); } @@ -174,7 +174,7 @@ fn test_negative_year_operations(#[case] base: &str, #[case] input: &str, #[case let now = base .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); check_relative(now, input, expected); } @@ -193,7 +193,7 @@ fn test_negative_month_operations(#[case] base: &str, #[case] input: &str, #[cas let now = base .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); check_relative(now, input, expected); } @@ -235,7 +235,7 @@ fn test_chained_operations(#[case] base: &str, #[case] input: &str, #[case] expe let now = base .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); check_relative(now, input, expected); } @@ -269,7 +269,7 @@ fn test_multiple_month_skip(#[case] base: &str, #[case] input: &str, #[case] exp let now = base .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); check_relative(now, input, expected); } @@ -344,7 +344,7 @@ fn test_utc_keyword_plus_relative_seconds_across_dst() { let base = "2020-06-15 12:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::get("Europe/Berlin").unwrap()) + .to_zoned_datetime(TimeZone::get("Europe/Berlin").unwrap()) .unwrap(); // A timestamp landing in summer (CEST, UTC+2) while the epoch base is in @@ -378,7 +378,7 @@ fn test_military_j_is_local_time(#[case] base: &str, #[case] expected_offset: i3 let base = base .parse::() .unwrap() - .to_zoned(TimeZone::get("America/New_York").unwrap()) + .to_zoned_datetime(TimeZone::get("America/New_York").unwrap()) .unwrap(); let parsed = parse_datetime::parse_datetime_at_date(base.clone(), "8j") @@ -453,7 +453,7 @@ fn test_zone_item_keeps_time_of_day_with_relative(#[case] input: &str, #[case] e let base = "2026-08-29 11:30:45" .parse::() .unwrap() - .to_zoned(TimeZone::get("America/New_York").unwrap()) + .to_zoned_datetime(TimeZone::get("America/New_York").unwrap()) .unwrap(); let parsed = parse_datetime::parse_datetime_at_date(base, input) @@ -498,7 +498,7 @@ fn test_weekday_ignored_with_explicit_date(#[case] input: &str, #[case] expected let base = "2026-10-01 12:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); let parsed = parse_datetime::parse_datetime_at_date(base, input) diff --git a/tests/large_year.rs b/tests/large_year.rs index 0320c455..40179f53 100644 --- a/tests/large_year.rs +++ b/tests/large_year.rs @@ -21,7 +21,7 @@ fn helper_formats_relative_extended_values() { let base = "2000-01-01 00:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); check_relative(base, "10000-01-01 +1 day", "10000-01-02 00:00:00+00:00"); } diff --git a/tests/time.rs b/tests/time.rs index 65d30334..b4f9e6bf 100644 --- a/tests/time.rs +++ b/tests/time.rs @@ -1,7 +1,7 @@ // For the full copyright and license information, please view the LICENSE // file that was distributed with this source code. -use jiff::{civil::DateTime, tz::TimeZone, Zoned}; +use jiff::{civil::DateTime, tz::TimeZone, ZonedDateTime}; use parse_datetime::parse_datetime_at_date; use rstest::rstest; @@ -13,9 +13,9 @@ use rstest::rstest; // Documentation for the date format can be found at: // https://www.gnu.org/software/coreutils/manual/html_node/Time-of-day-items.html -pub fn check_time(input: &str, expected: &str, format: &str, base: Option) { +pub fn check_time(input: &str, expected: &str, format: &str, base: Option) { std::env::set_var("TZ", "UTC0"); - let now = base.unwrap_or(Zoned::now()); + let now = base.unwrap_or(ZonedDateTime::now()); let parsed = match parse_datetime_at_date(now, input) { Ok(v) => v, Err(e) => panic!("Failed to parse time from value '{input}': {e}"), @@ -205,7 +205,7 @@ fn test_time_correction_with_overflow(#[case] input: &str, #[case] expected: &st let now = "2022-06-10 00:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); check_time(input, expected, "%Y-%m-%d %H:%M:%S", Some(now)); } @@ -259,7 +259,7 @@ fn test_time_months_ago(#[case] input: &str, #[case] expected: &str) { let now = "2026-01-12" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); check_time(input, expected, "%Y-%m-%d", Some(now)); } @@ -275,7 +275,7 @@ fn test_relative_month_time_non_leap_year(#[case] input: &str, #[case] expected: let now = "2026-01-12" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); check_time(input, expected, "%Y-%m-%d", Some(now)); } @@ -292,7 +292,7 @@ fn test_relative_month_time_dest_month_does_not_have_the_day( let now = "2026-01-12" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); check_time(input, expected, "%Y-%m-%d", Some(now)); } @@ -304,7 +304,7 @@ fn test_relative_year_time_leap_year(#[case] input: &str, #[case] expected: &str let now = "2026-01-12" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); check_time(input, expected, "%Y-%m-%d", Some(now)); } @@ -320,7 +320,7 @@ fn test_relative_month_time_leap_year(#[case] input: &str, #[case] expected: &st let now = "2026-01-12" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); check_time(input, expected, "%Y-%m-%d", Some(now)); } @@ -348,7 +348,7 @@ fn test_time_in_months(#[case] input: &str, #[case] expected: &str) { let now = "2026-01-12" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); check_time(input, expected, "%Y-%m-%d", Some(now)); } @@ -417,7 +417,7 @@ fn test_relative_fractional_seconds(#[case] input: &str, #[case] expected: &str) let base = "2026-08-27 12:00:00" .parse::() .unwrap() - .to_zoned(TimeZone::UTC) + .to_zoned_datetime(TimeZone::UTC) .unwrap(); check_time(input, expected, "%H:%M:%S.%N", Some(base));