Apply feedback

components/experimental/src/duration/formatter.rs

@@ -162,7 +162,7 @@ impl From<BaseStyle> for icu_list::ListFormatterOptions {
             BaseStyle::Short | BaseStyle::Digital => ListLength::Short,
             BaseStyle::Narrow => ListLength::Narrow,
         };
-        Self::new().with_length(length)
+        Self::default().with_length(length)
     }
 }
 
@@ -195,11 +195,12 @@ impl DurationFormatter {
             })?
             .payload;
 
+        let temp_loc = locale.clone().into_locale();
         Ok(Self {
             digital,
             options,
             unit: DurationUnitFormatter::try_new(locale, options)?,
-            list: ListFormatter::try_new_unit_with_length(locale.into(), options.base.into())?,
+            list: ListFormatter::try_new_unit(temp_loc.into(), options.base.into())?,
             fdf: FixedDecimalFormatter::try_new(locale, Default::default())?,
         })
     }
@@ -224,13 +225,14 @@ impl DurationFormatter {
             })?
             .payload;
 
+        let temp_loc = locale.clone().into_locale();
         Ok(Self {
             digital,
             options,
             unit: DurationUnitFormatter::try_new_unstable(provider, locale, options)?,
-            list: ListFormatter::try_new_unit_with_length_unstable(
+            list: ListFormatter::try_new_unit_unstable(
                 provider,
-                locale.into(),
+                temp_loc.into(),
                 options.base.into(),
             )?,
             fdf: FixedDecimalFormatter::try_new_unstable(provider, locale, Default::default())?,

components/list/examples/and_list.rs

@@ -10,9 +10,9 @@ use icu::list::{ListFormatter, ListFormatterOptions, ListLength};
 use icu::locale::locale;
 
 fn main() {
-    let list_formatter = ListFormatter::try_new_and_with_length(
+    let list_formatter = ListFormatter::try_new_and(
         locale!("es").into(),
-        ListFormatterOptions::new().with_length(ListLength::Wide),
+        ListFormatterOptions::default().with_length(ListLength::Wide),
     )
     .unwrap();
 

components/list/src/lib.rs

@@ -16,9 +16,9 @@
 //! # use icu::locale::locale;
 //! # use writeable::*;
 //! #
-//! let list_formatter = ListFormatter::try_new_and_with_length(
+//! let list_formatter = ListFormatter::try_new_and(
 //!     locale!("es").into(),
-//!     ListFormatterOptions::new()
+//!     ListFormatterOptions::default()
 //!       .with_length(ListLength::Wide)
 //! )
 //! .expect("locale should be present");
@@ -42,9 +42,9 @@
 //! # use icu::locale::locale;
 //! # use writeable::*;
 //! #
-//! let list_formatter = ListFormatter::try_new_or_with_length(
+//! let list_formatter = ListFormatter::try_new_or(
 //!     locale!("th").into(),
-//!     ListFormatterOptions::new()
+//!     ListFormatterOptions::default()
 //!       .with_length(ListLength::Short)
 //! )
 //! .expect("locale should be present");
@@ -60,9 +60,9 @@
 //! # use icu::locale::locale;
 //! # use writeable::*;
 //! #
-//! let list_formatter = ListFormatter::try_new_unit_with_length(
+//! let list_formatter = ListFormatter::try_new_unit(
 //!     locale!("en").into(),
-//!     ListFormatterOptions::new()
+//!     ListFormatterOptions::default()
 //!       .with_length(ListLength::Wide)
 //! )
 //! .expect("locale should be present");

components/list/src/list_formatter.rs

@@ -74,38 +74,38 @@ macro_rules! constructor {
 }
 
 fn get_data_locale_from_prefs(prefs: ListFormatterPreferences) -> DataLocale {
-    // XXX: This should utilize region source priority.
+    // TODO(#5764): This should utilize region source priority.
     DataLocale::from_subtags(
-        prefs.language,
-        prefs.script,
-        prefs.region,
-        prefs.variant,
-        prefs.subdivision,
+        prefs.locale_prefs.language,
+        prefs.locale_prefs.script,
+        prefs.locale_prefs.region,
+        prefs.locale_prefs.variant,
+        prefs.locale_prefs.subdivision,
     )
 }
 
 impl ListFormatter {
     constructor!(
-        try_new_and_with_length,
-        try_new_and_with_length_with_any_provider,
-        try_new_and_with_length_with_buffer_provider,
-        try_new_and_with_length_unstable,
+        try_new_and,
+        try_new_and_with_any_provider,
+        try_new_and_with_buffer_provider,
+        try_new_and_unstable,
         AndListV2Marker,
         "and"
     );
     constructor!(
-        try_new_or_with_length,
-        try_new_or_with_length_with_any_provider,
-        try_new_or_with_length_with_buffer_provider,
-        try_new_or_with_length_unstable,
+        try_new_or,
+        try_new_or_with_any_provider,
+        try_new_or_with_buffer_provider,
+        try_new_or_unstable,
         OrListV2Marker,
         "or"
     );
     constructor!(
-        try_new_unit_with_length,
-        try_new_unit_with_length_with_any_provider,
-        try_new_unit_with_length_with_buffer_provider,
-        try_new_unit_with_length_unstable,
+        try_new_unit,
+        try_new_unit_with_any_provider,
+        try_new_unit_with_buffer_provider,
+        try_new_unit_unstable,
         UnitListV2Marker,
         "unit"
     );
@@ -122,9 +122,9 @@ impl ListFormatter {
     /// use icu::list::*;
     /// # use icu::locale::locale;
     /// # use writeable::*;
-    /// let formatteur = ListFormatter::try_new_and_with_length(
+    /// let formatteur = ListFormatter::try_new_and(
     ///     locale!("fr").into(),
-    ///     ListFormatterOptions::new()
+    ///     ListFormatterOptions::default()
     ///         .with_length(ListLength::Wide)
     /// )
     /// .unwrap();
@@ -388,14 +388,14 @@ mod tests {
 
     #[test]
     fn test_basic() {
-        test!("fr", try_new_or_with_length, (["A", "B"], "A ou B"),);
+        test!("fr", try_new_or, (["A", "B"], "A ou B"),);
     }
 
     #[test]
     fn test_spanish() {
         test!(
             "es",
-            try_new_and_with_length,
+            try_new_and,
             (["x", "Mallorca"], "x y Mallorca"),
             (["x", "Ibiza"], "x e Ibiza"),
             (["x", "Hidalgo"], "x e Hidalgo"),
@@ -404,7 +404,7 @@ mod tests {
 
         test!(
             "es",
-            try_new_or_with_length,
+            try_new_or,
             (["x", "Ibiza"], "x o Ibiza"),
             (["x", "Okinawa"], "x u Okinawa"),
             (["x", "8 más"], "x u 8 más"),
@@ -421,18 +421,14 @@ mod tests {
             (["x", "11.000,92"], "x u 11.000,92"),
         );
 
-        test!(
-            "es-AR",
-            try_new_and_with_length,
-            (["x", "Ibiza"], "x e Ibiza"),
-        );
+        test!("es-AR", try_new_and, (["x", "Ibiza"], "x e Ibiza"),);
     }
 
     #[test]
     fn test_hebrew() {
         test!(
             "he",
-            try_new_and_with_length,
+            try_new_and,
             (["x", "יפו"], "x ויפו"),
             (["x", "Ibiza"], "x ו‑Ibiza"),
         );

components/list/src/options.rs

@@ -8,10 +8,10 @@
 /// ```
 /// use icu::list::{ListFormatterOptions, ListLength};
 ///
-/// let options = ListFormatterOptions::new()
+/// let options = ListFormatterOptions::default()
 ///     .with_length(ListLength::Wide);
 /// ```
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 #[non_exhaustive]
 pub struct ListFormatterOptions {
     /// The length variant should reflect available space for the list.
@@ -20,13 +20,13 @@ pub struct ListFormatterOptions {
 
 impl Default for ListFormatterOptions {
     fn default() -> Self {
-        Self::new()
+        Self::default()
     }
 }
 
 impl ListFormatterOptions {
     /// Constructs a new [`ListFormatterOptions`] struct.
-    pub const fn new() -> Self {
+    pub const fn default() -> Self {
         Self { length: None }
     }
 

components/locale_core/src/extensions/unicode/subdivision.rs

@@ -4,8 +4,6 @@
 
 use core::str::FromStr;
 
-use tinystr::TinyAsciiStr;
-
 use crate::parser::ParseError;
 use crate::subtags::{Region, Subtag};
 
@@ -136,15 +134,8 @@ impl SubdivisionId {
 
     /// Convert to [`Subtag`]
     pub fn into_subtag(self) -> Subtag {
-        use writeable::Writeable;
-
-        // XXX: This can be optimized to concatenate two TinyAsciiStr.
-        let mut result = alloc::string::String::with_capacity(8);
-        let _ = self.write_to(&mut result);
-        #[allow(clippy::expect_used)]
-        let tinystr = TinyAsciiStr::try_from_str(&result)
-            .expect("Constructing 8 chars TinyAsciiStr from two 4 char ones");
-        Subtag::from_tinystr_unvalidated(tinystr)
+        let result = self.region.to_tinystr().concat(self.suffix.to_tinystr());
+        Subtag::from_tinystr_unvalidated(result)
     }
 }