Moving baked provider into provider modules (#3517)

Author: robertbastian

components/plurals/src/lib.rs

@@ -83,15 +83,6 @@ mod operands;
 pub mod provider;
 pub mod rules;
 
-#[doc(hidden)]
-#[cfg(feature = "data")]
-pub mod data {
-    use crate as icu_plurals;
-    pub(crate) struct Provider;
-    icu_plurals_data::impl_plurals_ordinal_v1!(Provider);
-    icu_plurals_data::impl_plurals_cardinal_v1!(Provider);
-}
-
 use core::cmp::{Ord, PartialOrd};
 pub use error::PluralsError;
 use icu_provider::prelude::*;

components/plurals/src/provider.rs

@@ -19,6 +19,16 @@ use crate::rules::runtime::ast::Rule;
 use icu_provider::prelude::*;
 use icu_provider::DataMarker;
 
+#[cfg(feature = "data")]
+pub(crate) struct Baked;
+
+#[cfg(feature = "data")]
+const _: () = {
+    use crate as icu_plurals;
+    icu_plurals_data::impl_plurals_ordinal_v1!(Baked);
+    icu_plurals_data::impl_plurals_cardinal_v1!(Baked);
+};
+
 #[cfg(doc)]
 use crate::PluralCategory;
 

components/timezone/src/lib.rs

@@ -134,11 +134,3 @@ pub use types::{GmtOffset, ZoneVariant};
 
 #[doc(no_inline)]
 pub use TimeZoneError as Error;
-
-#[cfg(feature = "data")]
-#[doc(hidden)]
-pub mod data {
-    use crate as icu_timezone;
-    pub(crate) struct Provider;
-    icu_timezone_data::impl_time_zone_metazone_period_v1!(Provider);
-}

components/timezone/src/metazone.rs

@@ -37,7 +37,7 @@ impl MetazoneCalculator {
     pub const fn new() -> Self {
         MetazoneCalculator {
             metazone_period: DataPayload::from_static_ref(
-                crate::data::Provider::SINGLETON_TIME_ZONE_METAZONE_PERIOD_V1,
+                crate::provider::Baked::SINGLETON_TIME_ZONE_METAZONE_PERIOD_V1,
             ),
         }
     }

components/timezone/src/provider.rs

@@ -21,6 +21,15 @@ use tinystr::TinyAsciiStr;
 use zerovec::ule::{AsULE, ULE};
 use zerovec::{ZeroMap2d, ZeroSlice, ZeroVec};
 
+#[cfg(feature = "data")]
+pub(crate) struct Baked;
+
+#[cfg(feature = "data")]
+const _: () = {
+    use crate as icu_timezone;
+    icu_timezone_data::impl_time_zone_metazone_period_v1!(Baked);
+};
+
 /// TimeZone ID in BCP47 format
 ///
 /// <div class="stab unstable">

provider/core/src/constructors.rs

@@ -140,7 +140,7 @@ macro_rules! gen_any_buffer_unstable_docs {
     };
 }
 
-#[allow(clippy::crate_in_macro_def)] // by convention each crate's data provider is `crate::data::Provider`
+#[allow(clippy::crate_in_macro_def)] // by convention each crate's data provider is `crate::provider::Baked`
 #[doc(hidden)]
 #[macro_export]
 macro_rules! gen_any_buffer_data_constructors {
@@ -166,7 +166,7 @@ macro_rules! gen_any_buffer_data_constructors {
         ///
         /// [📚 Help choosing a constructor](icu_provider::constructors)
         pub fn $baked() -> Result<Self, $error_ty> {
-            $($struct :: )? $unstable(&crate::data::Provider)
+            $($struct :: )? $unstable(&crate::provider::Baked)
         }
         #[doc = $crate::gen_any_buffer_unstable_docs!(ANY, $($struct ::)? $baked)]
         pub fn $any(provider: &(impl $crate::AnyProvider + ?Sized)) -> Result<Self, $error_ty> {
@@ -190,7 +190,7 @@ macro_rules! gen_any_buffer_data_constructors {
         ///
         /// [📚 Help choosing a constructor](icu_provider::constructors)
         pub fn $baked() -> $result_ty {
-            $($struct :: )? $unstable(&crate::data::Provider)
+            $($struct :: )? $unstable(&crate::provider::Baked)
         }
         #[doc = $crate::gen_any_buffer_unstable_docs!(ANY, $($struct ::)? $baked)]
         pub fn $any(provider: &(impl $crate::AnyProvider + ?Sized)) -> $result_ty {
@@ -228,7 +228,7 @@ macro_rules! gen_any_buffer_data_constructors {
         ///
         /// [📚 Help choosing a constructor](icu_provider::constructors)
         pub fn $baked($options_arg: $options_ty) -> $result_ty {
-            $($struct :: )? $unstable(&crate::data::Provider, $options_arg)
+            $($struct :: )? $unstable(&crate::provider::Baked, $options_arg)
         }
         #[doc = $crate::gen_any_buffer_unstable_docs!(ANY, $($struct ::)? $baked)]
         pub fn $any(provider: &(impl $crate::AnyProvider + ?Sized), $options_arg: $options_ty) -> $result_ty {
@@ -250,7 +250,7 @@ macro_rules! gen_any_buffer_data_constructors {
         ///
         /// [📚 Help choosing a constructor](icu_provider::constructors)
         pub fn $baked($options_arg: $options_ty) -> Result<Self, $error_ty> {
-            $($struct :: )? $unstable(&crate::data::Provider, $options_arg)
+            $($struct :: )? $unstable(&crate::provider::Baked, $options_arg)
         }
         #[doc = $crate::gen_any_buffer_unstable_docs!(ANY, $($struct ::)? $baked)]
         pub fn $any(provider: &(impl $crate::AnyProvider + ?Sized), $options_arg: $options_ty) -> Result<Self, $error_ty> {
@@ -287,7 +287,7 @@ macro_rules! gen_any_buffer_data_constructors {
         ///
         /// [📚 Help choosing a constructor](icu_provider::constructors)
         pub fn $baked(locale: &$crate::DataLocale) -> Result<Self, $error_ty> {
-            $($struct :: )? $unstable(&crate::data::Provider, locale)
+            $($struct :: )? $unstable(&crate::provider::Baked, locale)
         }
         #[doc = $crate::gen_any_buffer_unstable_docs!(ANY, $($struct ::)? $baked)]
         pub fn $any(provider: &(impl $crate::AnyProvider + ?Sized), locale: &$crate::DataLocale) -> Result<Self, $error_ty> {
@@ -326,7 +326,7 @@ macro_rules! gen_any_buffer_data_constructors {
         ///
         /// [📚 Help choosing a constructor](icu_provider::constructors)
         pub fn $baked(locale: &$crate::DataLocale, $config_arg: $config_ty, $options_arg: $options_ty) -> Result<Self, $error_ty> {
-            $($struct :: )? $unstable(&crate::data::Provider, locale, $config_arg, $options_arg)
+            $($struct :: )? $unstable(&crate::provider::Baked, locale, $config_arg, $options_arg)
         }
         #[doc = $crate::gen_any_buffer_unstable_docs!(ANY, $($struct ::)? $baked)]
         pub fn $any(provider: &(impl $crate::AnyProvider + ?Sized), locale: &$crate::DataLocale, $config_arg: $config_ty, $options_arg: $options_ty) -> Result<Self, $error_ty> {
@@ -364,7 +364,7 @@ macro_rules! gen_any_buffer_data_constructors {
         ///
         /// [📚 Help choosing a constructor](icu_provider::constructors)
         pub fn $baked(locale: &$crate::DataLocale, $options_arg: $options_ty) -> Result<Self, $error_ty> {
-            $($struct :: )? $unstable(&crate::data::Provider, locale, $options_arg)
+            $($struct :: )? $unstable(&crate::provider::Baked, locale, $options_arg)
         }
         #[doc = $crate::gen_any_buffer_unstable_docs!(ANY, $($struct ::)? $baked)]
         pub fn $any(provider: &(impl $crate::AnyProvider + ?Sized), locale: &$crate::DataLocale, $options_arg: $options_ty) -> Result<Self, $error_ty> {