Use pattern in icu_decimal

components/decimal/Cargo.toml

@@ -23,6 +23,7 @@ all-features = true
 displaydoc = { workspace = true }
 fixed_decimal = { workspace = true }
 icu_provider = { workspace = true, features = ["macros"] }
+icu_pattern = { workspace = true, features = ["zerofrom"]}
 writeable = { workspace = true }
 
 databake = { workspace = true, features = ["derive"], optional = true}
@@ -46,8 +47,8 @@ criterion = { workspace = true }
 [features]
 default = ["compiled_data"]
 std = ["fixed_decimal/std", "icu_locale_core/std", "icu_provider/std"]
-serde = ["dep:serde", "icu_provider/serde"]
-datagen = ["serde", "dep:databake"]
+serde = ["dep:serde", "icu_provider/serde", "icu_pattern/serde"]
+datagen = ["serde", "dep:databake", "icu_pattern/databake"]
 bench = ["serde"]
 compiled_data = ["dep:icu_decimal_data"]
 

components/decimal/src/format.rs

@@ -7,8 +7,10 @@
 use crate::grouper;
 use crate::options::*;
 use crate::provider::*;
+use alloc::borrow::Cow;
 use fixed_decimal::FixedDecimal;
 use fixed_decimal::Sign;
+use icu_pattern::SinglePlaceholderPattern;
 use writeable::Writeable;
 
 /// An intermediate structure returned by [`FixedDecimalFormatter`](crate::FixedDecimalFormatter).
@@ -21,11 +23,11 @@ pub struct FormattedFixedDecimal<'l> {
 }
 
 impl<'l> FormattedFixedDecimal<'l> {
-    fn get_affixes(&self) -> Option<&AffixesV1> {
+    fn get_patterns(&self) -> Option<&SinglePlaceholderPattern<Cow<'l, str>>> {
         match self.value.sign() {
             Sign::None => None,
-            Sign::Negative => Some(&self.symbols.minus_sign_affixes),
-            Sign::Positive => Some(&self.symbols.plus_sign_affixes),
+            Sign::Negative => Some(self.symbols.minus_sign_pattern.as_ref().unwrap_or(&NEGATIVE_DEFAULT)),
+            Sign::Positive => Some(self.symbols.plus_sign_pattern.as_ref().unwrap_or(&POSITIVE_DEFAULT)),
         }
     }
 }
@@ -35,9 +37,9 @@ impl<'l> Writeable for FormattedFixedDecimal<'l> {
     where
         W: core::fmt::Write + ?Sized,
     {
-        let affixes = self.get_affixes();
-        if let Some(affixes) = affixes {
-            sink.write_str(&affixes.prefix)?;
+        let patterns = self.get_patterns();
+        if let Some(patterns) = patterns {
+            sink.write_str(&patterns.prefix())?;
         }
         let range = self.value.magnitude_range();
         let upper_magnitude = *range.end();
@@ -56,8 +58,8 @@ impl<'l> Writeable for FormattedFixedDecimal<'l> {
                 sink.write_str(&self.symbols.grouping_separator)?;
             }
         }
-        if let Some(affixes) = affixes {
-            sink.write_str(&affixes.suffix)?;
+        if let Some(patterns) = patterns {
+            sink.write_str(&patterns.suffix())?;
         }
         Ok(())
     }

components/decimal/src/provider.rs

@@ -18,6 +18,7 @@
 
 use alloc::borrow::Cow;
 use icu_provider::prelude::*;
+use icu_pattern::SinglePlaceholderPattern;
 
 #[cfg(feature = "compiled_data")]
 #[derive(Debug)]
@@ -46,30 +47,6 @@ const _: () = {
 /// The latest minimum set of markers required by this component.
 pub const MARKERS: &[DataMarkerInfo] = &[DecimalSymbolsV1Marker::INFO];
 
-/// A collection of strings to affix to a decimal number.
-///
-/// <div class="stab unstable">
-/// 🚧 This code is considered unstable; it may change at any time, in breaking or non-breaking ways,
-/// including in SemVer minor releases. While the serde representation of data structs is guaranteed
-/// to be stable, their Rust representation might not be. Use with caution.
-/// </div>
-#[derive(Debug, PartialEq, Clone, yoke::Yokeable, zerofrom::ZeroFrom)]
-#[cfg_attr(
-    feature = "datagen",
-    derive(serde::Serialize, databake::Bake),
-    databake(path = icu_decimal::provider),
-)]
-#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
-pub struct AffixesV1<'data> {
-    /// String to prepend before the decimal number.
-    #[cfg_attr(feature = "serde", serde(borrow))]
-    pub prefix: Cow<'data, str>,
-
-    /// String to append after the decimal number.
-    #[cfg_attr(feature = "serde", serde(borrow))]
-    pub suffix: Cow<'data, str>,
-}
-
 /// A collection of settings expressing where to put grouping separators in a decimal number.
 /// For example, `1,000,000` has two grouping separators, positioned along every 3 digits.
 ///
@@ -117,13 +94,13 @@ pub struct GroupingSizesV1 {
 )]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize))]
 pub struct DecimalSymbolsV1<'data> {
-    /// Prefix and suffix to apply when a negative sign is needed.
+    /// Pattern to apply when a negative sign is needed.
     #[cfg_attr(feature = "serde", serde(borrow))]
-    pub minus_sign_affixes: AffixesV1<'data>,
+    pub minus_sign_pattern: Option<SinglePlaceholderPattern<Cow<'data, str>>>,
 
-    /// Prefix and suffix to apply when a plus sign is needed.
+    /// Pattern to apply when a plus sign is needed.
     #[cfg_attr(feature = "serde", serde(borrow))]
-    pub plus_sign_affixes: AffixesV1<'data>,
+    pub plus_sign_pattern: Option<SinglePlaceholderPattern<Cow<'data, str>>>,
 
     /// Character used to separate the integer and fraction parts of the number.
     #[cfg_attr(feature = "serde", serde(borrow))]
@@ -141,17 +118,16 @@ pub struct DecimalSymbolsV1<'data> {
     pub digits: [char; 10],
 }
 
+/// The value used if [`DecimalSymbolsV1::minus_sign_pattern`] is empty.
+pub static NEGATIVE_DEFAULT: SinglePlaceholderPattern<Cow<'static, str>> = SinglePlaceholderPattern::from_store_unchecked(Cow::Borrowed("\x02-"));
+/// The value used if [`DecimalSymbolsV1::plus_sign_pattern`] is empty.
+pub static POSITIVE_DEFAULT: SinglePlaceholderPattern<Cow<'static, str>> = SinglePlaceholderPattern::from_store_unchecked(Cow::Borrowed("\x02+"));
+
 impl Default for DecimalSymbolsV1<'static> {
     fn default() -> Self {
         Self {
-            minus_sign_affixes: AffixesV1 {
-                prefix: Cow::Borrowed("-"),
-                suffix: Cow::Borrowed(""),
-            },
-            plus_sign_affixes: AffixesV1 {
-                prefix: Cow::Borrowed("+"),
-                suffix: Cow::Borrowed(""),
-            },
+            minus_sign_pattern: None,
+            plus_sign_pattern: None,
             decimal_separator: ".".into(),
             grouping_separator: ",".into(),
             grouping_sizes: GroupingSizesV1 {

ffi/capi/src/decimal.rs

@@ -133,8 +133,8 @@ pub mod ffi {
                     >(
                         icu_provider::DataPayload::<DecimalSymbolsV1Marker>::from_owned(
                             DecimalSymbolsV1 {
-                                plus_sign_affixes,
-                                minus_sign_affixes,
+                                plus_sign_pattern,
+                                minus_sign_pattern,
                                 decimal_separator: str_to_cow(decimal_separator),
                                 grouping_separator: str_to_cow(grouping_separator),
                                 grouping_sizes,