Merge pull request #158 from robertbastian/main

crates/codegen/Cargo.toml

@@ -7,23 +7,11 @@ license = "MIT OR Apache-2.0"
 [features]
 default = []
 proto = ["dep:prost", "dep:prost-build"]
-icu = ["dep:icu_plurals", "dep:icu_datagen", "dep:icu_provider_adapters"]
 
 [[bin]]
 name = "generate_proto"
 required-features = ["proto"]
 
-
-[[bin]]
-name = "generate_icu"
-required-features = ["icu"]
-
 [dependencies]
 prost = { version = "0.11", optional = true }
 prost-build = { version = "0.11", optional = true }
-
-icu_plurals = { version = "1", features = ["std"], optional = true }
-icu_datagen = { version = "1", optional = true }
-icu_provider_adapters = { version = "1", features = ["std"], optional = true }
-
-

crates/runtime/Cargo.toml

@@ -19,12 +19,9 @@ yarn_slinger_core = { path = "../core" }
 unicode-normalization = "0.1"
 unicode-segmentation = "1"
 log = "0.4"
-icu_plurals = { version = "1", features = ["std"] }
-icu_locid = { version = "1", features = ["std"] }
-icu_provider = { version = "1", features = ["std"] }
-icu_provider_adapters = { version = "1", features = ["std"] }
+icu_plurals = { version = "1.3", features = ["std"] }
+icu_locid = { version = "1.3", features = ["std"] }
 fixed_decimal = { version = "0.5", features = ["ryu", "std"] }
-zerovec = { version = "0.9", features = ["std"] }
 once_cell = "1"
 regex = "1"
 thiserror = "1"

crates/runtime/src/pluralization.rs

@@ -1,12 +1,7 @@
-use crate::pluralization::generated::generate_provider;
 use crate::prelude::Language;
 use fixed_decimal::{DoublePrecision, FixedDecimal};
-use icu_locid::Locale;
 use icu_plurals::{PluralCategory, PluralRuleType};
 use icu_plurals::{PluralOperands, PluralRules};
-use icu_provider::DataLocale;
-
-mod generated;
 
 #[derive(Debug)]
 pub(crate) struct Pluralization {
@@ -17,8 +12,9 @@ pub(crate) struct Pluralization {
 impl Pluralization {
     pub(crate) fn new(language: impl Into<Language>) -> Self {
         let language = language.into();
-        let locale: Locale = language.0.into();
-        let (cardinal_rules, ordinal_rules) = construct_cardinal_and_ordinal_rules(&locale);
+        let locale = language.0.into();
+        let cardinal_rules = PluralRules::try_new(&locale, PluralRuleType::Cardinal).unwrap();
+        let ordinal_rules = PluralRules::try_new(&locale, PluralRuleType::Ordinal).unwrap();
         Self {
             cardinal_rules,
             ordinal_rules,
@@ -36,18 +32,6 @@ impl Pluralization {
     }
 }
 
-fn construct_cardinal_and_ordinal_rules(
-    locale: impl Into<DataLocale>,
-) -> (PluralRules, PluralRules) {
-    let provider = generate_provider();
-    let locale = locale.into();
-    let cardinal_rules =
-        PluralRules::try_new_unstable(&provider, &locale, PluralRuleType::Cardinal).unwrap();
-    let ordinal_rules =
-        PluralRules::try_new_unstable(&provider, &locale, PluralRuleType::Ordinal).unwrap();
-    (cardinal_rules, ordinal_rules)
-}
-
 fn get_into_plural_operand(value: f32) -> PluralOperands {
     let rounded = value.round();
     let floating_point = (rounded - value).abs();
@@ -63,7 +47,6 @@ mod tests {
     //! Adapted from `TestNumberPlurals` in <https://github.com/YarnSpinnerTool/YarnSpinner/blob/da39c7195107d8211f21c263e4084f773b84eaff/YarnSpinner.Tests/LanguageTests.cs>
 
     use super::*;
-    use icu_locid::locale;
 
     #[test]
     fn test_number_plurals() {
@@ -143,18 +126,4 @@ mod tests {
             );
         }
     }
-
-    #[test]
-    fn smoke_test() {
-        let provider = generate_provider();
-        let pr = PluralRules::try_new_unstable(
-            &provider,
-            &locale!("en").into(),
-            PluralRuleType::Cardinal,
-        )
-        .expect("Failed to construct a PluralRules struct.");
-
-        assert_eq!(PluralCategory::One, pr.category_for(1_usize));
-        assert_eq!(PluralCategory::Other, pr.category_for(5_usize));
-    }
 }