Switch PluralRules Data to ZeroVec

components/datetime/src/datetime.rs

@@ -13,7 +13,7 @@ use crate::{
 };
 use alloc::string::String;
 use icu_locid::Locale;
-use icu_plurals::{provider::PluralRuleStringsV1Marker, PluralRuleType, PluralRules};
+use icu_plurals::{provider::PluralRulesV1Marker, PluralRuleType, PluralRules};
 use icu_provider::prelude::*;
 
 use crate::{
@@ -65,7 +65,7 @@ pub struct DateTimeFormat<'data> {
     pub(super) locale: Locale,
     pub(super) patterns: DataPayload<'data, PatternPluralsFromPatternsV1Marker>,
     pub(super) symbols: Option<DataPayload<'data, DateSymbolsV1Marker>>,
-    pub(super) ordinal_rules: Option<PluralRules>,
+    pub(super) ordinal_rules: Option<PluralRules<'data>>,
 }
 
 impl<'data> DateTimeFormat<'data> {
@@ -99,7 +99,7 @@ impl<'data> DateTimeFormat<'data> {
         D: DataProvider<'data, DateSymbolsV1Marker>
             + DataProvider<'data, DatePatternsV1Marker>
             + DataProvider<'data, DateSkeletonPatternsV1Marker>
-            + DataProvider<'data, PluralRuleStringsV1Marker>,
+            + DataProvider<'data, PluralRulesV1Marker>,
     {
         let locale = locale.into();
 
@@ -113,7 +113,7 @@ impl<'data> DateTimeFormat<'data> {
 
         let ordinal_rules = if let PatternPlurals::MultipleVariants(_) = &patterns.get().0 {
             Some(PluralRules::try_new(
-                langid.clone(),
+                locale.clone(),
                 data_provider,
                 PluralRuleType::Ordinal,
             )?)
@@ -159,7 +159,7 @@ impl<'data> DateTimeFormat<'data> {
         locale: T,
         patterns: DataPayload<'data, PatternPluralsFromPatternsV1Marker>,
         symbols: Option<DataPayload<'data, DateSymbolsV1Marker>>,
-        ordinal_rules: Option<PluralRules>,
+        ordinal_rules: Option<PluralRules<'data>>,
     ) -> Self {
         let locale = locale.into();
 

components/datetime/src/format/datetime.rs

@@ -56,7 +56,7 @@ where
     pub(crate) symbols: Option<&'l provider::gregory::DateSymbolsV1>,
     pub(crate) datetime: &'l T,
     pub(crate) locale: &'l Locale,
-    pub(crate) ordinal_rules: Option<&'l PluralRules>,
+    pub(crate) ordinal_rules: Option<&'l PluralRules<'data>>,
 }
 
 impl<'l, 'data, T> Writeable for FormattedDateTime<'l, 'data, T>

components/datetime/src/zoned_datetime.rs

@@ -4,7 +4,7 @@
 
 use alloc::string::String;
 use icu_locid::{LanguageIdentifier, Locale};
-use icu_plurals::{provider::PluralRuleStringsV1Marker, PluralRuleType, PluralRules};
+use icu_plurals::{provider::PluralRulesV1Marker, PluralRuleType, PluralRules};
 use icu_provider::{DataProvider, DataRequest, ResourceOptions, ResourcePath};
 
 use crate::{
@@ -118,7 +118,7 @@ impl<'data> ZonedDateTimeFormat<'data> {
             + DataProvider<'data, provider::time_zones::MetaZoneSpecificNamesLongV1Marker>
             + DataProvider<'data, provider::time_zones::MetaZoneSpecificNamesShortV1Marker>
             + ?Sized,
-        PP: DataProvider<'data, PluralRuleStringsV1Marker> + ?Sized,
+        PP: DataProvider<'data, PluralRulesV1Marker>,
     {
         let locale = locale.into();
         let langid: LanguageIdentifier = locale.clone().into();
@@ -131,7 +131,7 @@ impl<'data> ZonedDateTimeFormat<'data> {
 
         let ordinal_rules = if let PatternPlurals::MultipleVariants(_) = &patterns.get().0 {
             Some(PluralRules::try_new(
-                langid.clone(),
+                locale.clone(),
                 plural_provider,
                 PluralRuleType::Ordinal,
             )?)

components/datetime/tests/datetime.rs

@@ -19,7 +19,7 @@ use icu_datetime::{
     DateTimeFormat, DateTimeFormatOptions, ZonedDateTimeFormat,
 };
 use icu_locid::{LanguageIdentifier, Locale};
-use icu_plurals::provider::PluralRuleStringsV1Marker;
+use icu_plurals::provider::PluralRulesV1Marker;
 use icu_provider::prelude::*;
 use icu_provider::struct_provider::StructProvider;
 use patterns::{
@@ -65,11 +65,11 @@ impl<'data> DataProvider<'data, DatePatternsV1Marker> for MultiKeyStructProvider
     }
 }
 
-impl<'data> DataProvider<'data, PluralRuleStringsV1Marker> for MultiKeyStructProvider<'data> {
+impl<'data> DataProvider<'data, PluralRulesV1Marker> for MultiKeyStructProvider<'data> {
     fn load_payload(
         &self,
         _req: &DataRequest,
-    ) -> Result<DataResponse<'data, PluralRuleStringsV1Marker>, icu_provider::DataError> {
+    ) -> Result<DataResponse<'data, PluralRulesV1Marker>, icu_provider::DataError> {
         Err(icu_provider::DataError::MissingPayload)
     }
 }

components/plurals/Cargo.toml

@@ -37,6 +37,8 @@ icu_provider = { version = "0.4", path = "../../provider/core", features = ["mac
 icu_locid = { version = "0.4", path = "../locid" }
 serde = { version = "1.0", default-features = false, features = ["derive", "alloc"], optional = true }
 displaydoc = { version = "0.2.3", default-features = false }
+zerovec = { version = "0.4", path = "../../utils/zerovec", features = ["yoke"] }
+num_enum = { version = "0.5", default_features = false }
 
 [dev-dependencies]
 criterion = "0.3"
@@ -57,7 +59,7 @@ bench = false  # This option is required for Benchmark CI
 std = ["icu_locid/std", "icu_provider/std"]
 default = ["provider_serde"]
 bench = []
-provider_serde = ["serde"]
+provider_serde = ["serde", "zerovec/serde"]
 
 [[bench]]
 name = "operands"

components/plurals/benches/parser.rs

@@ -10,7 +10,7 @@ use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use icu_provider::prelude::*;
 
 fn parser(c: &mut Criterion) {
-    use icu_plurals::rules::parse_condition;
+    use icu_plurals::rules::reference::parse_condition;
 
     let fixture_data = helpers::get_plurals_data();
 
@@ -19,7 +19,7 @@ fn parser(c: &mut Criterion) {
     let mut rules = vec![];
 
     for langid in &fixture_data.langs {
-        let data_payload: DataPayload<icu_plurals::provider::PluralRuleStringsV1Marker> = provider
+        let data_payload: DataPayload<icu_plurals::provider::PluralRulesV1Marker> = provider
             .load_payload(&DataRequest {
                 resource_path: ResourcePath {
                     key: icu_plurals::provider::key::CARDINAL_V1,
@@ -57,7 +57,7 @@ fn parser(c: &mut Criterion) {
 
     #[cfg(feature = "bench")]
     c.bench_function("plurals/parser/lex", |b| {
-        use icu_plurals::rules::Lexer;
+        use icu_plurals::rules::reference::Lexer;
         b.iter(|| {
             for rule in &rules {
                 let _ = Lexer::new(black_box(rule.as_bytes())).count();

components/plurals/src/error.rs

@@ -2,7 +2,7 @@
 // called LICENSE at the top level of the ICU4X source tree
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
-use crate::rules::parser::ParserError;
+use crate::rules::reference::parser::ParserError;
 use displaydoc::Display;
 use icu_provider::prelude::DataError;