Re-add cldr feature

Author: zbraniecki

Cargo.toml

@@ -26,6 +26,7 @@ maintenance = { status = "actively-developed" }
 
 [dependencies]
 icu_locid = "1.4"
+icu_locid_transform = { version = "1.4", optional = true }
 
 [dev-dependencies]
 serde = { version = "1.0", features = ["derive"] }
@@ -38,3 +39,4 @@ harness = false
 
 [features]
 default = []
+cldr = ["icu_locid_transform"]

src/negotiate/likely_subtags.rs

@@ -22,13 +22,21 @@ static REGION_MATCHING_KEYS: &[(Language, Region)] = &[
     (language!("ru"), region!("RU")),
 ];
 
-pub trait MockLikelySubtags {
-    fn maximize(&mut self) -> bool;
+#[derive(PartialEq, Eq, Debug)]
+pub enum TransformResult {
+    Modified,
+    Unmodified,
 }
 
-impl MockLikelySubtags for LanguageIdentifier {
-    fn maximize(&mut self) -> bool {
-        let extended = match &self {
+pub struct LocaleExpander;
+
+impl LocaleExpander {
+    pub fn new() -> Self {
+        Self
+    }
+
+    pub fn maximize(&self, input: &mut LanguageIdentifier) -> TransformResult {
+        let extended = match &input {
             b if *b == &langid!("en") => langid!("en-Latn-US"),
             b if *b == &langid!("fr") => langid!("fr-Latn-FR"),
             b if *b == &langid!("sr") => langid!("sr-Cyrl-SR"),
@@ -37,20 +45,20 @@ impl MockLikelySubtags for LanguageIdentifier {
             b if *b == &langid!("zh-GB") => langid!("zh-Hant-GB"),
             b if *b == &langid!("zh-US") => langid!("zh-Hant-US"),
             _ => {
-                let lang = &self.language;
+                let lang = &input.language;
 
                 if let Ok(idx) = REGION_MATCHING_KEYS.binary_search_by(|(l, _)| l.cmp(lang)) {
                     let subtag = REGION_MATCHING_KEYS[idx].1;
-                    self.region = Some(subtag);
-                    return true;
+                    input.region = Some(subtag);
+                    return TransformResult::Modified;
                 }
-                return false;
+                return TransformResult::Unmodified;
             }
         };
         let (language, script, region) = (extended.language, extended.script, extended.region);
-        self.language = language;
-        self.script = script;
-        self.region = region;
-        true
+        input.language = language;
+        input.script = script;
+        input.region = region;
+        TransformResult::Modified
     }
 }

src/negotiate/mod.rs

@@ -123,8 +123,10 @@ use icu_locid::LanguageIdentifier;
 
 #[cfg(not(feature = "cldr"))]
 mod likely_subtags;
+#[cfg(feature = "cldr")]
+use icu_locid_transform::{LocaleExpander, TransformResult};
 #[cfg(not(feature = "cldr"))]
-use likely_subtags::MockLikelySubtags;
+use likely_subtags::{LocaleExpander, TransformResult};
 
 #[derive(PartialEq, Debug, Clone, Copy)]
 pub enum NegotiationStrategy {
@@ -163,6 +165,8 @@ pub fn filter_matches<'a, R: 'a + AsRef<LanguageIdentifier>, A: 'a + AsRef<Langu
     available: &'a [A],
     strategy: NegotiationStrategy,
 ) -> Vec<&'a A> {
+    let lc = LocaleExpander::new();
+
     let mut supported_locales = vec![];
 
     let mut available_locales: Vec<&A> = available.iter().collect();
@@ -210,7 +214,7 @@ pub fn filter_matches<'a, R: 'a + AsRef<LanguageIdentifier>, A: 'a + AsRef<Langu
 
         let mut req = req.to_owned();
         // 3) Try to match against a maximized version of the requested locale
-        if req.maximize() {
+        if lc.maximize(&mut req) == TransformResult::Modified {
             test_strategy!(req, true, false);
         }
 
@@ -220,7 +224,7 @@ pub fn filter_matches<'a, R: 'a + AsRef<LanguageIdentifier>, A: 'a + AsRef<Langu
 
         // 5) Try to match against the likely subtag without region
         req.region = None;
-        if req.maximize() {
+        if lc.maximize(&mut req) == TransformResult::Modified {
             test_strategy!(req, true, false);
         }