Make TimeZoneInfo more strict (#5700)

unicode-org · Oct 18, 2024 · 5ad31bf · 5ad31bf
1 parent 3372ea7
commit 5ad31bf
Show file tree

Hide file tree

Showing 35 changed files with 949 additions and 338 deletions.
diff --git a/components/datetime/benches/datetime.rs b/components/datetime/benches/datetime.rs
@@ -7,9 +7,9 @@ mod fixtures;
 use criterion::{criterion_group, criterion_main, Criterion};
 use icu_datetime::neo::TypedNeoFormatter;
 
-use icu_calendar::{DateTime, Gregorian};
+use icu_calendar::{Date, DateTime, Gregorian, Time};
 use icu_locale_core::Locale;
-use icu_timezone::{CustomZonedDateTime, TimeZoneInfo};
+use icu_timezone::{CustomZonedDateTime, TimeZoneInfo, ZoneVariant};
 use writeable::TryWriteable;
 
 #[path = "../tests/mock.rs"]
@@ -23,7 +23,7 @@ fn datetime_benches(c: &mut Criterion) {
         group.bench_function(format!("semantic/{name}"), |b| {
             b.iter(|| {
                 for fx in &fxs.0 {
-                    let datetimes: Vec<CustomZonedDateTime<Gregorian>> = fx
+                    let datetimes: Vec<CustomZonedDateTime<Gregorian, _>> = fx
                         .values
                         .iter()
                         .map(move |value| {
@@ -35,7 +35,9 @@ fn datetime_benches(c: &mut Criterion) {
                                     date,
                                     time,
                                     // zone is unused but we need to make the types match
-                                    zone: TimeZoneInfo::utc(),
+                                    zone: TimeZoneInfo::utc()
+                                        .at_time((Date::unix_epoch(), Time::midnight()))
+                                        .with_zone_variant(ZoneVariant::standard()),
                                 }
                             }
                         })

diff --git a/components/datetime/src/format/neo.rs b/components/datetime/src/format/neo.rs
@@ -365,13 +365,13 @@ size_test!(
 /// use icu::datetime::{DateTimeWriteError, TypedDateTimeNames};
 /// use icu::datetime::fields::{Field, FieldLength, FieldSymbol, Weekday};
 /// use icu::datetime::neo_pattern::DateTimePattern;
-/// use icu::datetime::neo_skeleton::NeoTimeZoneSkeleton;
+/// use icu::datetime::neo_marker::NeoTimeZoneOffsetMarker;
 /// use icu::locale::locale;
 /// use icu::timezone::TimeZoneInfo;
 /// use writeable::{Part, assert_try_writeable_parts_eq};
 ///
 /// // Create an instance that can format abbreviated month, weekday, and day period names:
-/// let mut names: TypedDateTimeNames<Gregorian, NeoTimeZoneSkeleton> =
+/// let mut names: TypedDateTimeNames<Gregorian, NeoTimeZoneOffsetMarker> =
 ///     TypedDateTimeNames::try_new(&locale!("en").into()).unwrap();
 ///
 /// // Create a pattern from a pattern string:

diff --git a/components/datetime/src/input.rs b/components/datetime/src/input.rs
@@ -6,9 +6,9 @@
 //! formatting operations.
 
 use crate::neo_marker::{DateInputMarkers, GetField, TimeMarkers, ZoneMarkers};
-use crate::scaffold::IntoOption;
 use icu_calendar::any_calendar::AnyCalendarKind;
 use icu_calendar::{Date, Iso, Time};
+use icu_timezone::scaffold::IntoOption;
 use icu_timezone::{TimeZoneBcp47Id, UtcOffset, ZoneVariant};
 
 // TODO(#2630) fix up imports to directly import from icu_calendar

diff --git a/components/datetime/src/neo.rs b/components/datetime/src/neo.rs
@@ -34,6 +34,7 @@ use icu_calendar::provider::{
 use icu_calendar::AnyCalendar;
 use icu_decimal::provider::DecimalSymbolsV1Marker;
 use icu_provider::prelude::*;
+use icu_timezone::scaffold::IntoOption;
 use writeable::TryWriteable;
 
 /// Helper macro for generating any/buffer constructors in this file.