rename locale_prefs to locale_preferences (#5990)

Fixes #5786

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_prefs.language;
+            let lang = prefs.locale_preferences.language;
             if lang == language!("th") {
                 Self::Buddhist
             } else if lang == language!("sa") {

components/calendar/src/week_of.rs

@@ -49,7 +49,8 @@ impl WeekCalculator {
     where
         P: DataProvider<crate::provider::WeekDataV2Marker> + ?Sized,
     {
-        let locale = DataLocale::from_preferences_locale::<WeekDataV2Marker>(prefs.locale_prefs);
+        let locale =
+            DataLocale::from_preferences_locale::<WeekDataV2Marker>(prefs.locale_preferences);
         provider
             .load(DataRequest {
                 id: DataIdentifierBorrowed::for_locale(&locale),

components/collator/src/comparison.rs

@@ -101,8 +101,9 @@ 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_prefs);
+        let data_locale = DataLocale::from_preferences_locale::<CollationTailoringV1Marker>(
+            prefs.locale_preferences,
+        );
         let id = DataIdentifierCow::from_borrowed_and_owned(marker_attributes, data_locale.clone());
 
         let req = DataRequest {

components/collator/tests/tests.rs

@@ -1451,7 +1451,7 @@ fn test_nb_nn_no() {
             DataRequest {
                 id: DataIdentifierCow::from_locale(DataLocale::from_preferences_locale::<
                     CollationTailoringV1Marker,
-                >(prefs.locale_prefs))
+                >(prefs.locale_preferences))
                 .as_borrowed(),
                 ..Default::default()
             }
@@ -1474,7 +1474,7 @@ fn test_nb_nn_no() {
             DataRequest {
                 id: DataIdentifierCow::from_locale(DataLocale::from_preferences_locale::<
                     CollationTailoringV1Marker,
-                >(prefs.locale_prefs))
+                >(prefs.locale_preferences))
                 .as_borrowed(),
                 ..Default::default()
             }
@@ -1497,7 +1497,7 @@ fn test_nb_nn_no() {
             DataRequest {
                 id: DataIdentifierCow::from_locale(DataLocale::from_preferences_locale::<
                     CollationTailoringV1Marker,
-                >(prefs.locale_prefs))
+                >(prefs.locale_preferences))
                 .as_borrowed(),
                 ..Default::default()
             }

components/datetime/src/neo.rs

@@ -47,7 +47,7 @@ define_preferences!(
     /// let prefs1: DateTimeFormatterPreferences = Locale::try_from_str("fr-u-ca-buddhist-hc-h12").unwrap().into();
     ///
     /// let mut prefs2 = DateTimeFormatterPreferences::default();
-    /// prefs2.locale_prefs.language = Language::try_from_str("fr").unwrap();
+    /// prefs2.locale_preferences.language = Language::try_from_str("fr").unwrap();
     /// prefs2.hour_cycle = Some(HourCycle::H12);
     /// prefs2.calendar_algorithm = Some(CalendarAlgorithm::Buddhist);
     ///

components/datetime/src/pattern/names.rs

@@ -1789,7 +1789,9 @@ impl<FSet: DateTimeNamesMarker> RawDateTimeNames<FSet> {
         P: BoundDataProvider<YearNamesV1Marker> + ?Sized,
     {
         let attributes = length.to_attributes();
-        let locale = provider.bound_marker().make_locale(prefs.locale_prefs);
+        let locale = provider
+            .bound_marker()
+            .make_locale(prefs.locale_preferences);
         let req = DataRequest {
             id: DataIdentifierBorrowed::for_marker_attributes_and_locale(attributes, &locale),
             ..Default::default()
@@ -1812,7 +1814,9 @@ impl<FSet: DateTimeNamesMarker> RawDateTimeNames<FSet> {
         P: BoundDataProvider<MonthNamesV1Marker> + ?Sized,
     {
         let attributes = length.to_attributes();
-        let locale = provider.bound_marker().make_locale(prefs.locale_prefs);
+        let locale = provider
+            .bound_marker()
+            .make_locale(prefs.locale_preferences);
         let req = DataRequest {
             id: DataIdentifierBorrowed::for_marker_attributes_and_locale(attributes, &locale),
             ..Default::default()
@@ -1835,7 +1839,9 @@ impl<FSet: DateTimeNamesMarker> RawDateTimeNames<FSet> {
         P: BoundDataProvider<DayPeriodNamesV1Marker> + ?Sized,
     {
         let attributes = length.to_attributes();
-        let locale = provider.bound_marker().make_locale(prefs.locale_prefs);
+        let locale = provider
+            .bound_marker()
+            .make_locale(prefs.locale_preferences);
         let req = DataRequest {
             id: DataIdentifierBorrowed::for_marker_attributes_and_locale(attributes, &locale),
             ..Default::default()
@@ -1858,7 +1864,9 @@ impl<FSet: DateTimeNamesMarker> RawDateTimeNames<FSet> {
         P: BoundDataProvider<WeekdayNamesV1Marker> + ?Sized,
     {
         let attributes = length.to_attributes();
-        let locale = provider.bound_marker().make_locale(prefs.locale_prefs);
+        let locale = provider
+            .bound_marker()
+            .make_locale(prefs.locale_preferences);
         let req = DataRequest {
             id: DataIdentifierBorrowed::for_marker_attributes_and_locale(attributes, &locale),
             ..Default::default()
@@ -1878,7 +1886,9 @@ impl<FSet: DateTimeNamesMarker> RawDateTimeNames<FSet> {
     where
         P: BoundDataProvider<tz::EssentialsV1Marker> + ?Sized,
     {
-        let locale = provider.bound_marker().make_locale(prefs.locale_prefs);
+        let locale = provider
+            .bound_marker()
+            .make_locale(prefs.locale_preferences);
         let error_field = ErrorField(fields::Field {
             symbol: FieldSymbol::TimeZone(fields::TimeZone::LocalizedOffset),
             length: FieldLength::Four,
@@ -1903,7 +1913,9 @@ impl<FSet: DateTimeNamesMarker> RawDateTimeNames<FSet> {
     where
         P: BoundDataProvider<tz::LocationsV1Marker> + ?Sized,
     {
-        let locale = provider.bound_marker().make_locale(prefs.locale_prefs);
+        let locale = provider
+            .bound_marker()
+            .make_locale(prefs.locale_preferences);
         let error_field = ErrorField(fields::Field {
             symbol: FieldSymbol::TimeZone(fields::TimeZone::Location),
             length: FieldLength::Four,
@@ -1946,7 +1958,9 @@ impl<FSet: DateTimeNamesMarker> RawDateTimeNames<FSet> {
         mz_period_provider: &(impl BoundDataProvider<tz::MzPeriodV1Marker> + ?Sized),
         prefs: DateTimeFormatterPreferences,
     ) -> Result<(), PatternLoadError> {
-        let locale = provider.bound_marker().make_locale(prefs.locale_prefs);
+        let locale = provider
+            .bound_marker()
+            .make_locale(prefs.locale_preferences);
         let error_field = ErrorField(fields::Field {
             symbol: FieldSymbol::TimeZone(fields::TimeZone::GenericNonLocation),
             length: FieldLength::Four,
@@ -1970,7 +1984,9 @@ impl<FSet: DateTimeNamesMarker> RawDateTimeNames<FSet> {
         mz_period_provider: &(impl BoundDataProvider<tz::MzPeriodV1Marker> + ?Sized),
         prefs: DateTimeFormatterPreferences,
     ) -> Result<(), PatternLoadError> {
-        let locale = provider.bound_marker().make_locale(prefs.locale_prefs);
+        let locale = provider
+            .bound_marker()
+            .make_locale(prefs.locale_preferences);
         let error_field = ErrorField(fields::Field {
             symbol: FieldSymbol::TimeZone(fields::TimeZone::GenericNonLocation),
             length: FieldLength::One,
@@ -1994,7 +2010,9 @@ impl<FSet: DateTimeNamesMarker> RawDateTimeNames<FSet> {
         mz_period_provider: &(impl BoundDataProvider<tz::MzPeriodV1Marker> + ?Sized),
         prefs: DateTimeFormatterPreferences,
     ) -> Result<(), PatternLoadError> {
-        let locale = provider.bound_marker().make_locale(prefs.locale_prefs);
+        let locale = provider
+            .bound_marker()
+            .make_locale(prefs.locale_preferences);
         let error_field = ErrorField(fields::Field {
             symbol: FieldSymbol::TimeZone(fields::TimeZone::SpecificNonLocation),
             length: FieldLength::Four,
@@ -2018,7 +2036,9 @@ impl<FSet: DateTimeNamesMarker> RawDateTimeNames<FSet> {
         mz_period_provider: &(impl BoundDataProvider<tz::MzPeriodV1Marker> + ?Sized),
         prefs: DateTimeFormatterPreferences,
     ) -> Result<(), PatternLoadError> {
-        let locale = provider.bound_marker().make_locale(prefs.locale_prefs);
+        let locale = provider
+            .bound_marker()
+            .make_locale(prefs.locale_preferences);
         let error_field = ErrorField(fields::Field {
             symbol: FieldSymbol::TimeZone(fields::TimeZone::SpecificNonLocation),
             length: FieldLength::One,

components/datetime/src/raw/neo.rs

@@ -194,7 +194,9 @@ impl DatePatternSelectionData {
         attributes: &DataMarkerAttributes,
         options: RawOptions,
     ) -> Result<Self, DataError> {
-        let locale = provider.bound_marker().make_locale(prefs.locale_prefs);
+        let locale = provider
+            .bound_marker()
+            .make_locale(prefs.locale_preferences);
         let payload = provider
             .load_bound(DataRequest {
                 id: DataIdentifierBorrowed::for_marker_attributes_and_locale(attributes, &locale),
@@ -297,7 +299,9 @@ impl OverlapPatternSelectionData {
         attributes: &DataMarkerAttributes,
         options: RawOptions,
     ) -> Result<Self, DataError> {
-        let locale = provider.bound_marker().make_locale(prefs.locale_prefs);
+        let locale = provider
+            .bound_marker()
+            .make_locale(prefs.locale_preferences);
         let prefs = RawPreferences::from_prefs(prefs);
         let payload = provider
             .load_bound(DataRequest {
@@ -364,7 +368,9 @@ impl TimePatternSelectionData {
         components: TimeFieldSet,
         options: RawOptions,
     ) -> Result<Self, DataError> {
-        let locale = provider.bound_marker().make_locale(prefs.locale_prefs);
+        let locale = provider
+            .bound_marker()
+            .make_locale(prefs.locale_preferences);
         let prefs = RawPreferences::from_prefs(prefs);
         // First try to load with the explicit hour cycle. If there is no explicit hour cycle,
         // or if loading the explicit hour cycle fails, then load with the default hour cycle.
@@ -622,7 +628,9 @@ impl DateTimeZonePatternSelectionData {
         options: RawOptions,
         glue_type: GlueType,
     ) -> Result<DataPayload<GluePatternV1Marker>, DataError> {
-        let locale = provider.bound_marker().make_locale(prefs.locale_prefs);
+        let locale = provider
+            .bound_marker()
+            .make_locale(prefs.locale_preferences);
         provider
             .load_bound(DataRequest {
                 id: DataIdentifierBorrowed::for_marker_attributes_and_locale(

components/decimal/src/lib.rs

@@ -172,7 +172,7 @@ impl FixedDecimalFormatter {
         options: options::FixedDecimalFormatterOptions,
     ) -> Result<Self, DataError> {
         let locale = DataLocale::from_preferences_locale::<provider::DecimalSymbolsV2Marker>(
-            prefs.locale_prefs,
+            prefs.locale_preferences,
         );
         let provided_nu = prefs.numbering_system.as_ref().map(|s| s.as_str());
 

components/experimental/src/compactdecimal/formatter.rs

@@ -110,7 +110,7 @@ impl CompactDecimalFormatter {
         options: CompactDecimalFormatterOptions,
     ) -> Result<Self, DataError> {
         let locale = DataLocale::from_preferences_locale::<ShortCompactDecimalFormatDataV1Marker>(
-            prefs.locale_prefs,
+            prefs.locale_preferences,
         );
         Ok(Self {
             fixed_decimal_formatter: FixedDecimalFormatter::try_new(
@@ -155,7 +155,7 @@ impl CompactDecimalFormatter {
             + ?Sized,
     {
         let locale = DataLocale::from_preferences_locale::<ShortCompactDecimalFormatDataV1Marker>(
-            prefs.locale_prefs,
+            prefs.locale_preferences,
         );
         Ok(Self {
             fixed_decimal_formatter: FixedDecimalFormatter::try_new_unstable(
@@ -201,7 +201,7 @@ impl CompactDecimalFormatter {
         options: CompactDecimalFormatterOptions,
     ) -> Result<Self, DataError> {
         let locale = DataLocale::from_preferences_locale::<LongCompactDecimalFormatDataV1Marker>(
-            prefs.locale_prefs,
+            prefs.locale_preferences,
         );
         Ok(Self {
             fixed_decimal_formatter: FixedDecimalFormatter::try_new(
@@ -246,7 +246,7 @@ impl CompactDecimalFormatter {
             + ?Sized,
     {
         let locale = DataLocale::from_preferences_locale::<LongCompactDecimalFormatDataV1Marker>(
-            prefs.locale_prefs,
+            prefs.locale_preferences,
         );
         Ok(Self {
             fixed_decimal_formatter: FixedDecimalFormatter::try_new_unstable(

components/experimental/src/dimension/currency/compact_formatter.rs

@@ -90,8 +90,9 @@ impl CompactCurrencyFormatter {
         prefs: CompactCurrencyFormatterPreferences,
         options: CompactCurrencyFormatterOptions,
     ) -> Result<Self, DataError> {
-        let short_locale =
-            DataLocale::from_preferences_locale::<ShortCurrencyCompactV1Marker>(prefs.locale_prefs);
+        let short_locale = DataLocale::from_preferences_locale::<ShortCurrencyCompactV1Marker>(
+            prefs.locale_preferences,
+        );
 
         let short_currency_compact = crate::provider::Baked
             .load(DataRequest {
@@ -100,8 +101,9 @@ impl CompactCurrencyFormatter {
             })?
             .payload;
 
-        let essential_locale =
-            DataLocale::from_preferences_locale::<CurrencyEssentialsV1Marker>(prefs.locale_prefs);
+        let essential_locale = DataLocale::from_preferences_locale::<CurrencyEssentialsV1Marker>(
+            prefs.locale_preferences,
+        );
 
         let essential = crate::provider::Baked
             .load(DataRequest {
@@ -138,8 +140,9 @@ impl CompactCurrencyFormatter {
             + DataProvider<icu_decimal::provider::DecimalDigitsV1Marker>
             + DataProvider<icu_plurals::provider::CardinalV1Marker>,
     {
-        let locale =
-            DataLocale::from_preferences_locale::<CurrencyEssentialsV1Marker>(prefs.locale_prefs);
+        let locale = DataLocale::from_preferences_locale::<CurrencyEssentialsV1Marker>(
+            prefs.locale_preferences,
+        );
 
         let compact_decimal_formatter = CompactDecimalFormatter::try_new_short_unstable(
             provider,

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

@@ -81,8 +81,9 @@ impl CurrencyFormatter {
         prefs: CurrencyFormatterPreferences,
         options: super::options::CurrencyFormatterOptions,
     ) -> Result<Self, DataError> {
-        let locale =
-            DataLocale::from_preferences_locale::<CurrencyEssentialsV1Marker>(prefs.locale_prefs);
+        let locale = DataLocale::from_preferences_locale::<CurrencyEssentialsV1Marker>(
+            prefs.locale_preferences,
+        );
         let fixed_decimal_formatter = FixedDecimalFormatter::try_new(
             (&prefs).into(),
             FixedDecimalFormatterOptions::default(),
@@ -113,8 +114,9 @@ impl CurrencyFormatter {
             + DataProvider<icu_decimal::provider::DecimalSymbolsV2Marker>
             + DataProvider<icu_decimal::provider::DecimalDigitsV1Marker>,
     {
-        let locale =
-            DataLocale::from_preferences_locale::<CurrencyEssentialsV1Marker>(prefs.locale_prefs);
+        let locale = DataLocale::from_preferences_locale::<CurrencyEssentialsV1Marker>(
+            prefs.locale_preferences,
+        );
         let fixed_decimal_formatter = FixedDecimalFormatter::try_new_unstable(
             provider,
             (&prefs).into(),

components/experimental/src/dimension/currency/long_compact_formatter.rs

@@ -101,7 +101,7 @@ impl LongCompactCurrencyFormatter {
             })?;
 
         let locale = &DataLocale::from_preferences_locale::<CurrencyPatternsDataV1Marker>(
-            prefs.locale_prefs,
+            prefs.locale_preferences,
         );
 
         let extended = crate::provider::Baked
@@ -143,8 +143,9 @@ impl LongCompactCurrencyFormatter {
             + DataProvider<icu_plurals::provider::CardinalV1Marker>
             + DataProvider<crate::compactdecimal::provider::LongCompactDecimalFormatDataV1Marker>,
     {
-        let locale =
-            DataLocale::from_preferences_locale::<CurrencyPatternsDataV1Marker>(prefs.locale_prefs);
+        let locale = DataLocale::from_preferences_locale::<CurrencyPatternsDataV1Marker>(
+            prefs.locale_preferences,
+        );
 
         let marker_attributes = DataMarkerAttributes::try_from_str(currency_code.0.as_str())
             .map_err(|_| {

components/experimental/src/dimension/currency/long_formatter.rs

@@ -63,8 +63,9 @@ impl LongCurrencyFormatter {
         prefs: CurrencyFormatterPreferences,
         currency_code: &CurrencyCode,
     ) -> Result<Self, DataError> {
-        let locale =
-            DataLocale::from_preferences_locale::<CurrencyPatternsDataV1Marker>(prefs.locale_prefs);
+        let locale = DataLocale::from_preferences_locale::<CurrencyPatternsDataV1Marker>(
+            prefs.locale_preferences,
+        );
         let fixed_decimal_formatter = FixedDecimalFormatter::try_new(
             (&prefs).into(),
             FixedDecimalFormatterOptions::default(),
@@ -113,8 +114,9 @@ impl LongCurrencyFormatter {
             + DataProvider<icu_decimal::provider::DecimalDigitsV1Marker>
             + DataProvider<icu_plurals::provider::CardinalV1Marker>,
     {
-        let locale =
-            DataLocale::from_preferences_locale::<CurrencyPatternsDataV1Marker>(prefs.locale_prefs);
+        let locale = DataLocale::from_preferences_locale::<CurrencyPatternsDataV1Marker>(
+            prefs.locale_preferences,
+        );
         let fixed_decimal_formatter = FixedDecimalFormatter::try_new_unstable(
             provider,
             (&prefs).into(),

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

@@ -154,8 +154,9 @@ where
         fixed_decimal_formatter: R,
         options: PercentFormatterOptions,
     ) -> Result<Self, DataError> {
-        let locale =
-            DataLocale::from_preferences_locale::<PercentEssentialsV1Marker>(prefs.locale_prefs);
+        let locale = DataLocale::from_preferences_locale::<PercentEssentialsV1Marker>(
+            prefs.locale_preferences,
+        );
         let essential = crate::provider::Baked
             .load(DataRequest {
                 id: DataIdentifierBorrowed::for_locale(&locale),
@@ -177,8 +178,9 @@ where
         fixed_decimal_formatter: R,
         options: PercentFormatterOptions,
     ) -> Result<Self, DataError> {
-        let locale =
-            DataLocale::from_preferences_locale::<PercentEssentialsV1Marker>(prefs.locale_prefs);
+        let locale = DataLocale::from_preferences_locale::<PercentEssentialsV1Marker>(
+            prefs.locale_preferences,
+        );
         let essential = provider
             .load(DataRequest {
                 id: DataIdentifierBorrowed::for_locale(&locale),