Refactor units provider structure by renaming modules and adding new folder for units

components/experimental/src/dimension/provider/mod.rs

@@ -3,7 +3,5 @@
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
 pub mod currency;
-pub mod pattern_key;
 pub mod percent;
 pub mod units;
-pub mod units_essentials;

components/experimental/src/dimension/provider/units.rs → components/experimental/src/dimension/provider/units/display_names.rs

@@ -57,11 +57,11 @@ impl<'data> UnitsDisplayName<'data> {
 impl databake::Bake for UnitsDisplayName<'_> {
     fn bake(&self, ctx: &databake::CrateEnv) -> databake::TokenStream {
         use zerovec::ule::VarULE;
-        ctx.insert("icu_experimental::dimension::provider::units");
+        ctx.insert("icu_experimental::dimension::provider::units::display_names");
         let bytes = self.patterns.elements.as_bytes().bake(ctx);
         // Safety: The bytes are returned by `PluralElementsPackedULE::slice_as_bytes`.
         databake::quote! { unsafe {
-            icu_experimental::dimension::provider::units::UnitsDisplayName::from_bytes_unchecked(#bytes)
+            icu_experimental::dimension::provider::units::display_names::UnitsDisplayName::from_bytes_unchecked(#bytes)
         }}
     }
 }

components/experimental/src/dimension/provider/units_essentials.rs → components/experimental/src/dimension/provider/units/essentials.rs

@@ -24,7 +24,7 @@ use icu_provider::prelude::*;
 /// </div>
 pub use crate::provider::Baked;
 
-use super::pattern_key::PatternKey;
+use super::patterns::PatternKey;
 
 icu_provider::data_marker!(
    /// `UnitsEssentialsV1`
@@ -46,7 +46,7 @@ icu_provider::data_marker!(
 /// </div>
 #[derive(Clone, PartialEq, Debug, yoke::Yokeable, zerofrom::ZeroFrom)]
 #[cfg_attr(feature = "datagen", derive(serde::Serialize, databake::Bake))]
-#[cfg_attr(feature = "datagen", databake(path = icu_experimental::dimension::provider::units_essentials))]
+#[cfg_attr(feature = "datagen", databake(path = icu_experimental::dimension::provider::units::essentials))]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize))]
 #[yoke(prove_covariance_manually)]
 pub struct UnitsEssentials<'data> {
@@ -71,7 +71,7 @@ icu_provider::data_struct!(UnitsEssentials<'_>, #[cfg(feature = "datagen")]);
 #[derive(Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Debug)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize))]
 #[cfg_attr(feature = "datagen", derive(serde::Serialize, databake::Bake))]
-#[cfg_attr(feature = "datagen", databake(path = icu_experimental::dimension::provider::units_essentials))]
+#[cfg_attr(feature = "datagen", databake(path = icu_experimental::dimension::provider::units::essentials))]
 #[repr(u8)]
 pub enum CompoundCount {
     /// The CLDR keyword `zero`.

components/experimental/src/dimension/provider/units/mod.rs

@@ -0,0 +1,7 @@
+// 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 display_names;
+pub mod essentials;
+pub mod patterns;

components/experimental/src/dimension/provider/pattern_key.rs → components/experimental/src/dimension/provider/units/patterns.rs

@@ -10,12 +10,12 @@ use zerovec::{
     ule::{AsULE, UleError, ULE},
 };
 
-use crate::dimension::provider::units_essentials::CompoundCount;
+use crate::dimension::provider::units::essentials::CompoundCount;
 
 #[derive(Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Debug)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize))]
 #[cfg_attr(feature = "datagen", derive(serde::Serialize, databake::Bake))]
-#[cfg_attr(feature = "datagen", databake(path = icu_experimental::dimension::provider::pattern_key))]
+#[cfg_attr(feature = "datagen", databake(path = icu_experimental::dimension::provider::units::patterns))]
 #[repr(u8)]
 pub enum PowerValue {
     Two,
@@ -25,7 +25,7 @@ pub enum PowerValue {
 #[derive(Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Debug)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize))]
 #[cfg_attr(feature = "datagen", derive(serde::Serialize, databake::Bake))]
-#[cfg_attr(feature = "datagen", databake(path = icu_experimental::dimension::provider::pattern_key))]
+#[cfg_attr(feature = "datagen", databake(path = icu_experimental::dimension::provider::units::patterns))]
 pub enum PatternKey {
     Binary(u8),
     Decimal(i8),

components/experimental/src/dimension/units/format.rs

@@ -4,7 +4,7 @@
 
 //! Experimental.
 
-use crate::dimension::provider::units::UnitsDisplayName;
+use crate::dimension::provider::units::display_names::UnitsDisplayName;
 use fixed_decimal::Decimal;
 use icu_decimal::DecimalFormatter;
 use icu_plurals::PluralRules;

components/experimental/src/dimension/units/formatter.rs

@@ -13,7 +13,7 @@ use icu_provider::DataPayload;
 
 use super::format::FormattedUnit;
 use super::options::{UnitsFormatterOptions, Width};
-use crate::dimension::provider::units::UnitsDisplayNameV1;
+use crate::dimension::provider::units::display_names::UnitsDisplayNameV1;
 use icu_provider::prelude::*;
 use smallvec::SmallVec;
 
@@ -133,7 +133,7 @@ impl UnitsFormatter {
     ) -> Result<Self, DataError>
     where
         D: ?Sized
-            + DataProvider<super::super::provider::units::UnitsDisplayNameV1>
+            + DataProvider<super::super::provider::units::display_names::UnitsDisplayNameV1>
             + DataProvider<icu_decimal::provider::DecimalSymbolsV1>
             + DataProvider<icu_decimal::provider::DecimalDigitsV1>
             + DataProvider<icu_plurals::provider::PluralsCardinalV1>,

components/experimental/src/duration/formatter.rs

@@ -2,7 +2,7 @@
 // called LICENSE at the top level of the ICU4X source tree
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
-use crate::dimension::provider::units::UnitsDisplayNameV1;
+use crate::dimension::provider::units::display_names::UnitsDisplayNameV1;
 use crate::dimension::units::formatter::{UnitsFormatter, UnitsFormatterPreferences};
 use crate::dimension::units::options::{UnitsFormatterOptions, Width};
 use crate::duration::options::FieldStyle;

components/experimental/src/lib.rs

@@ -107,8 +107,8 @@ pub mod provider {
         super::dimension::provider::currency::patterns::CurrencyPatternsDataV1::INFO,
         super::dimension::provider::currency::extended::CurrencyExtendedDataV1::INFO,
         super::dimension::provider::percent::PercentEssentialsV1::INFO,
-        super::dimension::provider::units_essentials::UnitsEssentialsV1::INFO,
-        super::dimension::provider::units::UnitsDisplayNameV1::INFO,
+        super::dimension::provider::units::essentials::UnitsEssentialsV1::INFO,
+        super::dimension::provider::units::display_names::UnitsDisplayNameV1::INFO,
         super::displaynames::provider::LanguageDisplayNamesV1::INFO,
         super::duration::provider::DigitalDurationDataV1::INFO,
         super::displaynames::provider::LocaleDisplayNamesV1::INFO,