Using MultiForkByKeyProvider for all datagen

provider/cldr/src/lib.rs

@@ -50,9 +50,12 @@ use transform::locale_canonicalizer::likely_subtags::LikelySubtagsProvider;
 use transform::plurals::PluralsProvider;
 use transform::time_zones::TimeZonesProvider;
 
-pub fn create_exportable_properties_provider<T: DataMarker>(
+#[cfg(not(feature = "icu_list"))]
+type ListProvider = PluralsProvider; // we can't cfg-exclude part of the bound, but we can do this...
+
+pub fn create_exportable_provider<T: DataMarker>(
     cldr_paths: &dyn CldrPaths,
-    uprops_root: PathBuf,
+    _uprops_root: PathBuf,
 ) -> Result<MultiForkByKeyProvider<Box<dyn IterableDynProvider<T>>>, CldrError>
 where
     AliasesProvider: IterableDynProvider<T>,
@@ -79,7 +82,7 @@ where
             Box::new(PluralsProvider::try_from(cldr_paths)?),
             Box::new(TimeZonesProvider::try_from(cldr_paths)?),
             #[cfg(feature = "icu_list")]
-            Box::new(ListProvider::try_from(cldr_paths, uprops_root)?),
+            Box::new(ListProvider::try_from(cldr_paths, _uprops_root)?),
         ],
     })
 }

provider/uprops/README.md

@@ -3,8 +3,8 @@
 `icu_provider_uprops` contains implementations of the [`ICU4X`]
 [data provider] interface backed by TOML files exported by the
 ICU4C icuwriteuprops tool. Create a directory containing TOML files for
-the necessary Unicode properties and then pass the path into the
-[`PropertiesDataProvider`].
+the necessary Unicode properties and then pass the path to the desired
+provider.
 
 **Important:** This data provider implementation is not optimized
 for production use.  It is much more efficient if you use

provider/uprops/src/enum_codepointtrie.rs

@@ -20,7 +20,7 @@ use zerovec::ZeroVec;
 
 /// This data provider returns `CodePointTrie` data inside a
 /// `UnicodePropertyMap` data struct. The source data is the same as that of
-/// [crate::provider::PropertiesDataProvider], which is a TOML file of data
+/// the other properties providers, which is a TOML file of data
 /// for the property(-ies) desired, as given by the ICU4C property data
 /// exporter tool.
 pub struct EnumeratedPropertyCodePointTrieProvider {

provider/uprops/src/lib.rs

@@ -5,8 +5,8 @@
 //! `icu_provider_uprops` contains implementations of the [`ICU4X`]
 //! [data provider] interface backed by TOML files exported by the
 //! ICU4C icuwriteuprops tool. Create a directory containing TOML files for
-//! the necessary Unicode properties and then pass the path into the
-//! [`PropertiesDataProvider`].
+//! the necessary Unicode properties and then pass the path to the desired
+//! provider.
 //!
 //! **Important:** This data provider implementation is not optimized
 //! for production use.  It is much more efficient if you use
@@ -35,7 +35,7 @@ use icu_provider::iter::IterableDynProvider;
 use icu_provider::DataMarker;
 use std::path::Path;
 
-pub fn create_exportable_properties_provider<T: DataMarker>(
+pub fn create_exportable_provider<T: DataMarker>(
     root_dir: &Path,
 ) -> eyre::Result<MultiForkByKeyProvider<Box<dyn IterableDynProvider<T>>>>
 where

provider/uprops/src/script.rs

@@ -18,10 +18,9 @@ use zerovec::{VarZeroVec, ZeroSlice, ZeroVec};
 
 /// This data provider returns a [`ScriptWithExtensions`] instance,
 /// which efficiently represents data for the Script and Script_Extensions
-/// properties. The source data is the same as that of
-/// [crate::provider::PropertiesDataProvider], which is a TOML file of data
-/// for the property(-ies) desired, as given by the ICU4C property data
-/// exporter tool.
+/// properties. The source data is the same as that of the other properties
+/// providers, which is a TOML file of data for the property(-ies) desired,
+/// as given by the ICU4C property data exporter tool.
 pub struct ScriptWithExtensionsPropertyProvider {
     data: ScriptWithExtensionsProperty,
 }

tools/datagen/src/bin/datagen.rs

@@ -266,6 +266,7 @@ fn main() -> eyre::Result<()> {
         v
     };
 
+    #[allow(clippy::if_same_then_else)]
     let selected_keys = if matches.is_present("ALL_KEYS") {
         all_keys
     } else if matches.is_present("TEST_KEYS") {
@@ -337,11 +338,11 @@ fn main() -> eyre::Result<()> {
 
         Box::new(MultiForkByKeyProvider {
             providers: vec![
-                Box::new(icu_provider_cldr::create_exportable_properties_provider(
+                Box::new(icu_provider_cldr::create_exportable_provider(
                     cldr_paths.as_ref(),
                     uprops_root.clone(),
                 )?) as Box<dyn IterableDynProvider<SerializeMarker>>,
-                Box::new(icu_provider_uprops::create_exportable_properties_provider(
+                Box::new(icu_provider_uprops::create_exportable_provider(
                     &uprops_root,
                 )?),
                 Box::new(HelloWorldProvider::new_with_placeholder_data()),