Rename data markers in icu_time crate (#6508)

Author: sffc

components/time/src/provider/iana.rs

@@ -29,9 +29,9 @@ pub const NON_REGION_CITY_PREFIX: u8 = b'_';
 icu_provider::data_marker!(
     /// See [`IanaToBcp47Map`]
     ///
-    /// This marker uses a checksum to ensure consistency with [`TimeZoneIanaNamesV1`].
-    TimeZoneIanaMapV1,
-    "time/zone/iana/map/v1",
+    /// This marker uses a checksum to ensure consistency with [`TimezoneIdentifiersIanaExtendedV1`].
+    TimezoneIdentifiersIanaCoreV1,
+    "timezone/identifiers/iana/core/v1",
     IanaToBcp47Map<'static>,
     is_singleton = true,
     has_checksum = true,
@@ -40,9 +40,9 @@ icu_provider::data_marker!(
 icu_provider::data_marker!(
     /// See [`Bcp47ToIanaMap`]
     ///
-    /// This marker uses a checksum to ensure consistency with [`TimeZoneIanaMapV1`].
-    TimeZoneIanaNamesV1,
-    "time/zone/iana/names/v1",
+    /// This marker uses a checksum to ensure consistency with [`TimezoneIdentifiersIanaCoreV1`].
+    TimezoneIdentifiersIanaExtendedV1,
+    "timezone/identifiers/iana/extended/v1",
     IanaNames<'static>,
     is_singleton = true,
     has_checksum = true,

components/time/src/provider/mod.rs

@@ -48,19 +48,19 @@ const _: () = {
         pub use crate as time;
     }
     make_provider!(Baked);
-    impl_time_zone_iana_map_v1!(Baked);
-    impl_time_zone_iana_names_v1!(Baked);
-    impl_time_zone_windows_v1!(Baked);
-    impl_time_zone_offsets_v1!(Baked);
+    impl_timezone_identifiers_iana_extended_v1!(Baked);
+    impl_timezone_identifiers_iana_core_v1!(Baked);
+    impl_timezone_identifiers_windows_v1!(Baked);
+    impl_timezone_variants_offsets_v1!(Baked);
 };
 
 #[cfg(feature = "datagen")]
 /// The latest minimum set of markers required by this component.
 pub const MARKERS: &[DataMarkerInfo] = &[
-    iana::TimeZoneIanaNamesV1::INFO,
-    iana::TimeZoneIanaMapV1::INFO,
-    windows::TimeZoneWindowsV1::INFO,
-    TimeZoneOffsetsV1::INFO,
+    iana::TimezoneIdentifiersIanaExtendedV1::INFO,
+    iana::TimezoneIdentifiersIanaCoreV1::INFO,
+    windows::TimezoneIdentifiersWindowsV1::INFO,
+    TimezoneVariantsOffsetsV1::INFO,
 ];
 
 /// Storage type for storing UTC offsets as eights of an hour.
@@ -163,8 +163,8 @@ icu_provider::data_marker!(
     ///
     /// The values are the standard offset, and the daylight offset *relative to the standard offset*. As such,
     /// if the second value is 0, there is no daylight time.
-    TimeZoneOffsetsV1,
-    "time/zone/offsets/v1",
+    TimezoneVariantsOffsetsV1,
+    "timezone/variants/offsets/v1",
     ZeroMap2d<'static, TimeZone, MinutesSinceEpoch, (EighthsOfHourOffset, EighthsOfHourOffset)>,
     is_singleton = true
 );

components/time/src/provider/windows.rs

@@ -20,8 +20,8 @@ use super::TimeZone;
 
 icu_provider::data_marker!(
     /// See [`WindowsZonesToBcp47Map`].
-    TimeZoneWindowsV1,
-    "time/zone/windows/v1",
+    TimezoneIdentifiersWindowsV1,
+    "timezone/identifiers/windows/v1",
     WindowsZonesToBcp47Map<'static>,
     is_singleton = true,
 );

components/time/src/zone/iana.rs

@@ -9,7 +9,8 @@ use zerovec::vecs::{VarZeroSliceIter, ZeroSliceIter};
 
 use crate::{
     provider::iana::{
-        IanaNames, IanaToBcp47Map, TimeZoneIanaMapV1, TimeZoneIanaNamesV1, NON_REGION_CITY_PREFIX,
+        IanaNames, IanaToBcp47Map, TimezoneIdentifiersIanaCoreV1,
+        TimezoneIdentifiersIanaExtendedV1, NON_REGION_CITY_PREFIX,
     },
     TimeZone,
 };
@@ -65,7 +66,7 @@ use crate::{
 /// ```
 #[derive(Debug, Clone)]
 pub struct IanaParser {
-    data: DataPayload<TimeZoneIanaMapV1>,
+    data: DataPayload<TimezoneIdentifiersIanaCoreV1>,
     checksum: u64,
 }
 
@@ -95,14 +96,14 @@ impl IanaParser {
     #[doc = icu_provider::gen_buffer_unstable_docs!(UNSTABLE, Self::new)]
     pub fn try_new_unstable<P>(provider: &P) -> Result<Self, DataError>
     where
-        P: DataProvider<TimeZoneIanaMapV1> + ?Sized,
+        P: DataProvider<TimezoneIdentifiersIanaCoreV1> + ?Sized,
     {
         let response = provider.load(Default::default())?;
         Ok(Self {
             data: response.payload,
             checksum: response.metadata.checksum.ok_or_else(|| {
                 DataError::custom("Missing checksum")
-                    .with_req(TimeZoneIanaMapV1::INFO, Default::default())
+                    .with_req(TimezoneIdentifiersIanaCoreV1::INFO, Default::default())
             })?,
         })
     }
@@ -151,8 +152,8 @@ impl IanaParserBorrowed<'static> {
     #[cfg(feature = "compiled_data")]
     pub fn new() -> Self {
         Self {
-            data: crate::provider::Baked::SINGLETON_TIME_ZONE_IANA_MAP_V1,
-            checksum: crate::provider::Baked::SINGLETON_TIME_ZONE_IANA_MAP_V1_CHECKSUM,
+            data: crate::provider::Baked::SINGLETON_TIMEZONE_IDENTIFIERS_IANA_CORE_V1,
+            checksum: crate::provider::Baked::SINGLETON_TIMEZONE_IDENTIFIERS_IANA_CORE_V1_CHECKSUM,
         }
     }
 
@@ -258,7 +259,7 @@ impl Iterator for TimeZoneIter<'_> {
 #[derive(Debug, Clone)]
 pub struct IanaParserExtended<I> {
     inner: I,
-    data: DataPayload<TimeZoneIanaNamesV1>,
+    data: DataPayload<TimezoneIdentifiersIanaExtendedV1>,
 }
 
 impl IanaParserExtended<IanaParser> {
@@ -287,7 +288,9 @@ impl IanaParserExtended<IanaParser> {
     #[doc = icu_provider::gen_buffer_unstable_docs!(UNSTABLE, Self::new)]
     pub fn try_new_unstable<P>(provider: &P) -> Result<Self, DataError>
     where
-        P: DataProvider<TimeZoneIanaMapV1> + DataProvider<TimeZoneIanaNamesV1> + ?Sized,
+        P: DataProvider<TimezoneIdentifiersIanaCoreV1>
+            + DataProvider<TimezoneIdentifiersIanaExtendedV1>
+            + ?Sized,
     {
         let parser = IanaParser::try_new_unstable(provider)?;
         Self::try_new_with_parser_unstable(provider, parser)
@@ -309,15 +312,17 @@ where
     #[cfg(feature = "compiled_data")]
     pub fn try_new_with_parser(parser: I) -> Result<Self, DataError> {
         if parser.as_ref().checksum
-            != crate::provider::Baked::SINGLETON_TIME_ZONE_IANA_NAMES_V1_CHECKSUM
+            != crate::provider::Baked::SINGLETON_TIMEZONE_IDENTIFIERS_IANA_EXTENDED_V1_CHECKSUM
         {
-            return Err(DataErrorKind::InconsistentData(TimeZoneIanaMapV1::INFO)
-                .with_marker(TimeZoneIanaNamesV1::INFO));
+            return Err(
+                DataErrorKind::InconsistentData(TimezoneIdentifiersIanaCoreV1::INFO)
+                    .with_marker(TimezoneIdentifiersIanaExtendedV1::INFO),
+            );
         }
         Ok(Self {
             inner: parser,
             data: DataPayload::from_static_ref(
-                crate::provider::Baked::SINGLETON_TIME_ZONE_IANA_NAMES_V1,
+                crate::provider::Baked::SINGLETON_TIMEZONE_IDENTIFIERS_IANA_EXTENDED_V1,
             ),
         })
     }
@@ -334,12 +339,16 @@ where
     #[doc = icu_provider::gen_buffer_unstable_docs!(UNSTABLE, Self::new)]
     pub fn try_new_with_parser_unstable<P>(provider: &P, parser: I) -> Result<Self, DataError>
     where
-        P: DataProvider<TimeZoneIanaMapV1> + DataProvider<TimeZoneIanaNamesV1> + ?Sized,
+        P: DataProvider<TimezoneIdentifiersIanaCoreV1>
+            + DataProvider<TimezoneIdentifiersIanaExtendedV1>
+            + ?Sized,
     {
         let response = provider.load(Default::default())?;
         if Some(parser.as_ref().checksum) != response.metadata.checksum {
-            return Err(DataErrorKind::InconsistentData(TimeZoneIanaMapV1::INFO)
-                .with_marker(TimeZoneIanaNamesV1::INFO));
+            return Err(
+                DataErrorKind::InconsistentData(TimezoneIdentifiersIanaCoreV1::INFO)
+                    .with_marker(TimezoneIdentifiersIanaExtendedV1::INFO),
+            );
         }
         Ok(Self {
             inner: parser,
@@ -384,12 +393,12 @@ impl IanaParserExtendedBorrowed<'static> {
     #[cfg(feature = "compiled_data")]
     pub fn new() -> Self {
         const _: () = assert!(
-            crate::provider::Baked::SINGLETON_TIME_ZONE_IANA_MAP_V1_CHECKSUM
-                == crate::provider::Baked::SINGLETON_TIME_ZONE_IANA_NAMES_V1_CHECKSUM,
+            crate::provider::Baked::SINGLETON_TIMEZONE_IDENTIFIERS_IANA_CORE_V1_CHECKSUM
+                == crate::provider::Baked::SINGLETON_TIMEZONE_IDENTIFIERS_IANA_EXTENDED_V1_CHECKSUM,
         );
         Self {
             inner: IanaParserBorrowed::new(),
-            data: crate::provider::Baked::SINGLETON_TIME_ZONE_IANA_NAMES_V1,
+            data: crate::provider::Baked::SINGLETON_TIMEZONE_IDENTIFIERS_IANA_EXTENDED_V1,
         }
     }
 

components/time/src/zone/offset.rs

@@ -4,7 +4,7 @@
 
 use core::str::FromStr;
 
-use crate::provider::{EighthsOfHourOffset, MinutesSinceEpoch, TimeZoneOffsetsV1};
+use crate::provider::{EighthsOfHourOffset, MinutesSinceEpoch, TimezoneVariantsOffsetsV1};
 use crate::{Time, TimeZone};
 use icu_calendar::Date;
 use icu_calendar::Iso;
@@ -197,7 +197,7 @@ impl FromStr for UtcOffset {
 /// [data provider]: icu_provider
 #[derive(Debug)]
 pub struct VariantOffsetsCalculator {
-    pub(super) offset_period: DataPayload<TimeZoneOffsetsV1>,
+    pub(super) offset_period: DataPayload<TimezoneVariantsOffsetsV1>,
 }
 
 /// The borrowed version of a  [`VariantOffsetsCalculator`]
@@ -225,7 +225,7 @@ impl VariantOffsetsCalculator {
     #[allow(clippy::new_ret_no_self)]
     pub const fn new() -> VariantOffsetsCalculatorBorrowed<'static> {
         VariantOffsetsCalculatorBorrowed {
-            offset_period: crate::provider::Baked::SINGLETON_TIME_ZONE_OFFSETS_V1,
+            offset_period: crate::provider::Baked::SINGLETON_TIMEZONE_VARIANTS_OFFSETS_V1,
         }
     }
 
@@ -240,7 +240,7 @@ impl VariantOffsetsCalculator {
 
     #[doc = icu_provider::gen_buffer_unstable_docs!(UNSTABLE, Self::new)]
     pub fn try_new_unstable(
-        provider: &(impl DataProvider<TimeZoneOffsetsV1> + ?Sized),
+        provider: &(impl DataProvider<TimezoneVariantsOffsetsV1> + ?Sized),
     ) -> Result<Self, DataError> {
         let metazone_period = provider.load(Default::default())?.payload;
         Ok(Self {
@@ -268,7 +268,7 @@ impl VariantOffsetsCalculatorBorrowed<'static> {
     #[inline]
     pub const fn new() -> Self {
         Self {
-            offset_period: crate::provider::Baked::SINGLETON_TIME_ZONE_OFFSETS_V1,
+            offset_period: crate::provider::Baked::SINGLETON_TIMEZONE_VARIANTS_OFFSETS_V1,
         }
     }
 

components/time/src/zone/windows.rs

@@ -9,7 +9,7 @@ use icu_locale_core::subtags::{region, Region};
 use icu_provider::{DataError, DataPayload, DataProvider};
 
 use crate::{
-    provider::windows::{TimeZoneWindowsV1, WindowsZonesToBcp47Map},
+    provider::windows::{TimezoneIdentifiersWindowsV1, WindowsZonesToBcp47Map},
     TimeZone,
 };
 
@@ -35,7 +35,7 @@ use crate::{
 /// then the territory will default to the M.49 World Code, `001`.
 #[derive(Debug)]
 pub struct WindowsParser {
-    data: DataPayload<TimeZoneWindowsV1>,
+    data: DataPayload<TimezoneIdentifiersWindowsV1>,
 }
 
 impl WindowsParser {
@@ -58,7 +58,7 @@ impl WindowsParser {
     #[doc = icu_provider::gen_buffer_unstable_docs!(UNSTABLE, Self::new)]
     pub fn try_new_unstable<P>(provider: &P) -> Result<Self, DataError>
     where
-        P: DataProvider<TimeZoneWindowsV1> + ?Sized,
+        P: DataProvider<TimezoneIdentifiersWindowsV1> + ?Sized,
     {
         let data = provider.load(Default::default())?.payload;
         Ok(Self { data })
@@ -106,7 +106,7 @@ impl WindowsParserBorrowed<'_> {
     #[cfg(feature = "compiled_data")]
     pub fn new() -> Self {
         WindowsParserBorrowed {
-            data: crate::provider::Baked::SINGLETON_TIME_ZONE_WINDOWS_V1,
+            data: crate::provider::Baked::SINGLETON_TIMEZONE_IDENTIFIERS_WINDOWS_V1,
         }
     }