CollationHanDatabase -> CollationRootHan (#6375)

Fixes #2784


<!--
Thank you for your pull request to ICU4X!

Reminder: try to use [Conventional
Comments](https://conventionalcomments.org/) to make comments clearer.

Please see
https://github.com/unicode-org/icu4x/blob/main/CONTRIBUTING.md for
general
information on contributing to ICU4X.
-->

Author: Manishearth

provider/icu4x-datagen/src/main.rs

@@ -145,10 +145,10 @@ struct Cli {
     #[cfg(feature = "provider")]
     trie_type: TrieType,
 
-    #[arg(long, value_enum, default_value_t = CollationHanDatabase::Implicit)]
+    #[arg(long, value_enum, default_value_t = CollationRootHan::Implicit)]
     #[arg(help = "Which collation han database to use.")]
     #[cfg(feature = "provider")]
-    collation_han_database: CollationHanDatabase,
+    collation_root_han: CollationRootHan,
 
     #[arg(long, value_enum, num_args = 1..)]
     #[arg(
@@ -237,8 +237,8 @@ enum TrieType {
 }
 
 #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, ValueEnum, Debug)]
-// Mirrors icu_provider_export::CollationHanDatabase
-enum CollationHanDatabase {
+// Mirrors icu_provider_export::CollationRootHan
+enum CollationRootHan {
     Unihan,
     Implicit,
 }
@@ -360,10 +360,10 @@ fn main() -> eyre::Result<()> {
         () => {
             let mut p = SourceDataProvider::new_custom();
 
-            p = p.with_collation_han_database(match cli.collation_han_database {
-                CollationHanDatabase::Unihan => icu_provider_source::CollationHanDatabase::Unihan,
-                CollationHanDatabase::Implicit => {
-                    icu_provider_source::CollationHanDatabase::Implicit
+            p = p.with_collation_root_han(match cli.collation_root_han {
+                CollationRootHan::Unihan => icu_provider_source::CollationRootHan::Unihan,
+                CollationRootHan::Implicit => {
+                    icu_provider_source::CollationRootHan::Implicit
                 }
             });
 

provider/source/src/collator/mod.rs

@@ -105,7 +105,7 @@ impl SourceDataProvider {
         self.icuexport()?
             .read_and_parse_toml(&format!(
                 "collation/{}/{}{}.toml",
-                self.collation_han_database(),
+                self.collation_root_han(),
                 id_to_file_name(id),
                 suffix
             ))
@@ -120,7 +120,7 @@ impl SourceDataProvider {
     fn list_ids(&self, suffix: &str) -> Result<HashSet<DataIdentifierCow<'static>>, DataError> {
         Ok(self
             .icuexport()?
-            .list(&format!("collation/{}", self.collation_han_database()))?
+            .list(&format!("collation/{}", self.collation_root_han()))?
             .filter_map(|mut file_name| {
                 file_name.truncate(file_name.len() - ".toml".len());
                 file_name.ends_with(suffix).then(|| {

provider/source/src/lib.rs

@@ -81,7 +81,7 @@ pub struct SourceDataProvider {
     segmenter_lstm_paths: Option<Arc<SerdeCache>>,
     tzdb_paths: Option<Arc<TzdbCache>>,
     trie_type: TrieType,
-    collation_han_database: CollationHanDatabase,
+    collation_root_han: CollationRootHan,
     pub(crate) timezone_horizon: Date<Iso>,
     #[allow(clippy::type_complexity)] // not as complex as it appears
     requests_cache: Arc<
@@ -155,7 +155,7 @@ impl SourceDataProvider {
             tzdb_paths: None,
             trie_type: Default::default(),
             timezone_horizon: Date::try_new_iso(2015, 1, 1).unwrap(),
-            collation_han_database: Default::default(),
+            collation_root_han: Default::default(),
             requests_cache: Default::default(),
         }
     }
@@ -340,10 +340,10 @@ impl SourceDataProvider {
         }
     }
 
-    /// Set the [`CollationHanDatabase`] version.
-    pub fn with_collation_han_database(self, collation_han_database: CollationHanDatabase) -> Self {
+    /// Set the [`CollationRootHan`] version.
+    pub fn with_collation_root_han(self, collation_root_han: CollationRootHan) -> Self {
         Self {
-            collation_han_database,
+            collation_root_han,
             ..self
         }
     }
@@ -366,8 +366,8 @@ impl SourceDataProvider {
         self.trie_type
     }
 
-    fn collation_han_database(&self) -> CollationHanDatabase {
-        self.collation_han_database
+    fn collation_root_han(&self) -> CollationRootHan {
+        self.collation_root_han
     }
 
     /// List the locales for the given CLDR coverage levels
@@ -476,7 +476,7 @@ where
 /// <https://github.com/unicode-org/icu/blob/main/docs/userguide/icu::data/buildtool.md#collation-ucadata>
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Default, serde::Serialize, serde::Deserialize)]
 #[non_exhaustive]
-pub enum CollationHanDatabase {
+pub enum CollationRootHan {
     /// Implicit
     #[serde(rename = "implicit")]
     #[default]
@@ -486,11 +486,11 @@ pub enum CollationHanDatabase {
     Unihan,
 }
 
-impl std::fmt::Display for CollationHanDatabase {
+impl std::fmt::Display for CollationRootHan {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
         match self {
-            CollationHanDatabase::Implicit => write!(f, "implicithan"),
-            CollationHanDatabase::Unihan => write!(f, "unihan"),
+            CollationRootHan::Implicit => write!(f, "implicithan"),
+            CollationRootHan::Unihan => write!(f, "unihan"),
         }
     }
 }