Support unic-langid with CLDR backed likelysubtags

Author: zbraniecki

Cargo.toml

@@ -19,15 +19,19 @@ coveralls = { repository = "projectfluent/fluent-locale-rs", branch = "master",
 maintenance = { status = "actively-developed" }
 
 [dependencies]
-unic-langid = "0.5"
+unic-langid = "0.5.2"
 
 [dev-dependencies]
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-unic-langid = { version = "0.5", features = ["macros"] }
+unic-langid = { version = "0.5.2", features = ["macros"] }
 unic-locale = { version = "0.5", features = ["macros"] }
 criterion = "0.3"
 
 [[bench]]
 name = "negotiate"
-harness = false
+harness = false
+
+[features]
+default = []
+cldr = ["unic-langid/likelysubtags"]

src/negotiate/likely_subtags.rs

@@ -4,8 +4,13 @@ static REGION_MATCHING_KEYS: &[&str] = &[
     "az", "bg", "cs", "de", "es", "fi", "fr", "hu", "it", "lt", "lv", "nl", "pl", "ro", "ru",
 ];
 
-pub fn add(langid: &LanguageIdentifier) -> Option<LanguageIdentifier> {
-    let extended = match langid.to_string().as_str() {
+pub trait MockLikelySubtags {
+  fn add_likely_subtags(&mut self) -> bool;
+}
+
+impl MockLikelySubtags for LanguageIdentifier {
+  fn add_likely_subtags(&mut self) -> bool {
+      let extended = match self.to_string().as_str() {
         "en" => "en-Latn-US",
         "fr" => "fr-Latn-FR",
         "sr" => "sr-Cyrl-SR",
@@ -14,19 +19,21 @@ pub fn add(langid: &LanguageIdentifier) -> Option<LanguageIdentifier> {
         "zh-GB" => "zh-Hant-GB",
         "zh-US" => "zh-Hant-US",
         _ => {
-            let lang = langid.get_language();
+            let lang = self.get_language();
 
             for subtag in REGION_MATCHING_KEYS {
-                if lang == *subtag {
-                    let mut new_lang = langid.clone();
-                    new_lang.set_region(Some(subtag)).unwrap();
-                    return Some(new_lang);
-                }
+              if lang == *subtag {
+                  self.set_region(Some(subtag)).unwrap();
+                  return true;
+              }
             }
-            return None;
+            return false;
         }
-    };
-    let langid: LanguageIdentifier = extended.parse().expect("Failed to parse langid.");
-
-    Some(langid)
+      };
+      let langid: LanguageIdentifier = extended.parse().expect("Failed to parse langid.");
+      self.set_language(Some(langid.get_language())).unwrap();
+      self.set_script(langid.get_script()).unwrap();
+      self.set_region(langid.get_region()).unwrap();
+      return true;
+  }
 }

src/negotiate/mod.rs

@@ -121,7 +121,11 @@
 
 use std::collections::HashMap;
 use unic_langid::LanguageIdentifier;
+
+#[cfg(not(feature = "cldr"))]
 mod likely_subtags;
+#[cfg(not(feature = "cldr"))]
+use likely_subtags::MockLikelySubtags;
 
 #[derive(PartialEq, Debug, Clone, Copy)]
 pub enum NegotiationStrategy {
@@ -144,7 +148,7 @@ pub fn filter_matches<'a, R: 'a + AsRef<LanguageIdentifier>, A: 'a + AsRef<Langu
     }
 
     for req in requested {
-        let req = req.as_ref();
+        let mut req = req.as_ref().to_owned();
         if req.get_language() == "und" {
             continue;
         }
@@ -200,7 +204,7 @@ pub fn filter_matches<'a, R: 'a + AsRef<LanguageIdentifier>, A: 'a + AsRef<Langu
         match_found = false;
 
         // 3) Try to match against a maximized version of the requested locale
-        let mut req = if let Some(req) = likely_subtags::add(req) {
+        if req.add_likely_subtags() {
             av_map.retain(|key, value| {
                 if strategy != NegotiationStrategy::Filtering && match_found {
                     return true;
@@ -223,9 +227,6 @@ pub fn filter_matches<'a, R: 'a + AsRef<LanguageIdentifier>, A: 'a + AsRef<Langu
             }
 
             match_found = false;
-            req
-        } else {
-            req.to_owned()
         };
 
         // 4) Try to match against a variant as a range
@@ -255,7 +256,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.set_region(None).unwrap();
-        if let Some(req) = likely_subtags::add(&req) {
+        if req.add_likely_subtags() {
             av_map.retain(|key, value| {
                 if strategy != NegotiationStrategy::Filtering && match_found {
                     return true;