unicode-org · sffc · Jun 24, 2021 · Jun 24, 2021
@@ -28,7 +28,6 @@ skip_optional_dependencies = true
 all-features = true
 
 [dependencies]
-smallstr = { version = "0.2", features = ["serde"] }
 icu_locid = { version = "0.2", path = "../locid" }
 icu_provider = { version = "0.2", path = "../../provider/core" }
 fixed_decimal = { version = "0.2", path = "../../utils/fixed_decimal" }

@@ -17,7 +17,7 @@ use writeable::Writeable;
 pub struct FormattedFixedDecimal<'l> {
     pub(crate) value: &'l FixedDecimal,
     pub(crate) options: &'l FixedDecimalFormatOptions,
-    pub(crate) symbols: &'l DecimalSymbolsV1,
+    pub(crate) symbols: &'l DecimalSymbolsV1<'l>,
 }
 
 impl<'l> FormattedFixedDecimal<'l> {
@@ -38,9 +38,7 @@ impl<'l> Writeable for FormattedFixedDecimal<'l> {
     {
         let affixes = self.get_affixes();
         if let Some(affixes) = affixes {
-            if let Some(prefix) = &affixes.prefix {
-                sink.write_str(prefix)?;
-            }
+            sink.write_str(&affixes.prefix)?;
         }
         let range = self.value.magnitude_range();
         let upper_magnitude = *range.end();
@@ -60,9 +58,7 @@ impl<'l> Writeable for FormattedFixedDecimal<'l> {
             }
         }
         if let Some(affixes) = affixes {
-            if let Some(suffix) = &affixes.suffix {
-                sink.write_str(suffix)?;
-            }
+            sink.write_str(&affixes.suffix)?;
         }
         Ok(())
     }

@@ -6,7 +6,7 @@
 //!
 //! Read more about data providers: [`icu_provider`]
 
-pub type SmallString8 = smallstr::SmallString<[u8; 8]>;
+use std::borrow::Cow;
 
 pub mod key {
     //! Resource keys for [`icu_decimal`](crate).
@@ -22,12 +22,14 @@ pub mod key {
     feature = "provider_serde",
     derive(serde::Serialize, serde::Deserialize)
 )]
-pub struct AffixesV1 {
+pub struct AffixesV1<'s> {
     /// String to prepend before the decimal number.
-    pub prefix: Option<SmallString8>,
+    #[cfg_attr(feature = "provider_serde", serde(borrow))]
+    pub prefix: Cow<'s, str>,
 
     /// String to append after the decimal number.
-    pub suffix: Option<SmallString8>,
+    #[cfg_attr(feature = "provider_serde", serde(borrow))]
+    pub suffix: Cow<'s, str>,
 }
 
 /// A collection of settings expressing where to put grouping separators in a decimal number.
@@ -55,18 +57,21 @@ pub struct GroupingSizesV1 {
     feature = "provider_serde",
     derive(serde::Serialize, serde::Deserialize)
 )]
-pub struct DecimalSymbolsV1 {
+pub struct DecimalSymbolsV1<'s> {
     /// Prefix and suffix to apply when a negative sign is needed.
-    pub minus_sign_affixes: AffixesV1,
+    #[cfg_attr(feature = "provider_serde", serde(borrow))]
+    pub minus_sign_affixes: AffixesV1<'s>,
 
     /// Prefix and suffix to apply when a plus sign is needed.
-    pub plus_sign_affixes: AffixesV1,
+    #[cfg_attr(feature = "provider_serde", serde(borrow))]
+    pub plus_sign_affixes: AffixesV1<'s>,
 
     /// Character used to separate the integer and fraction parts of the number.
-    pub decimal_separator: SmallString8,
+    #[cfg_attr(feature = "provider_serde", serde(borrow))]
+    pub decimal_separator: Cow<'s, str>,
 
     /// Character used to separate groups in the integer part of the number.
-    pub grouping_separator: SmallString8,
+    pub grouping_separator: Cow<'s, str>,
 
     /// Settings used to determine where to place groups in the integer part of the number.
     pub grouping_sizes: GroupingSizesV1,
@@ -76,16 +81,16 @@ pub struct DecimalSymbolsV1 {
     pub digits: [char; 10],
 }
 
-impl Default for DecimalSymbolsV1 {
+impl Default for DecimalSymbolsV1<'static> {
     fn default() -> Self {
         Self {
             minus_sign_affixes: AffixesV1 {
-                prefix: Some("-".into()),
-                suffix: None,
+                prefix: Cow::Borrowed("-"),
+                suffix: Cow::Borrowed(""),
             },
             plus_sign_affixes: AffixesV1 {
-                prefix: Some("+".into()),
-                suffix: None,
+                prefix: Cow::Borrowed("+"),
+                suffix: Cow::Borrowed(""),
             },
             decimal_separator: ".".into(),
             grouping_separator: ",".into(),
@@ -99,8 +104,9 @@ impl Default for DecimalSymbolsV1 {
     }
 }
 
-icu_provider::impl_data_marker_no_lifetime!(
-    DecimalSymbolsV1,
+icu_provider::unsafe_impl_data_marker_with_lifetime!(
+    DecimalSymbolsV1<'s>,
     /// Marker type for [`DecimalSymbolsV1`]
-    DecimalSymbolsV1Marker
+    DecimalSymbolsV1Marker,
+    TEMP_ZCF
 );
@@ -0,0 +1,7 @@
+# icu_provider_static [![crates.io](http://meritbadge.herokuapp.com/icu_provider_static)](https://crates.io/crates/icu_provider_static)
+
+
+
+## More Information
+
+For more information on development, authorship, contributing etc. please visit [`ICU4X home page`](https://github.com/unicode-org/icu4x).
@@ -26,14 +26,15 @@ impl StaticDataProvider {
         }
     }
 
-    fn get_file(&self, req: &DataRequest) -> Result<&&str, DataError> {
+    fn get_file(&self, req: &DataRequest) -> Result<&'static str, DataError> {
         let key_components = req.resource_path.key.get_components();
         let opt_components = req.resource_path.options.get_components();
         let key: Vec<&str> = key_components.iter().chain(opt_components.iter()).collect();
         let key = "/".to_string() + &key.join("/");
         self.json
             .get(&*key)
             .ok_or(DataError::UnsupportedResourceKey(req.resource_path.key))
+            .map(|v| *v)
     }
 }
 
@@ -46,13 +47,13 @@ impl Default for StaticDataProvider {
 impl<'d, 's, M> DataProvider<'d, 's, M> for StaticDataProvider
 where
     M: DataMarker<'s>,
-    // TODO(#667): Use zero-copy Deserialize instead of DeserializeOwned
-    M::Yokeable: serde::de::DeserializeOwned,
+    // 'static is what we want here, because we are deserializing from a static buffer.
+    M::Yokeable: serde::de::Deserialize<'static>,
 {
     fn load_payload(&self, req: &DataRequest) -> Result<DataResponse<'d, 's, M>, DataError> {
         let file = self.get_file(req)?;
         let data: M::Yokeable =
-            M::Yokeable::deserialize(&mut serde_json::Deserializer::from_reader(file.as_bytes()))
+            M::Yokeable::deserialize(&mut serde_json::Deserializer::from_slice(file.as_bytes()))
                 .map_err(|e| DataError::Resource(Box::new(e)))?;
         Ok(DataResponse {
             metadata: DataResponseMetadata {

@@ -9,8 +9,6 @@ use serde_aux::prelude::*;
 use std::collections::HashMap;
 use tinystr::{TinyStr8, TinyStrAuto};
 
-pub type SmallString8 = smallstr::SmallString<[u8; 8]>;
-
 pub mod numbers_json {
     //! Serde structs representing CLDR JSON numbers.json files.
     //!
@@ -24,12 +22,12 @@ pub mod numbers_json {
     #[derive(PartialEq, Debug, Deserialize)]
     pub struct Symbols {
         // This list is not comprehensive; add more fields when needed
-        pub decimal: SmallString8,
-        pub group: SmallString8,
+        pub decimal: String,
+        pub group: String,
         #[serde(rename = "minusSign")]
-        pub minus_sign: SmallString8,
+        pub minus_sign: String,
         #[serde(rename = "plusSign")]
-        pub plus_sign: SmallString8,
+        pub plus_sign: String,
     }
 
     #[derive(PartialEq, Debug, Deserialize)]

@@ -6,10 +6,10 @@
 //!
 //! Spec reference: https://unicode.org/reports/tr35/tr35-numbers.html#Number_Format_Patterns
 
-use std::str::FromStr;
-type SmallString8 = smallstr::SmallString<[u8; 8]>;
 use icu_decimal::provider::AffixesV1;
 use itertools::Itertools;
+use std::borrow::Cow;
+use std::str::FromStr;
 use thiserror::Error;
 
 #[derive(Error, Debug, PartialEq)]
@@ -23,8 +23,8 @@ pub enum Error {
 /// Representation of a UTS-35 number subpattern (part of a number pattern between ';'s).
 #[derive(Debug, PartialEq)]
 pub struct DecimalSubPattern {
-    pub prefix: SmallString8,
-    pub suffix: SmallString8,
+    pub prefix: String,
+    pub suffix: String,
     pub primary_grouping: u8,
     pub secondary_grouping: u8,
     pub min_fraction_digits: u8,
@@ -98,29 +98,16 @@ impl FromStr for DecimalPattern {
 }
 
 impl DecimalPattern {
-    pub fn localize_sign(&self, sign_str: &str) -> AffixesV1 {
+    pub fn localize_sign(&self, sign_str: &str) -> AffixesV1<'static> {
         // UTS 35: the absence of a negative pattern means a single prefixed sign
         let signed_affixes = self
             .negative
             .as_ref()
-            .map(|subpattern| {
-                (
-                    if subpattern.prefix.is_empty() {
-                        None
-                    } else {
-                        Some(subpattern.prefix.clone())
-                    },
-                    if subpattern.suffix.is_empty() {
-                        None
-                    } else {
-                        Some(subpattern.suffix.clone())
-                    },
-                )
-            })
-            .unwrap_or_else(|| (Some("-".into()), None));
+            .map(|subpattern| (subpattern.prefix.as_str(), subpattern.suffix.as_str()))
+            .unwrap_or_else(|| ("-", ""));
         AffixesV1 {
-            prefix: signed_affixes.0.map(|s| s.replace("-", sign_str).into()),
-            suffix: signed_affixes.1.map(|s| s.replace("-", sign_str).into()),
+            prefix: Cow::Owned(signed_affixes.0.replace("-", sign_str)),
+            suffix: Cow::Owned(signed_affixes.1.replace("-", sign_str)),
         }
     }
 }

@@ -160,7 +160,7 @@ impl<'d> IterableDataProviderCore for NumbersProvider {
     }
 }
 
-impl TryFrom<&cldr_serde::numbers_json::Numbers> for DecimalSymbolsV1 {
+impl TryFrom<&cldr_serde::numbers_json::Numbers> for DecimalSymbolsV1<'static> {
     type Error = Cow<'static, str>;
 
     fn try_from(other: &cldr_serde::numbers_json::Numbers) -> Result<Self, Self::Error> {
@@ -183,8 +183,8 @@ impl TryFrom<&cldr_serde::numbers_json::Numbers> for DecimalSymbolsV1 {
         Ok(Self {
             minus_sign_affixes: parsed_pattern.localize_sign(&symbols.minus_sign),
             plus_sign_affixes: parsed_pattern.localize_sign(&symbols.plus_sign),
-            decimal_separator: symbols.decimal.clone(),
-            grouping_separator: symbols.group.clone(),
+            decimal_separator: Cow::Owned(symbols.decimal.clone()),
+            grouping_separator: Cow::Owned(symbols.group.clone()),
             grouping_sizes: GroupingSizesV1 {
                 primary: parsed_pattern.positive.primary_grouping,
                 secondary: parsed_pattern.positive.secondary_grouping,

@@ -26,7 +26,7 @@ pub mod key {
     derive(serde::Serialize, serde::Deserialize)
 )]
 pub struct HelloWorldV1<'s> {
-    // TODO(#667): Use serde borrow.
+    #[cfg_attr(feature = "provider_serde", serde(borrow))]
     pub message: Cow<'s, str>,
 }
 

@@ -26,8 +26,7 @@ fn test_deserializer_static() {
     assert!(matches!(
         payload.get(),
         &HelloWorldV1 {
-            // TODO(#667): This should be Borrowed once HelloWorldV1 supports it
-            message: Cow::Owned(_)
+            message: Cow::Borrowed(_)
         }
     ));
 }
@@ -48,8 +47,7 @@ fn test_deserializer_owned() {
     assert!(matches!(
         payload.get(),
         &HelloWorldV1 {
-            // TODO(#667): This should be Borrowed once HelloWorldV1 supports it
-            message: Cow::Owned(_)
+            message: Cow::Borrowed(_)
         }
     ));
 }
@@ -1,11 +1,11 @@
 {
   "minus_sign_affixes": {
     "prefix": "؜-",
-    "suffix": null
+    "suffix": ""
   },
   "plus_sign_affixes": {
     "prefix": "؜+",
-    "suffix": null
+    "suffix": ""
   },
   "decimal_separator": "٫",
   "grouping_separator": "٬",

@@ -1,11 +1,11 @@
 {
   "minus_sign_affixes": {
     "prefix": "؜-",
-    "suffix": null
+    "suffix": ""
   },
   "plus_sign_affixes": {
     "prefix": "؜+",
-    "suffix": null
+    "suffix": ""
   },
   "decimal_separator": "٫",
   "grouping_separator": "٬",

@@ -1,11 +1,11 @@
 {
   "minus_sign_affixes": {
     "prefix": "-",
-    "suffix": null
+    "suffix": ""
   },
   "plus_sign_affixes": {
     "prefix": "+",
-    "suffix": null
+    "suffix": ""
   },
   "decimal_separator": ".",
   "grouping_separator": ",",

@@ -1,11 +1,11 @@
 {
   "minus_sign_affixes": {
     "prefix": "-",
-    "suffix": null
+    "suffix": ""
   },
   "plus_sign_affixes": {
     "prefix": "+",
-    "suffix": null
+    "suffix": ""
   },
   "decimal_separator": ".",
   "grouping_separator": ",",

@@ -1,11 +1,11 @@
 {
   "minus_sign_affixes": {
     "prefix": "-",
-    "suffix": null
+    "suffix": ""
   },
   "plus_sign_affixes": {
     "prefix": "+",
-    "suffix": null
+    "suffix": ""
   },
   "decimal_separator": ".",
   "grouping_separator": ",",

@@ -1,11 +1,11 @@
 {
   "minus_sign_affixes": {
     "prefix": "-",
-    "suffix": null
+    "suffix": ""
   },
   "plus_sign_affixes": {
     "prefix": "+",
-    "suffix": null
+    "suffix": ""
   },
   "decimal_separator": ",",
   "grouping_separator": " ",