Restructure displaynames files in cldr_serde. (#3442)

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

@@ -0,0 +1,8 @@
+// This file is part of ICU4X. For terms of use, please see the file
+// called LICENSE at the top level of the ICU4X source tree
+// (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
+
+pub mod language;
+pub mod region;
+pub mod script;
+pub mod variant;

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

@@ -11,17 +11,14 @@ pub mod aliases;
 pub mod ca;
 pub mod coverage_levels;
 pub mod date_fields;
+pub mod displaynames;
 pub mod exemplar_chars;
 pub mod japanese;
-pub mod language_displaynames;
 pub mod likely_subtags;
 pub mod list_patterns;
 pub mod numbering_systems;
 pub mod numbers;
 pub mod parent_locales;
 pub mod plurals;
-pub mod region_displaynames;
-pub mod script_displaynames;
 pub mod time_zones;
-pub mod variant_displaynames;
 pub mod week_data;

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

@@ -18,7 +18,7 @@ impl DataProvider<LanguageDisplayNamesV1Marker> for crate::DatagenProvider {
  ) -> Result<DataResponse<LanguageDisplayNamesV1Marker>, DataError> {
  let langid = req.locale.get_langid();
 
- let data: &cldr_serde::language_displaynames::Resource = self
+ let data: &cldr_serde::displaynames::language::Resource = self
  .source
  .cldr()?
  .displaynames()
@@ -41,7 +41,7 @@ impl DataProvider<LocaleDisplayNamesV1Marker> for crate::DatagenProvider {
  ) -> Result<DataResponse<LocaleDisplayNamesV1Marker>, DataError> {
  let langid = req.locale.get_langid();
 
- let data: &cldr_serde::language_displaynames::Resource = self
+ let data: &cldr_serde::displaynames::language::Resource = self
  .source
  .cldr()?
  .displaynames()
@@ -111,8 +111,8 @@ const ALT_LONG_SUBSTRING: &str = "-alt-long";
 /// Substring used to denote menu display names data variants for a given language. For example: "az-alt-menu".
 const ALT_MENU_SUBSTRING: &str = "-alt-menu";
 
-impl From<&cldr_serde::language_displaynames::Resource> for LanguageDisplayNamesV1<'static> {
- fn from(other: &cldr_serde::language_displaynames::Resource) -> Self {
+impl From<&cldr_serde::displaynames::language::Resource> for LanguageDisplayNamesV1<'static> {
+ fn from(other: &cldr_serde::displaynames::language::Resource) -> Self {
  let mut names = BTreeMap::new();
  let mut short_names = BTreeMap::new();
  let mut long_names = BTreeMap::new();
@@ -162,8 +162,8 @@ impl From<&cldr_serde::language_displaynames::Resource> for LanguageDisplayNames
  }
 }
 
-impl From<&cldr_serde::language_displaynames::Resource> for LocaleDisplayNamesV1<'static> {
- fn from(other: &cldr_serde::language_displaynames::Resource) -> Self {
+impl From<&cldr_serde::displaynames::language::Resource> for LocaleDisplayNamesV1<'static> {
+ fn from(other: &cldr_serde::displaynames::language::Resource) -> Self {
  let mut names = BTreeMap::new();
  let mut short_names = BTreeMap::new();
  let mut long_names = BTreeMap::new();

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

@@ -18,11 +18,11 @@ impl DataProvider<RegionDisplayNamesV1Marker> for crate::DatagenProvider {
  ) -> Result<DataResponse<RegionDisplayNamesV1Marker>, DataError> {
  let langid = req.locale.get_langid();
 
- let data: &cldr_serde::region_displaynames::Resource =
- self.source
-  .cldr()?
-  .displaynames()
-  .read_and_parse(&langid, "territories.json")?;
+ let data: &cldr_serde::displaynames::region::Resource = self
+ .source
+ .cldr()?
+ .displaynames()
+ .read_and_parse(&langid, "territories.json")?;
 
  Ok(DataResponse {
  metadata: Default::default(),
@@ -62,9 +62,9 @@ const ALT_SUBSTRING: &str = "-alt-";
 /// Substring used to denote short region display names data variants for a given region. For example: "BA-alt-short".
 const SHORT_SUBSTRING: &str = "-alt-short";
 
-impl TryFrom<&cldr_serde::region_displaynames::Resource> for RegionDisplayNamesV1<'static> {
+impl TryFrom<&cldr_serde::displaynames::region::Resource> for RegionDisplayNamesV1<'static> {
  type Error = icu_locid::ParserError;
- fn try_from(other: &cldr_serde::region_displaynames::Resource) -> Result<Self, Self::Error> {
+ fn try_from(other: &cldr_serde::displaynames::region::Resource) -> Result<Self, Self::Error> {
  let mut names = BTreeMap::new();
  let mut short_names = BTreeMap::new();
  for (_, lang_display_names) in other.main.0.iter() {

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

@@ -18,11 +18,11 @@ impl DataProvider<ScriptDisplayNamesV1Marker> for crate::DatagenProvider {
  ) -> Result<DataResponse<ScriptDisplayNamesV1Marker>, DataError> {
  let langid = req.locale.get_langid();
 
- let data: &cldr_serde::script_displaynames::Resource =
- self.source
-  .cldr()?
-  .displaynames()
-  .read_and_parse(&langid, "scripts.json")?;
+ let data: &cldr_serde::displaynames::script::Resource = self
+ .source
+ .cldr()?
+ .displaynames()
+ .read_and_parse(&langid, "scripts.json")?;
 
  Ok(DataResponse {
  metadata: Default::default(),
@@ -63,10 +63,10 @@ const ALT_SUBSTRING: &str = "-alt-";
 /// Substring used to denote short display names data variants for a given script. For example: "az-alt-short".
 const ALT_SHORT_SUBSTRING: &str = "-alt-short";
 
-impl TryFrom<&cldr_serde::script_displaynames::Resource> for ScriptDisplayNamesV1<'static> {
+impl TryFrom<&cldr_serde::displaynames::script::Resource> for ScriptDisplayNamesV1<'static> {
  type Error = ParserError;
 
- fn try_from(other: &cldr_serde::script_displaynames::Resource) -> Result<Self, Self::Error> {
+ fn try_from(other: &cldr_serde::displaynames::script::Resource) -> Result<Self, Self::Error> {
  let mut names = BTreeMap::new();
  let mut short_names = BTreeMap::new();
  for lang_data_entry in other.main.0.iter() {

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

@@ -18,7 +18,7 @@ impl DataProvider<VariantDisplayNamesV1Marker> for crate::DatagenProvider {
  ) -> Result<DataResponse<VariantDisplayNamesV1Marker>, DataError> {
  let langid = req.locale.get_langid();
 
- let data: &cldr_serde::variant_displaynames::Resource = self
+ let data: &cldr_serde::displaynames::variant::Resource = self
  .source
  .cldr()?
  .displaynames()
@@ -57,10 +57,10 @@ impl IterableDataProvider<VariantDisplayNamesV1Marker> for crate::DatagenProvide
  }
 }
 
-impl TryFrom<&cldr_serde::variant_displaynames::Resource> for VariantDisplayNamesV1<'static> {
+impl TryFrom<&cldr_serde::displaynames::variant::Resource> for VariantDisplayNamesV1<'static> {
  type Error = ParserError;
 
- fn try_from(other: &cldr_serde::variant_displaynames::Resource) -> Result<Self, Self::Error> {
+ fn try_from(other: &cldr_serde::displaynames::variant::Resource) -> Result<Self, Self::Error> {
  let mut names = BTreeMap::new();
  for lang_data_entry in other.main.0.iter() {
  for entry in lang_data_entry.1.localedisplaynames.variants.iter() {