Merge remote-tracking branch 'origin/main' into decimaldigits

components/datetime/src/external_loaders.rs

@@ -39,7 +39,8 @@ impl FixedDecimalFormatterLoader for ExternalLoaderCompiledData {
         locale: &DataLocale,
         options: FixedDecimalFormatterOptions,
     ) -> Result<FixedDecimalFormatter, DataError> {
-        FixedDecimalFormatter::try_new(locale, options)
+        let temp_loc = locale.clone().into_locale();
+        FixedDecimalFormatter::try_new(temp_loc.into(), options)
     }
 }
 
@@ -64,7 +65,8 @@ where
         locale: &DataLocale,
         options: FixedDecimalFormatterOptions,
     ) -> Result<FixedDecimalFormatter, DataError> {
-        FixedDecimalFormatter::try_new_with_any_provider(self.0, locale, options)
+        let temp_loc = locale.clone().into_locale();
+        FixedDecimalFormatter::try_new_with_any_provider(self.0, temp_loc.into(), options)
     }
 }
 
@@ -93,7 +95,8 @@ where
         locale: &DataLocale,
         options: FixedDecimalFormatterOptions,
     ) -> Result<FixedDecimalFormatter, DataError> {
-        FixedDecimalFormatter::try_new_with_buffer_provider(self.0, locale, options)
+        let temp_loc = locale.clone().into_locale();
+        FixedDecimalFormatter::try_new_with_buffer_provider(self.0, temp_loc.into(), options)
     }
 }
 
@@ -123,7 +126,8 @@ where
         locale: &DataLocale,
         options: FixedDecimalFormatterOptions,
     ) -> Result<FixedDecimalFormatter, DataError> {
-        FixedDecimalFormatter::try_new_unstable(self.0, locale, options)
+        let temp_loc = locale.clone().into_locale();
+        FixedDecimalFormatter::try_new_unstable(self.0, temp_loc.into(), options)
     }
 }
 

components/datetime/src/format/datetime.rs

@@ -507,7 +507,7 @@ mod tests {
         let mut fixed_decimal_format_options = FixedDecimalFormatterOptions::default();
         fixed_decimal_format_options.grouping_strategy = GroupingStrategy::Never;
         let fixed_decimal_format = FixedDecimalFormatter::try_new(
-            &icu_locale_core::locale!("en").into(),
+            icu_locale_core::locale!("en").into(),
             fixed_decimal_format_options,
         )
         .unwrap();

components/decimal/benches/fixed_decimal_format.rs

@@ -9,7 +9,8 @@ use rand_pcg::Lcg64Xsh32;
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
 use fixed_decimal::FixedDecimal;
-use icu_decimal::FixedDecimalFormatter;
+use icu_decimal::{FixedDecimalFormatter, FixedDecimalFormatterPreferences};
+use icu_locale_core::locale;
 
 fn triangular_nums(range: f64) -> Vec<isize> {
     // Use Lcg64Xsh32, a small, fast PRNG.
@@ -24,13 +25,14 @@ fn triangular_nums(range: f64) -> Vec<isize> {
 
 fn overview_bench(c: &mut Criterion) {
     let nums = triangular_nums(1e9);
-
+    let locale = locale!("en-US");
+    let prefs = FixedDecimalFormatterPreferences::from(&locale);
+    let options = Default::default();
     c.bench_function("icu_decimal/overview", |b| {
         b.iter(|| {
             // This benchmark demonstrates the performance of the format function on 1000 numbers
             // ranging from -1e9 to 1e9.
-            let fdf =
-                FixedDecimalFormatter::try_new(&Default::default(), Default::default()).unwrap();
+            let fdf = FixedDecimalFormatter::try_new(prefs.clone(), options).unwrap();
             for &num in &nums {
                 let fd = FixedDecimal::from(black_box(num));
                 fdf.format_to_string(&fd);

components/decimal/examples/code_line_diff.rs

@@ -21,7 +21,7 @@ const LINES_REMOVED_ADDED: [(i64, i64); 5] = [
 ];
 
 fn main() {
-    let fdf = FixedDecimalFormatter::try_new(&locale!("bn").into(), Default::default())
+    let fdf = FixedDecimalFormatter::try_new(locale!("bn").into(), Default::default())
         .expect("locale should be present");
 
     for (removed, added) in LINES_REMOVED_ADDED {

components/decimal/src/format.rs

@@ -77,7 +77,7 @@ mod tests {
     #[test]
     pub fn test_es_mx() {
         let locale = locale!("es-MX").into();
-        let fmt = FixedDecimalFormatter::try_new(&locale, Default::default()).unwrap();
+        let fmt = FixedDecimalFormatter::try_new(locale, Default::default()).unwrap();
         let fd = "12345.67".parse().unwrap();
         assert_writeable_eq!(fmt.format(&fd), "12,345.67");
     }

components/decimal/src/grouper.rs

@@ -173,7 +173,7 @@ fn test_grouper() {
             };
             let fdf = FixedDecimalFormatter::try_new_unstable(
                 &provider.as_downcasting(),
-                &Default::default(),
+                Default::default(),
                 options,
             )
             .unwrap();

components/decimal/src/lib.rs

@@ -21,7 +21,7 @@
 //! use writeable::assert_writeable_eq;
 //!
 //! let fdf = FixedDecimalFormatter::try_new(
-//!     &locale!("bn").into(),
+//!     locale!("bn").into(),
 //!     Default::default(),
 //! )
 //! .expect("locale should be present");
@@ -40,7 +40,7 @@
 //! use writeable::assert_writeable_eq;
 //!
 //! let fdf =
-//!     FixedDecimalFormatter::try_new(&Default::default(), Default::default())
+//!     FixedDecimalFormatter::try_new(Default::default(), Default::default())
 //!         .expect("locale should be present");
 //!
 //! let fixed_decimal = FixedDecimal::from(200050).multiplied_pow10(-2);
@@ -60,7 +60,7 @@
 //! use writeable::assert_writeable_eq;
 //!
 //! let fdf = FixedDecimalFormatter::try_new(
-//!     &locale!("th-u-nu-thai").into(),
+//!     locale!("th-u-nu-thai").into(),
 //!     Default::default(),
 //! )
 //! .expect("locale should be present");
@@ -101,12 +101,24 @@ pub use format::FormattedFixedDecimal;
 use alloc::string::String;
 use fixed_decimal::FixedDecimal;
 use icu_locale_core::locale;
+use icu_locale_core::preferences::{
+    define_preferences, extensions::unicode::keywords::NumberingSystem,
+};
 use icu_provider::prelude::*;
 use size_test_macro::size_test;
 use writeable::Writeable;
 
 size_test!(FixedDecimalFormatter, fixed_decimal_formatter_size, 104);
 
+define_preferences!(
+    /// The preferences for fixed decimal formatting.
+    FixedDecimalFormatterPreferences,
+    {
+        /// Numbering System. Corresponds to the `-u-nu` in Unicode Locale Identifier.
+        numbering_system: NumberingSystem
+    }
+);
+
 /// A formatter for [`FixedDecimal`], rendering decimal digits in an i18n-friendly way.
 ///
 /// [`FixedDecimalFormatter`] supports:
@@ -135,7 +147,7 @@ impl AsRef<FixedDecimalFormatter> for FixedDecimalFormatter {
 
 impl FixedDecimalFormatter {
     icu_provider::gen_any_buffer_data_constructors!(
-        (locale, options: options::FixedDecimalFormatterOptions) -> error: DataError,
+        (prefs: FixedDecimalFormatterPreferences, options: options::FixedDecimalFormatterOptions) -> error: DataError,
         /// Creates a new [`FixedDecimalFormatter`] from compiled data and an options bag.
     );
 
@@ -146,16 +158,22 @@ impl FixedDecimalFormatter {
             + ?Sized,
     >(
         provider: &D,
-        locale: &DataLocale,
+        prefs: FixedDecimalFormatterPreferences,
         options: options::FixedDecimalFormatterOptions,
     ) -> Result<Self, DataError> {
+        let locale = DataLocale::from_preferences_locale::<provider::DecimalSymbolsV2Marker>(
+            prefs.locale_prefs,
+        );
+        let nu: &str = prefs
+            .numbering_system
+            .as_ref()
+            .map(|s| s.as_str())
+            .unwrap_or("");
         let symbols: DataPayload<provider::DecimalSymbolsV2Marker> = provider
             .load(DataRequest {
                 id: DataIdentifierBorrowed::for_marker_attributes_and_locale(
-                    DataMarkerAttributes::from_str_or_panic(
-                        locale.get_single_unicode_ext("nu").unwrap_or_default(),
-                    ),
-                    locale,
+                    DataMarkerAttributes::from_str_or_panic(nu),
+                    &locale,
                 ),
                 ..Default::default()
             })?

components/decimal/src/options.rs

@@ -32,7 +32,7 @@ impl From<GroupingStrategy> for FixedDecimalFormatterOptions {
 /// let locale = Default::default();
 /// let mut options: options::FixedDecimalFormatterOptions = Default::default();
 /// options.grouping_strategy = options::GroupingStrategy::Min2;
-/// let fdf = FixedDecimalFormatter::try_new(&locale, options)
+/// let fdf = FixedDecimalFormatter::try_new(locale, options)
 ///     .expect("locale should be present");
 ///
 /// let one_thousand = 1000.into();

components/experimental/src/compactdecimal/format.rs

@@ -31,7 +31,7 @@ impl FormattedCompactDecimal<'_> {
     /// use writeable::assert_writeable_eq;
     ///
     /// let short_english = CompactDecimalFormatter::try_new_short(
-    ///     &locale!("en").into(),
+    ///     locale!("en").into(),
     ///     Default::default(),
     /// )
     /// .unwrap();