Make LocalePreferences internally-private, move DataLocale to locale_…

…core, other refactors (#5988) Fixes #5785.
unicode-org · Jan 15, 2025 · e9e0819 · e9e0819
1 parent 7b823de
commit e9e0819
Show file tree

Hide file tree

Showing 40 changed files with 596 additions and 626 deletions.
diff --git a/components/calendar/src/any_calendar.rs b/components/calendar/src/any_calendar.rs
@@ -1114,7 +1114,7 @@ impl AnyCalendarKind {
         if let Some(kind) = Self::get_for_prefs(prefs) {
             kind
         } else {
-            let lang = prefs.locale_preferences.language;
+            let lang = prefs.locale_preferences.language();
             if lang == language!("th") {
                 Self::Buddhist
             } else if lang == language!("sa") {

diff --git a/components/calendar/src/week_of.rs b/components/calendar/src/week_of.rs
@@ -49,8 +49,7 @@ impl WeekCalculator {
     where
         P: DataProvider<crate::provider::WeekDataV2Marker> + ?Sized,
     {
-        let locale =
-            DataLocale::from_preferences_locale::<WeekDataV2Marker>(prefs.locale_preferences);
+        let locale = WeekDataV2Marker::make_locale(prefs.locale_preferences);
         provider
             .load(DataRequest {
                 id: DataIdentifierBorrowed::for_locale(&locale),

diff --git a/components/collator/src/comparison.rs b/components/collator/src/comparison.rs
@@ -101,10 +101,8 @@ impl LocaleSpecificDataHolder {
             .map(|c| DataMarkerAttributes::from_str_or_panic(c.as_str()))
             .unwrap_or_default();
 
-        let data_locale = DataLocale::from_preferences_locale::<CollationTailoringV1Marker>(
-            prefs.locale_preferences,
-        );
-        let id = DataIdentifierCow::from_borrowed_and_owned(marker_attributes, data_locale.clone());
+        let data_locale = CollationTailoringV1Marker::make_locale(prefs.locale_preferences);
+        let id = DataIdentifierCow::from_borrowed_and_owned(marker_attributes, data_locale);
 
         let req = DataRequest {
             id: id.as_borrowed(),

diff --git a/components/collator/tests/tests.rs b/components/collator/tests/tests.rs
@@ -1449,9 +1449,9 @@ fn test_nb_nn_no() {
         DataProvider::<CollationTailoringV1Marker>::load(
             &icu_collator::provider::Baked,
             DataRequest {
-                id: DataIdentifierCow::from_locale(DataLocale::from_preferences_locale::<
-                    CollationTailoringV1Marker,
-                >(prefs.locale_preferences))
+                id: DataIdentifierCow::from_locale(CollationTailoringV1Marker::make_locale(
+                    prefs.locale_preferences
+                ))
                 .as_borrowed(),
                 ..Default::default()
             }
@@ -1472,9 +1472,9 @@ fn test_nb_nn_no() {
         DataProvider::<CollationTailoringV1Marker>::load(
             &icu_collator::provider::Baked,
             DataRequest {
-                id: DataIdentifierCow::from_locale(DataLocale::from_preferences_locale::<
-                    CollationTailoringV1Marker,
-                >(prefs.locale_preferences))
+                id: DataIdentifierCow::from_locale(CollationTailoringV1Marker::make_locale(
+                    prefs.locale_preferences
+                ))
                 .as_borrowed(),
                 ..Default::default()
             }
@@ -1495,9 +1495,9 @@ fn test_nb_nn_no() {
         DataProvider::<CollationTailoringV1Marker>::load(
             &icu_collator::provider::Baked,
             DataRequest {
-                id: DataIdentifierCow::from_locale(DataLocale::from_preferences_locale::<
-                    CollationTailoringV1Marker,
-                >(prefs.locale_preferences))
+                id: DataIdentifierCow::from_locale(CollationTailoringV1Marker::make_locale(
+                    prefs.locale_preferences
+                ))
                 .as_borrowed(),
                 ..Default::default()
             }

diff --git a/components/datetime/src/neo.rs b/components/datetime/src/neo.rs
@@ -46,8 +46,9 @@ define_preferences!(
     ///
     /// let prefs1: DateTimeFormatterPreferences = Locale::try_from_str("fr-u-ca-buddhist-hc-h12").unwrap().into();
     ///
+    /// let locale = Locale::try_from_str("fr").unwrap();
     /// let mut prefs2 = DateTimeFormatterPreferences::default();
-    /// prefs2.locale_preferences.language = Language::try_from_str("fr").unwrap();
+    /// prefs2.locale_preferences = (&locale).into();
     /// prefs2.hour_cycle = Some(HourCycle::H12);
     /// prefs2.calendar_algorithm = Some(CalendarAlgorithm::Buddhist);
     ///

diff --git a/components/decimal/src/lib.rs b/components/decimal/src/lib.rs
@@ -171,9 +171,7 @@ impl FixedDecimalFormatter {
         prefs: FixedDecimalFormatterPreferences,
         options: options::FixedDecimalFormatterOptions,
     ) -> Result<Self, DataError> {
-        let locale = DataLocale::from_preferences_locale::<provider::DecimalSymbolsV2Marker>(
-            prefs.locale_preferences,
-        );
+        let locale = provider::DecimalSymbolsV2Marker::make_locale(prefs.locale_preferences);
         let provided_nu = prefs.numbering_system.as_ref().map(|s| s.as_str());
 
         // In case the user explicitly specified a numbering system, use digits from that numbering system. In case of explicitly specified numbering systems,

diff --git a/components/experimental/src/compactdecimal/formatter.rs b/components/experimental/src/compactdecimal/formatter.rs
@@ -109,9 +109,7 @@ impl CompactDecimalFormatter {
         prefs: CompactDecimalFormatterPreferences,
         options: CompactDecimalFormatterOptions,
     ) -> Result<Self, DataError> {
-        let locale = DataLocale::from_preferences_locale::<ShortCompactDecimalFormatDataV1Marker>(
-            prefs.locale_preferences,
-        );
+        let locale = ShortCompactDecimalFormatDataV1Marker::make_locale(prefs.locale_preferences);
         Ok(Self {
             fixed_decimal_formatter: FixedDecimalFormatter::try_new(
                 (&prefs).into(),
@@ -154,9 +152,7 @@ impl CompactDecimalFormatter {
             + DataProvider<icu_plurals::provider::CardinalV1Marker>
             + ?Sized,
     {
-        let locale = DataLocale::from_preferences_locale::<ShortCompactDecimalFormatDataV1Marker>(
-            prefs.locale_preferences,
-        );
+        let locale = ShortCompactDecimalFormatDataV1Marker::make_locale(prefs.locale_preferences);
         Ok(Self {
             fixed_decimal_formatter: FixedDecimalFormatter::try_new_unstable(
                 provider,
@@ -200,9 +196,7 @@ impl CompactDecimalFormatter {
         prefs: CompactDecimalFormatterPreferences,
         options: CompactDecimalFormatterOptions,
     ) -> Result<Self, DataError> {
-        let locale = DataLocale::from_preferences_locale::<LongCompactDecimalFormatDataV1Marker>(
-            prefs.locale_preferences,
-        );
+        let locale = LongCompactDecimalFormatDataV1Marker::make_locale(prefs.locale_preferences);
         Ok(Self {
             fixed_decimal_formatter: FixedDecimalFormatter::try_new(
                 (&prefs).into(),
@@ -245,9 +239,7 @@ impl CompactDecimalFormatter {
             + DataProvider<icu_plurals::provider::CardinalV1Marker>
             + ?Sized,
     {
-        let locale = DataLocale::from_preferences_locale::<LongCompactDecimalFormatDataV1Marker>(
-            prefs.locale_preferences,
-        );
+        let locale = LongCompactDecimalFormatDataV1Marker::make_locale(prefs.locale_preferences);
         Ok(Self {
             fixed_decimal_formatter: FixedDecimalFormatter::try_new_unstable(
                 provider,

diff --git a/components/experimental/src/dimension/currency/compact_formatter.rs b/components/experimental/src/dimension/currency/compact_formatter.rs
@@ -90,9 +90,7 @@ impl CompactCurrencyFormatter {
         prefs: CompactCurrencyFormatterPreferences,
         options: CompactCurrencyFormatterOptions,
     ) -> Result<Self, DataError> {
-        let short_locale = DataLocale::from_preferences_locale::<ShortCurrencyCompactV1Marker>(
-            prefs.locale_preferences,
-        );
+        let short_locale = ShortCurrencyCompactV1Marker::make_locale(prefs.locale_preferences);
 
         let short_currency_compact = crate::provider::Baked
             .load(DataRequest {
@@ -101,9 +99,7 @@ impl CompactCurrencyFormatter {
             })?
             .payload;
 
-        let essential_locale = DataLocale::from_preferences_locale::<CurrencyEssentialsV1Marker>(
-            prefs.locale_preferences,
-        );
+        let essential_locale = CurrencyEssentialsV1Marker::make_locale(prefs.locale_preferences);
 
         let essential = crate::provider::Baked
             .load(DataRequest {
@@ -140,9 +136,7 @@ impl CompactCurrencyFormatter {
             + DataProvider<icu_decimal::provider::DecimalDigitsV1Marker>
             + DataProvider<icu_plurals::provider::CardinalV1Marker>,
     {
-        let locale = DataLocale::from_preferences_locale::<CurrencyEssentialsV1Marker>(
-            prefs.locale_preferences,
-        );
+        let locale = CurrencyEssentialsV1Marker::make_locale(prefs.locale_preferences);
 
         let compact_decimal_formatter = CompactDecimalFormatter::try_new_short_unstable(
             provider,

diff --git a/components/experimental/src/dimension/currency/formatter.rs b/components/experimental/src/dimension/currency/formatter.rs
@@ -81,9 +81,7 @@ impl CurrencyFormatter {
         prefs: CurrencyFormatterPreferences,
         options: super::options::CurrencyFormatterOptions,
     ) -> Result<Self, DataError> {
-        let locale = DataLocale::from_preferences_locale::<CurrencyEssentialsV1Marker>(
-            prefs.locale_preferences,
-        );
+        let locale = CurrencyEssentialsV1Marker::make_locale(prefs.locale_preferences);
         let fixed_decimal_formatter = FixedDecimalFormatter::try_new(
             (&prefs).into(),
             FixedDecimalFormatterOptions::default(),
@@ -114,9 +112,7 @@ impl CurrencyFormatter {
             + DataProvider<icu_decimal::provider::DecimalSymbolsV2Marker>
             + DataProvider<icu_decimal::provider::DecimalDigitsV1Marker>,
     {
-        let locale = DataLocale::from_preferences_locale::<CurrencyEssentialsV1Marker>(
-            prefs.locale_preferences,
-        );
+        let locale = CurrencyEssentialsV1Marker::make_locale(prefs.locale_preferences);
         let fixed_decimal_formatter = FixedDecimalFormatter::try_new_unstable(
             provider,
             (&prefs).into(),

diff --git a/components/experimental/src/dimension/currency/long_compact_formatter.rs b/components/experimental/src/dimension/currency/long_compact_formatter.rs
@@ -100,9 +100,7 @@ impl LongCompactCurrencyFormatter {
                     .with_debug_context("failed to get data marker attribute from a `CurrencyCode`")
             })?;
 
-        let locale = &DataLocale::from_preferences_locale::<CurrencyPatternsDataV1Marker>(
-            prefs.locale_preferences,
-        );
+        let locale = &CurrencyPatternsDataV1Marker::make_locale(prefs.locale_preferences);
 
         let extended = crate::provider::Baked
             .load(DataRequest {
@@ -143,9 +141,7 @@ impl LongCompactCurrencyFormatter {
             + DataProvider<icu_plurals::provider::CardinalV1Marker>
             + DataProvider<crate::compactdecimal::provider::LongCompactDecimalFormatDataV1Marker>,
     {
-        let locale = DataLocale::from_preferences_locale::<CurrencyPatternsDataV1Marker>(
-            prefs.locale_preferences,
-        );
+        let locale = CurrencyPatternsDataV1Marker::make_locale(prefs.locale_preferences);
 
         let marker_attributes = DataMarkerAttributes::try_from_str(currency_code.0.as_str())
             .map_err(|_| {

diff --git a/components/experimental/src/dimension/currency/long_formatter.rs b/components/experimental/src/dimension/currency/long_formatter.rs
@@ -63,9 +63,7 @@ impl LongCurrencyFormatter {
         prefs: CurrencyFormatterPreferences,
         currency_code: &CurrencyCode,
     ) -> Result<Self, DataError> {
-        let locale = DataLocale::from_preferences_locale::<CurrencyPatternsDataV1Marker>(
-            prefs.locale_preferences,
-        );
+        let locale = CurrencyPatternsDataV1Marker::make_locale(prefs.locale_preferences);
         let fixed_decimal_formatter = FixedDecimalFormatter::try_new(
             (&prefs).into(),
             FixedDecimalFormatterOptions::default(),
@@ -114,9 +112,7 @@ impl LongCurrencyFormatter {
             + DataProvider<icu_decimal::provider::DecimalDigitsV1Marker>
             + DataProvider<icu_plurals::provider::CardinalV1Marker>,
     {
-        let locale = DataLocale::from_preferences_locale::<CurrencyPatternsDataV1Marker>(
-            prefs.locale_preferences,
-        );
+        let locale = CurrencyPatternsDataV1Marker::make_locale(prefs.locale_preferences);
         let fixed_decimal_formatter = FixedDecimalFormatter::try_new_unstable(
             provider,
             (&prefs).into(),

diff --git a/components/experimental/src/dimension/percent/formatter.rs b/components/experimental/src/dimension/percent/formatter.rs
@@ -10,9 +10,8 @@ use icu_decimal::{FixedDecimalFormatter, FixedDecimalFormatterPreferences};
 use icu_locale_core::preferences::{
     define_preferences, extensions::unicode::keywords::NumberingSystem, prefs_convert,
 };
-use icu_provider::{
-    DataError, DataIdentifierBorrowed, DataLocale, DataPayload, DataProvider, DataRequest,
-};
+
+use icu_provider::prelude::*;
 
 use super::super::provider::percent::PercentEssentialsV1Marker;
 use super::format::FormattedPercent;
@@ -154,9 +153,7 @@ where
         fixed_decimal_formatter: R,
         options: PercentFormatterOptions,
     ) -> Result<Self, DataError> {
-        let locale = DataLocale::from_preferences_locale::<PercentEssentialsV1Marker>(
-            prefs.locale_preferences,
-        );
+        let locale = PercentEssentialsV1Marker::make_locale(prefs.locale_preferences);
         let essential = crate::provider::Baked
             .load(DataRequest {
                 id: DataIdentifierBorrowed::for_locale(&locale),
@@ -178,9 +175,7 @@ where
         fixed_decimal_formatter: R,
         options: PercentFormatterOptions,
     ) -> Result<Self, DataError> {
-        let locale = DataLocale::from_preferences_locale::<PercentEssentialsV1Marker>(
-            prefs.locale_preferences,
-        );
+        let locale = PercentEssentialsV1Marker::make_locale(prefs.locale_preferences);
         let essential = provider
             .load(DataRequest {
                 id: DataIdentifierBorrowed::for_locale(&locale),

diff --git a/components/experimental/src/dimension/units/formatter.rs b/components/experimental/src/dimension/units/formatter.rs
@@ -100,9 +100,7 @@ impl UnitsFormatter {
         unit: &str,
         options: super::options::UnitsFormatterOptions,
     ) -> Result<Self, DataError> {
-        let locale = DataLocale::from_preferences_locale::<UnitsDisplayNameV1Marker>(
-            prefs.locale_preferences,
-        );
+        let locale = UnitsDisplayNameV1Marker::make_locale(prefs.locale_preferences);
         let fixed_decimal_formatter = FixedDecimalFormatter::try_new(
             (&prefs).into(),
             FixedDecimalFormatterOptions::default(),
@@ -147,9 +145,7 @@ impl UnitsFormatter {
             + DataProvider<icu_decimal::provider::DecimalDigitsV1Marker>
             + DataProvider<icu_plurals::provider::CardinalV1Marker>,
     {
-        let locale = DataLocale::from_preferences_locale::<UnitsDisplayNameV1Marker>(
-            prefs.locale_preferences,
-        );
+        let locale = UnitsDisplayNameV1Marker::make_locale(prefs.locale_preferences);
         let fixed_decimal_formatter = FixedDecimalFormatter::try_new_unstable(
             provider,
             (&prefs).into(),

diff --git a/components/experimental/src/displaynames/displaynames.rs b/components/experimental/src/displaynames/displaynames.rs
@@ -65,9 +65,7 @@ impl RegionDisplayNames {
         prefs: DisplayNamesPreferences,
         options: DisplayNamesOptions,
     ) -> Result<Self, DataError> {
-        let locale = DataLocale::from_preferences_locale::<RegionDisplayNamesV1Marker>(
-            prefs.locale_preferences,
-        );
+        let locale = RegionDisplayNamesV1Marker::make_locale(prefs.locale_preferences);
         let region_data = provider
             .load(DataRequest {
                 id: DataIdentifierBorrowed::for_locale(&locale),
@@ -135,9 +133,7 @@ impl ScriptDisplayNames {
         prefs: DisplayNamesPreferences,
         options: DisplayNamesOptions,
     ) -> Result<Self, DataError> {
-        let locale = DataLocale::from_preferences_locale::<ScriptDisplayNamesV1Marker>(
-            prefs.locale_preferences,
-        );
+        let locale = ScriptDisplayNamesV1Marker::make_locale(prefs.locale_preferences);
         let script_data = provider
             .load(DataRequest {
                 id: DataIdentifierBorrowed::for_locale(&locale),
@@ -206,9 +202,7 @@ impl VariantDisplayNames {
         prefs: DisplayNamesPreferences,
         options: DisplayNamesOptions,
     ) -> Result<Self, DataError> {
-        let locale = DataLocale::from_preferences_locale::<VariantDisplayNamesV1Marker>(
-            prefs.locale_preferences,
-        );
+        let locale = VariantDisplayNamesV1Marker::make_locale(prefs.locale_preferences);
         let variant_data = provider
             .load(DataRequest {
                 id: DataIdentifierBorrowed::for_locale(&locale),
@@ -272,9 +266,7 @@ impl LanguageDisplayNames {
         prefs: DisplayNamesPreferences,
         options: DisplayNamesOptions,
     ) -> Result<Self, DataError> {
-        let locale = DataLocale::from_preferences_locale::<LanguageDisplayNamesV1Marker>(
-            prefs.locale_preferences,
-        );
+        let locale = LanguageDisplayNamesV1Marker::make_locale(prefs.locale_preferences);
         let language_data = provider
             .load(DataRequest {
                 id: DataIdentifierBorrowed::for_locale(&locale),
@@ -367,9 +359,7 @@ impl LocaleDisplayNamesFormatter {
             + DataProvider<VariantDisplayNamesV1Marker>
             + ?Sized,
     {
-        let locale = DataLocale::from_preferences_locale::<LocaleDisplayNamesV1Marker>(
-            prefs.locale_preferences,
-        );
+        let locale = LocaleDisplayNamesV1Marker::make_locale(prefs.locale_preferences);
         let req = DataRequest {
             id: DataIdentifierBorrowed::for_locale(&locale),
             ..Default::default()

diff --git a/components/experimental/src/duration/formatter.rs b/components/experimental/src/duration/formatter.rs
@@ -214,9 +214,7 @@ impl DurationFormatter {
         prefs: DurationFormatterPreferences,
         options: ValidatedDurationFormatterOptions,
     ) -> Result<Self, DataError> {
-        let locale = DataLocale::from_preferences_locale::<provider::DigitalDurationDataV1Marker>(
-            prefs.locale_preferences,
-        );
+        let locale = provider::DigitalDurationDataV1Marker::make_locale(prefs.locale_preferences);
         let digital = crate::provider::Baked
             .load(DataRequest {
                 id: DataIdentifierBorrowed::for_locale(&locale),
@@ -247,9 +245,7 @@ impl DurationFormatter {
         prefs: DurationFormatterPreferences,
         options: ValidatedDurationFormatterOptions,
     ) -> Result<Self, DataError> {
-        let locale = DataLocale::from_preferences_locale::<provider::DigitalDurationDataV1Marker>(
-            prefs.locale_preferences,
-        );
+        let locale = provider::DigitalDurationDataV1Marker::make_locale(prefs.locale_preferences);
         let digital = provider
             .load(DataRequest {
                 id: DataIdentifierBorrowed::for_locale(&locale),

diff --git a/components/experimental/src/personnames/specifications/derive_name_order.rs b/components/experimental/src/personnames/specifications/derive_name_order.rs
@@ -29,7 +29,7 @@ pub fn name_order_derive(
         let chain_locale_str = chain_locale.write_to_string();
 
         // switch lookup with UND
-        let mut chain_locale_und = chain_locale.clone();
+        let mut chain_locale_und = *chain_locale;
         chain_locale_und.language = Language::UND;
         let chain_locale_und_str = chain_locale_und.write_to_string();
 

diff --git a/components/experimental/src/relativetime/relativetime.rs b/components/experimental/src/relativetime/relativetime.rs
@@ -138,7 +138,7 @@ macro_rules! constructor {
             prefs: RelativeTimeFormatterPreferences,
             options: RelativeTimeFormatterOptions,
         ) -> Result<Self, DataError> {
-            let locale = DataLocale::from_preferences_locale::<$marker>(prefs.locale_preferences);
+            let locale = <$marker>::make_locale(prefs.locale_preferences);
             let plural_rules = PluralRules::try_new_cardinal((&prefs).into())?;
             // Initialize FixedDecimalFormatter with default options
             let fixed_decimal_format = FixedDecimalFormatter::try_new(
@@ -183,7 +183,7 @@ macro_rules! constructor {
                 + DataProvider<DecimalSymbolsV2Marker> + DataProvider<DecimalDigitsV1Marker>
                 + ?Sized,
         {
-            let locale = DataLocale::from_preferences_locale::<$marker>(prefs.locale_preferences);
+            let locale = <$marker>::make_locale(prefs.locale_preferences);
             let plural_rules = PluralRules::try_new_cardinal_unstable(provider, (&prefs).into())?;
             // Initialize FixedDecimalFormatter with default options
             let fixed_decimal_format = FixedDecimalFormatter::try_new_unstable(