Rename Territory -> Region for Displayname component (#2895)

* Rename Territory -> Region for Displayname component

* Removing stale files

* Resolving merge conflicts

Author: snktd

experimental/displaynames/src/displaynames.rs

@@ -5,7 +5,7 @@
 //! This module contains types and implementations for the Displaynames component.
 
 use crate::options::*;
-use crate::provider::TerritoryDisplayNamesV1Marker;
+use crate::provider::RegionDisplayNamesV1Marker;
 use icu_provider::prelude::*;
 use icu_provider::{DataError, DataPayload};
 use tinystr::TinyAsciiStr;
@@ -34,7 +34,7 @@ use tinystr::TinyStrError;
 /// ```
 pub struct DisplayNames {
     options: DisplayNamesOptions,
-    data: DataPayload<TerritoryDisplayNamesV1Marker>,
+    data: DataPayload<RegionDisplayNamesV1Marker>,
 }
 
 impl DisplayNames {
@@ -44,7 +44,7 @@ impl DisplayNames {
     /// <div class="stab unstable">
     /// ⚠️ The bounds on this function may change over time, including in SemVer minor releases.
     /// </div>
-    pub fn try_new_region_unstable<D: DataProvider<TerritoryDisplayNamesV1Marker> + ?Sized>(
+    pub fn try_new_region_unstable<D: DataProvider<RegionDisplayNamesV1Marker> + ?Sized>(
         data_provider: &D,
         locale: &DataLocale,
         options: DisplayNamesOptions,

experimental/displaynames/src/provider.rs

@@ -20,7 +20,7 @@ use zerovec::ZeroMap;
 // become inaccessible).
 type UnvalidatedRegion = TinyAsciiStr<3>;
 
-#[icu_provider::data_struct(TerritoryDisplayNamesV1Marker = "displaynames/territories@1")]
+#[icu_provider::data_struct(RegionDisplayNamesV1Marker = "displaynames/regions@1")]
 #[derive(Debug, PartialEq, Clone)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize))]
 #[cfg_attr(
@@ -29,8 +29,8 @@ type UnvalidatedRegion = TinyAsciiStr<3>;
     databake(path = icu_displaynames::provider),
 )]
 #[yoke(prove_covariance_manually)]
-/// TerritoryDisplayNames provides mapping between a region code and locale display name.
-pub struct TerritoryDisplayNamesV1<'data> {
+/// RegionDisplayNames provides mapping between a region code and locale display name.
+pub struct RegionDisplayNamesV1<'data> {
     /// Mapping for region to locale display name.
     #[cfg_attr(feature = "serde", serde(borrow))]
     pub names: ZeroMap<'data, UnvalidatedRegion, str>,

ffi/diplomat/ffi_coverage/tests/missing_apis.txt

@@ -38,8 +38,8 @@ icu::displaynames::options::LanguageDisplay#Enum
 icu::displaynames::options::Style#Enum
 icu::displaynames::provider::LanguageDisplayNamesV1#Struct
 icu::displaynames::provider::LanguageDisplayNamesV1Marker#Struct
-icu::displaynames::provider::TerritoryDisplayNamesV1#Struct
-icu::displaynames::provider::TerritoryDisplayNamesV1Marker#Struct
+icu::displaynames::provider::RegionDisplayNamesV1#Struct
+icu::displaynames::provider::RegionDisplayNamesV1Marker#Struct
 icu::properties::exemplar_chars::load_exemplars_auxiliary#Fn
 icu::properties::exemplar_chars::load_exemplars_index#Fn
 icu::properties::exemplar_chars::load_exemplars_main#Fn

provider/datagen/src/registry.rs

@@ -222,7 +222,7 @@ registry!(
     {
         CaseMappingV1Marker,
         DateSkeletonPatternsV1Marker,
-        TerritoryDisplayNamesV1Marker,
+        RegionDisplayNamesV1Marker,
         LanguageDisplayNamesV1Marker,
         GraphemeClusterBreakDataV1Marker,
         LineBreakDataV1Marker,

provider/datagen/src/transform/cldr/cldr_serde/mod.rs

@@ -19,6 +19,6 @@ pub mod numbering_systems;
 pub mod numbers;
 pub mod parent_locales;
 pub mod plurals;
-pub mod territory_displaynames;
+pub mod region_displaynames;
 pub mod time_zones;
 pub mod week_data;

provider/datagen/src/transform/cldr/cldr_serde/territory_displaynames.rs renamed to provider/datagen/src/transform/cldr/cldr_serde/region_displaynames.rs

@@ -12,14 +12,15 @@ use serde::Deserialize;
 use std::collections::HashMap;
 
 #[derive(PartialEq, Debug, Deserialize)]
-pub struct Territories {
-    pub territories: HashMap<String, String>,
+pub struct Regions {
+    #[serde(rename = "territories")]
+    pub regions: HashMap<String, String>,
 }
 
 #[derive(PartialEq, Debug, Deserialize)]
 pub struct LangDisplayNames {
     #[serde(rename = "localeDisplayNames")]
-    pub localedisplaynames: Territories,
+    pub localedisplaynames: Regions,
 }
 
 #[derive(PartialEq, Debug, Deserialize)]

provider/datagen/src/transform/cldr/displaynames/language.rs

@@ -48,7 +48,7 @@ impl IterableDataProvider<LanguageDisplayNamesV1Marker> for crate::DatagenProvid
     }
 }
 
-/// Substring used to denote alternative region names data variants for a given territory. For example: "BA-alt-short", "TL-alt-variant".
+/// Substring used to denote alternative region names data variants for a given region. For example: "BA-alt-short", "TL-alt-variant".
 const ALT_SUBSTRING: &str = "-alt-";
 
 impl From<&cldr_serde::language_displaynames::Resource> for LanguageDisplayNamesV1<'static> {

provider/datagen/src/transform/cldr/displaynames/mod.rs

@@ -3,4 +3,4 @@
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
 pub mod language;
-pub mod territory;
+pub mod region;

provider/datagen/src/transform/cldr/displaynames/territory.rs renamed to provider/datagen/src/transform/cldr/displaynames/region.rs

@@ -13,31 +13,31 @@ use tinystr::TinyAsciiStr;
 use tinystr::TinyStrError;
 use zerovec::ZeroMap;
 
-impl DataProvider<TerritoryDisplayNamesV1Marker> for crate::DatagenProvider {
+impl DataProvider<RegionDisplayNamesV1Marker> for crate::DatagenProvider {
     fn load(
         &self,
         req: DataRequest,
-    ) -> Result<DataResponse<TerritoryDisplayNamesV1Marker>, DataError> {
+    ) -> Result<DataResponse<RegionDisplayNamesV1Marker>, DataError> {
         let langid = req.locale.get_langid();
 
-        let data: &cldr_serde::territory_displaynames::Resource = self
-            .source
-            .cldr()?
-            .displaynames()
-            .read_and_parse(&langid, "territories.json")?;
+        let data: &cldr_serde::region_displaynames::Resource =
+            self.source
+                .cldr()?
+                .displaynames()
+                .read_and_parse(&langid, "territories.json")?;
 
         Ok(DataResponse {
             metadata: Default::default(),
             payload: Some(DataPayload::from_owned(
-                TerritoryDisplayNamesV1::try_from(data).map_err(|e| {
-                    DataError::custom("data for TerritoryDisplayNames").with_display_context(&e)
+                RegionDisplayNamesV1::try_from(data).map_err(|e| {
+                    DataError::custom("data for RegionDisplayNames").with_display_context(&e)
                 })?,
             )),
         })
     }
 }
 
-impl IterableDataProvider<TerritoryDisplayNamesV1Marker> for crate::DatagenProvider {
+impl IterableDataProvider<RegionDisplayNamesV1Marker> for crate::DatagenProvider {
     fn supported_locales(&self) -> Result<Vec<DataLocale>, DataError> {
         Ok(self
             .source
@@ -49,18 +49,18 @@ impl IterableDataProvider<TerritoryDisplayNamesV1Marker> for crate::DatagenProvi
     }
 }
 
-/// Substring used to denote alternative region names data variants for a given territory. For example: "BA-alt-short", "TL-alt-variant".
+/// Substring used to denote alternative region names data variants for a given region. For example: "BA-alt-short", "TL-alt-variant".
 const ALT_SUBSTRING: &str = "-alt-";
-/// Substring used to denote short region display names data variants for a given territory. For example: "BA-alt-short".
+/// Substring used to denote short region display names data variants for a given region. For example: "BA-alt-short".
 const SHORT_SUBSTRING: &str = "-short";
 
-impl TryFrom<&cldr_serde::territory_displaynames::Resource> for TerritoryDisplayNamesV1<'static> {
+impl TryFrom<&cldr_serde::region_displaynames::Resource> for RegionDisplayNamesV1<'static> {
     type Error = TinyStrError;
-    fn try_from(other: &cldr_serde::territory_displaynames::Resource) -> Result<Self, Self::Error> {
+    fn try_from(other: &cldr_serde::region_displaynames::Resource) -> Result<Self, Self::Error> {
         let mut names = ZeroMap::new();
         let mut short_names = ZeroMap::new();
         for lang_data_entry in other.main.0.iter() {
-            for entry in lang_data_entry.1.localedisplaynames.territories.iter() {
+            for entry in lang_data_entry.1.localedisplaynames.regions.iter() {
                 let mut region = String::from(entry.0);
                 if !region.contains(ALT_SUBSTRING) {
                     match <TinyAsciiStr<3>>::from_str(&region) {
@@ -98,7 +98,7 @@ mod tests {
     fn test_basic() {
         let provider = crate::DatagenProvider::for_test();
 
-        let data: DataPayload<TerritoryDisplayNamesV1Marker> = provider
+        let data: DataPayload<RegionDisplayNamesV1Marker> = provider
             .load(DataRequest {
                 locale: &locale!("en-001").into(),
                 metadata: Default::default(),
@@ -117,7 +117,7 @@ mod tests {
     fn test_basic_short_names() {
         let provider = crate::DatagenProvider::for_test();
 
-        let data: DataPayload<TerritoryDisplayNamesV1Marker> = provider
+        let data: DataPayload<RegionDisplayNamesV1Marker> = provider
             .load(DataRequest {
                 locale: &locale!("en-001").into(),
                 metadata: Default::default(),