Split date and time data keys.

This is a first step towards fixing unicode-org#380.

Author: dminor

components/datetime/src/any.rs

@@ -16,7 +16,10 @@ use icu_locid::Locale;
 use icu_provider::prelude::*;
 
 use crate::provider::{
-    calendar::{DatePatternsV1Marker, DateSkeletonPatternsV1Marker, DateSymbolsV1Marker},
+    calendar::{
+        DatePatternsV1Marker, DateSkeletonPatternsV1Marker, DateSymbolsV1Marker,
+        TimePatternsV1Marker,
+    },
     week_data::WeekDataV1Marker,
 };
 use crate::{date::DateTimeInput, DateTimeFormatError, FormattedDateTime};
@@ -70,8 +73,9 @@ impl AnyDateTimeFormat {
     /// Construct a new [`AnyDateTimeFormat`] from a data provider that implements
     /// [`AnyProvider`].
     ///
-    /// The provider must be able to provide data for the following keys: `datetime/symbols@1`, `datetime/lengths@1`,
-    /// `datetime/symbols@1`, `datetime/skeletons@1`, `datetime/week_data@1`, and `plurals/ordinals@1`.
+    /// The provider must be able to provide data for the following keys: `datetime/symbols@1`, `datetime/timelengths@1`,
+    /// `datetime/timelengths@1`, `datetime/symbols@1`, `datetime/skeletons@1`, `datetime/week_data@1`, and `plurals/ordinals@1`.
+
     ///
     /// Furthermore, based on the type of calendar used, one of the following data keys may be necessary:
     ///
@@ -92,8 +96,8 @@ impl AnyDateTimeFormat {
     /// Construct a new [`AnyDateTimeFormat`] from a data provider that implements
     /// [`BufferProvider`].
     ///
-    /// The provider must be able to provide data for the following keys: `datetime/symbols@1`, `datetime/lengths@1`,
-    /// `datetime/symbols@1`, `datetime/skeletons@1`, `datetime/week_data@1`, and `plurals/ordinals@1`.
+    /// The provider must be able to provide data for the following keys: `datetime/symbols@1`, `datetime/datelengths@1`,
+    /// `datetime/timelengths@1`, `datetime/symbols@1`, `datetime/skeletons@1`, `datetime/week_data@1`, and `plurals/ordinals@1`.
     ///
     /// Furthermore, based on the type of calendar used, one of the following data keys may be necessary:
     ///
@@ -176,6 +180,7 @@ impl AnyDateTimeFormat {
         T: Into<Locale>,
         P: ResourceProvider<DateSymbolsV1Marker>
             + ResourceProvider<DatePatternsV1Marker>
+            + ResourceProvider<TimePatternsV1Marker>
             + ResourceProvider<DateSkeletonPatternsV1Marker>
             + ResourceProvider<OrdinalV1Marker>
             + ResourceProvider<WeekDataV1Marker>

components/datetime/src/datetime.rs

@@ -7,7 +7,10 @@
 
 use crate::{
     options::{components, DateTimeFormatOptions},
-    provider::calendar::{DatePatternsV1Marker, DateSkeletonPatternsV1Marker, DateSymbolsV1Marker},
+    provider::calendar::{
+        DatePatternsV1Marker, DateSkeletonPatternsV1Marker, DateSymbolsV1Marker,
+        TimePatternsV1Marker,
+    },
     provider::week_data::WeekDataV1Marker,
     raw,
 };
@@ -88,6 +91,7 @@ impl<C: CldrCalendar> DateTimeFormat<C> {
     where
         D: ResourceProvider<DateSymbolsV1Marker>
             + ResourceProvider<DatePatternsV1Marker>
+            + ResourceProvider<TimePatternsV1Marker>
             + ResourceProvider<DateSkeletonPatternsV1Marker>
             + ResourceProvider<DecimalSymbolsV1Marker>
             + ResourceProvider<OrdinalV1Marker>

components/datetime/src/provider/calendar/mod.rs

@@ -13,7 +13,7 @@ use icu_provider::{yoke, zerofrom};
 pub use skeletons::*;
 pub use symbols::*;
 
-#[icu_provider::data_struct(DatePatternsV1Marker = "datetime/lengths@1")]
+#[icu_provider::data_struct(DatePatternsV1Marker = "datetime/datelengths@1")]
 #[derive(Debug, PartialEq, Clone, Default)]
 #[cfg_attr(
     feature = "datagen",
@@ -25,6 +25,20 @@ pub struct DatePatternsV1<'data> {
     #[cfg_attr(feature = "serde", serde(borrow))]
     pub date: patterns::LengthPatternsV1<'data>,
 
+    /// Patterns used to combine date and time length patterns into full date_time patterns.
+    #[cfg_attr(feature = "serde", serde(borrow))]
+    pub length_combinations: patterns::GenericLengthPatternsV1<'data>,
+}
+
+#[icu_provider::data_struct(TimePatternsV1Marker = "datetime/timelengths@1")]
+#[derive(Debug, PartialEq, Clone, Default)]
+#[cfg_attr(
+    feature = "datagen",
+    derive(serde::Serialize, crabbake::Bakeable),
+    crabbake(path = icu_datetime::provider::calendar),
+)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
+pub struct TimePatternsV1<'data> {
     /// These patterns are common uses of time formatting, broken down by the length of the
     /// pattern. Users can override the hour cycle with a preference, so there are two
     /// pattern groups stored here. Note that the pattern will contain either h11 or h12.
@@ -39,10 +53,6 @@ pub struct DatePatternsV1<'data> {
 
     /// By default a locale will prefer one hour cycle type over another.
     pub preferred_hour_cycle: pattern::CoarseHourCycle,
-
-    /// Patterns used to combine date and time length patterns into full date_time patterns.
-    #[cfg_attr(feature = "serde", serde(borrow))]
-    pub length_combinations: patterns::GenericLengthPatternsV1<'data>,
 }
 
 pub mod patterns {

components/datetime/src/provider/date_time.rs

@@ -9,11 +9,11 @@ use crate::options::{components, length, preferences, DateTimeFormatOptions};
 use crate::pattern::{hour_cycle, runtime::PatternPlurals};
 use crate::provider;
 use crate::provider::calendar::patterns::PatternPluralsV1;
-use crate::provider::calendar::DatePatternsV1;
 use crate::provider::calendar::{
     patterns::PatternPluralsFromPatternsV1Marker, DatePatternsV1Marker,
-    DateSkeletonPatternsV1Marker,
+    DateSkeletonPatternsV1Marker, TimePatternsV1Marker,
 };
+use crate::provider::calendar::{DatePatternsV1, TimePatternsV1};
 use crate::skeleton;
 use icu_calendar::types::Era;
 use icu_locid::Locale;
@@ -22,7 +22,7 @@ use icu_provider::prelude::*;
 type Result<T> = core::result::Result<T, DateTimeFormatError>;
 
 fn pattern_for_time_length_inner<'data>(
-    data: DatePatternsV1<'data>,
+    data: TimePatternsV1<'data>,
     length: length::Time,
     preferences: &Option<preferences::Bag>,
 ) -> PatternPlurals<'data> {
@@ -81,6 +81,7 @@ impl<D: ?Sized> Clone for PatternSelector<'_, D> {
 impl<D> PatternSelector<'_, D>
 where
     D: ResourceProvider<DatePatternsV1Marker>
+        + ResourceProvider<TimePatternsV1Marker>
         + ResourceProvider<DateSkeletonPatternsV1Marker>
         + ?Sized,
 {
@@ -123,7 +124,7 @@ where
         self,
         length: length::Date,
     ) -> Result<DataPayload<PatternPluralsFromPatternsV1Marker>> {
-        let patterns_data = self.patterns_data_payload()?;
+        let patterns_data = self.date_patterns_data_payload()?;
         Ok(
             patterns_data.map_project_with_capture(length, |data, length, _| {
                 let pattern = pattern_for_date_length_inner(data, length);
@@ -140,7 +141,7 @@ where
         length: length::Time,
         preferences: Option<preferences::Bag>,
     ) -> Result<DataPayload<PatternPluralsFromPatternsV1Marker>> {
-        let patterns_data = self.patterns_data_payload()?;
+        let patterns_data = self.time_patterns_data_payload()?;
         Ok(patterns_data.map_project_with_capture(
             (length, preferences),
             |data, (length, preferences), _| {
@@ -158,23 +159,29 @@ where
         time_length: length::Time,
         preferences: Option<preferences::Bag>,
     ) -> Result<DataPayload<PatternPluralsFromPatternsV1Marker>> {
-        let patterns_data = self.patterns_data_payload()?;
-        patterns_data.try_map_project_with_capture(
-            (date_length, time_length, preferences),
-            |data, (date_length, time_length, preferences), _| {
+        let time_patterns_data = self.time_patterns_data_payload()?;
+
+        let date_patterns_data = self.date_patterns_data_payload()?;
+        date_patterns_data.try_map_project_with_capture(
+            (date_length, time_length, preferences, time_patterns_data),
+            |data, (date_length, time_length, preferences, time_patterns_data), _| {
                 let date = pattern_for_date_length_inner(data.clone(), date_length)
                     .expect_pattern("Lengths are single patterns");
-                let time = pattern_for_time_length_inner(data.clone(), time_length, &preferences)
-                    .expect_pattern("Lengths are single patterns");
 
                 let pattern = match date_length {
                     length::Date::Full => data.length_combinations.full,
                     length::Date::Long => data.length_combinations.long,
                     length::Date::Medium => data.length_combinations.medium,
                     length::Date::Short => data.length_combinations.short,
                 };
-                let pattern = pattern.combined(date, time)?;
-                Ok(PatternPlurals::from(pattern).into())
+
+                let time = pattern_for_time_length_inner(
+                    time_patterns_data.get().clone(),
+                    time_length,
+                    &preferences,
+                )
+                .expect_pattern("Lengths are single patterns");
+                Ok(PatternPlurals::from(pattern.combined(date, time)?).into())
             },
         )
     }
@@ -185,7 +192,7 @@ where
         components: &components::Bag,
     ) -> Result<DataPayload<PatternPluralsFromPatternsV1Marker>> {
         let skeletons_data = self.skeleton_data_payload()?;
-        let patterns_data = self.patterns_data_payload()?;
+        let patterns_data = self.date_patterns_data_payload()?;
         // Not all skeletons are currently supported.
         let requested_fields = components.to_vec_fields();
         let patterns = match skeleton::create_best_pattern_for_fields(
@@ -204,7 +211,18 @@ where
             patterns.into_owned(),
         )))
     }
-    fn patterns_data_payload(self) -> Result<DataPayload<DatePatternsV1Marker>> {
+    fn date_patterns_data_payload(self) -> Result<DataPayload<DatePatternsV1Marker>> {
+        let data = self
+            .data_provider
+            .load_resource(&DataRequest {
+                options: ResourceOptions::from(self.locale),
+                metadata: Default::default(),
+            })?
+            .take_payload()?;
+        Ok(data)
+    }
+
+    fn time_patterns_data_payload(self) -> Result<DataPayload<TimePatternsV1Marker>> {
         let data = self
             .data_provider
             .load_resource(&DataRequest {

components/datetime/src/raw/datetime.rs

@@ -10,7 +10,10 @@ use crate::{
     options::components,
     options::DateTimeFormatOptions,
     provider::calendar::patterns::PatternPluralsFromPatternsV1Marker,
-    provider::calendar::{DatePatternsV1Marker, DateSkeletonPatternsV1Marker, DateSymbolsV1Marker},
+    provider::calendar::{
+        DatePatternsV1Marker, DateSkeletonPatternsV1Marker, DateSymbolsV1Marker,
+        TimePatternsV1Marker,
+    },
     provider::week_data::WeekDataV1Marker,
 };
 use alloc::string::String;
@@ -54,6 +57,7 @@ impl DateTimeFormat {
     where
         D: ResourceProvider<DateSymbolsV1Marker>
             + ResourceProvider<DatePatternsV1Marker>
+            + ResourceProvider<TimePatternsV1Marker>
             + ResourceProvider<DateSkeletonPatternsV1Marker>
             + ResourceProvider<DecimalSymbolsV1Marker>
             + ResourceProvider<OrdinalV1Marker>

components/datetime/src/raw/zoned_datetime.rs

@@ -22,7 +22,10 @@ use crate::{
     pattern::runtime::PatternPlurals,
     provider::{
         self,
-        calendar::{DatePatternsV1Marker, DateSkeletonPatternsV1Marker, DateSymbolsV1Marker},
+        calendar::{
+            DatePatternsV1Marker, DateSkeletonPatternsV1Marker, DateSymbolsV1Marker,
+            TimePatternsV1Marker,
+        },
         week_data::WeekDataV1Marker,
     },
     raw,
@@ -56,6 +59,7 @@ impl ZonedDateTimeFormat {
     where
         DP: ResourceProvider<DateSymbolsV1Marker>
             + ResourceProvider<DatePatternsV1Marker>
+            + ResourceProvider<TimePatternsV1Marker>
             + ResourceProvider<DateSkeletonPatternsV1Marker>
             + ResourceProvider<WeekDataV1Marker>
             + ?Sized,

components/datetime/src/zoned_datetime.rs

@@ -15,7 +15,10 @@ use crate::{
     options::DateTimeFormatOptions,
     provider::{
         self,
-        calendar::{DatePatternsV1Marker, DateSkeletonPatternsV1Marker, DateSymbolsV1Marker},
+        calendar::{
+            DatePatternsV1Marker, DateSkeletonPatternsV1Marker, DateSymbolsV1Marker,
+            TimePatternsV1Marker,
+        },
         week_data::WeekDataV1Marker,
     },
     raw,
@@ -121,6 +124,7 @@ impl<C: CldrCalendar> ZonedDateTimeFormat<C> {
         L: Into<Locale>,
         DP: ResourceProvider<DateSymbolsV1Marker>
             + ResourceProvider<DatePatternsV1Marker>
+            + ResourceProvider<TimePatternsV1Marker>
             + ResourceProvider<DateSkeletonPatternsV1Marker>
             + ResourceProvider<WeekDataV1Marker>
             + ?Sized,

components/datetime/tests/datetime.rs

@@ -16,7 +16,10 @@ use icu_datetime::{
     mock::{parse_gregorian_from_str, zoned_datetime::MockZonedDateTime},
     pattern::runtime,
     provider::{
-        calendar::{DatePatternsV1Marker, DateSkeletonPatternsV1Marker, DateSymbolsV1Marker},
+        calendar::{
+            DatePatternsV1Marker, DateSkeletonPatternsV1Marker, DateSymbolsV1Marker,
+            TimePatternsV1Marker,
+        },
         week_data::WeekDataV1Marker,
     },
     time_zone::{TimeZoneFormat, TimeZoneFormatOptions},
@@ -145,6 +148,7 @@ fn assert_fixture_element<A, D>(
     A::Calendar: CldrCalendar,
     D: ResourceProvider<DateSymbolsV1Marker>
         + ResourceProvider<DatePatternsV1Marker>
+        + ResourceProvider<TimePatternsV1Marker>
         + ResourceProvider<DateSkeletonPatternsV1Marker>
         + ResourceProvider<DecimalSymbolsV1Marker>
         + ResourceProvider<OrdinalV1Marker>
@@ -234,15 +238,26 @@ fn test_dayperiod_patterns() {
             .unicode
             .keywords
             .set(unicode_ext_key!("ca"), unicode_ext_value!("gregory"));
-        let mut patterns_data: DataPayload<DatePatternsV1Marker> = provider
+        let mut date_patterns_data: DataPayload<DatePatternsV1Marker> = provider
             .load_resource(&DataRequest {
                 options: ResourceOptions::from(&locale),
                 metadata: Default::default(),
             })
             .unwrap()
             .take_payload()
             .unwrap();
-        patterns_data.with_mut(|data| {
+        date_patterns_data.with_mut(|data| {
+            data.length_combinations.long = "{0}".parse().unwrap();
+        });
+        let mut time_patterns_data: DataPayload<TimePatternsV1Marker> = provider
+            .load_resource(&DataRequest {
+                options: ResourceOptions::from(&locale),
+                metadata: Default::default(),
+            })
+            .unwrap()
+            .take_payload()
+            .unwrap();
+        date_patterns_data.with_mut(|data| {
             data.length_combinations.long = "{0}".parse().unwrap();
         });
         let symbols_data: DataPayload<DateSymbolsV1Marker> = provider
@@ -284,7 +299,7 @@ fn test_dayperiod_patterns() {
                     for pattern_input in patterns {
                         let new_pattern1: runtime::Pattern = pattern_input.parse().unwrap();
                         let new_pattern2: runtime::Pattern = pattern_input.parse().unwrap();
-                        patterns_data.with_mut(move |data| {
+                        time_patterns_data.with_mut(move |data| {
                             data.time_h11_h12.long = new_pattern1;
                             data.time_h23_h24.long = new_pattern2;
                         });
@@ -300,7 +315,11 @@ fn test_dayperiod_patterns() {
                                 },
                                 AnyPayloadProvider {
                                     key: DatePatternsV1Marker::KEY,
-                                    data: patterns_data.clone().wrap_into_any_payload(),
+                                    data: date_patterns_data.clone().wrap_into_any_payload(),
+                                },
+                                AnyPayloadProvider {
+                                    key: TimePatternsV1Marker::KEY,
+                                    data: time_patterns_data.clone().wrap_into_any_payload(),
                                 },
                                 AnyPayloadProvider {
                                     key: WeekDataV1Marker::KEY,
@@ -406,7 +425,15 @@ fn test_time_zone_patterns() {
         datetime.time_zone.metazone_id = config.metazone_id.take().map(MetaZoneId);
         datetime.time_zone.time_variant = config.time_variant.take();
 
-        let mut patterns_data: DataPayload<DatePatternsV1Marker> = date_provider
+        let mut date_patterns_data: DataPayload<DatePatternsV1Marker> = date_provider
+            .load_resource(&DataRequest {
+                options: ResourceOptions::from(&locale),
+                metadata: Default::default(),
+            })
+            .unwrap()
+            .take_payload()
+            .unwrap();
+        let mut time_patterns_data: DataPayload<TimePatternsV1Marker> = date_provider
             .load_resource(&DataRequest {
                 options: ResourceOptions::from(&locale),
                 metadata: Default::default(),
@@ -439,7 +466,7 @@ fn test_time_zone_patterns() {
             .take_payload()
             .unwrap();
 
-        patterns_data.with_mut(|data| {
+        date_patterns_data.with_mut(|data| {
             data.length_combinations.long = "{0}".parse().unwrap();
         });
 
@@ -453,7 +480,7 @@ fn test_time_zone_patterns() {
             for pattern_input in patterns {
                 let new_pattern1: runtime::Pattern = pattern_input.parse().unwrap();
                 let new_pattern2: runtime::Pattern = pattern_input.parse().unwrap();
-                patterns_data.with_mut(move |data| {
+                time_patterns_data.with_mut(move |data| {
                     data.time_h11_h12.long = new_pattern1;
                     data.time_h23_h24.long = new_pattern2;
                 });
@@ -469,7 +496,11 @@ fn test_time_zone_patterns() {
                         },
                         AnyPayloadProvider {
                             key: DatePatternsV1Marker::KEY,
-                            data: patterns_data.clone().wrap_into_any_payload(),
+                            data: date_patterns_data.clone().wrap_into_any_payload(),
+                        },
+                        AnyPayloadProvider {
+                            key: TimePatternsV1Marker::KEY,
+                            data: time_patterns_data.clone().wrap_into_any_payload(),
                         },
                         AnyPayloadProvider {
                             key: WeekDataV1Marker::KEY,