don't use ZeroMap2d

unicode-org · Oct 30, 2024 · dd78c5b · dd78c5b
1 parent 88a1a54
commit dd78c5b
Show file tree

Hide file tree

Showing 6 changed files with 742 additions and 742 deletions.
diff --git a/components/datetime/src/provider/time_zones.rs b/components/datetime/src/provider/time_zones.rs
@@ -170,10 +170,10 @@ pub struct MetazoneGenericNamesV1<'data> {
 pub struct MetazoneSpecificNamesV1<'data> {
     /// The default mapping between metazone id and localized metazone name.
     #[cfg_attr(feature = "serde", serde(borrow))]
-    pub defaults: ZeroMap2d<'data, MetazoneId, ZoneVariant, str>,
+    pub defaults: ZeroMap<'data, (MetazoneId, ZoneVariant), str>,
     /// The override mapping between timezone id and localized metazone name.
     #[cfg_attr(feature = "serde", serde(borrow))]
-    pub overrides: ZeroMap2d<'data, TimeZoneBcp47Id, ZoneVariant, str>,
+    pub overrides: ZeroMap<'data, (TimeZoneBcp47Id, ZoneVariant), str>,
 }
 
 /// Metazone ID in a compact format

diff --git a/components/datetime/src/time_zone.rs b/components/datetime/src/time_zone.rs
@@ -436,8 +436,8 @@ impl FormatTimeZone for SpecificNonLocationFormat {
         let Some(name) = metazone(time_zone_id, local_time, metazone_period).and_then(|mz| {
             names
                 .overrides
-                .get_2d(&time_zone_id, &zone_variant)
-                .or_else(|| names.defaults.get_2d(&mz, &zone_variant))
+                .get(&(time_zone_id, zone_variant))
+                .or_else(|| names.defaults.get(&(mz, zone_variant)))
         }) else {
             return Ok(Err(FormatTimeZoneError::Fallback));
         };

diff --git a/provider/data/datetime/data/metazone_specific_names_long_v1_marker.rs.data b/provider/data/datetime/data/metazone_specific_names_long_v1_marker.rs.data