Update unic-langid to 0.9

Author: zbraniecki

Cargo.toml

@@ -25,13 +25,13 @@ coveralls = { repository = "projectfluent/fluent-langneg-rs", branch = "master",
 maintenance = { status = "actively-developed" }
 
 [dependencies]
-unic-langid = "0.8"
+unic-langid = "0.9"
 
 [dev-dependencies]
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-unic-langid = { version = "0.8", features = ["macros"] }
-unic-locale = { version = "0.8", features = ["macros"] }
+unic-langid = { version = "0.9", features = ["macros"] }
+unic-locale = { version = "0.9", features = ["macros"] }
 criterion = "0.3"
 
 [[bench]]

src/negotiate/likely_subtags.rs

@@ -19,29 +19,21 @@ impl MockLikelySubtags for LanguageIdentifier {
             "zh-GB" => "zh-Hant-GB",
             "zh-US" => "zh-Hant-US",
             _ => {
-                let lang = self.language();
+                let lang = self.language;
 
                 for subtag in REGION_MATCHING_KEYS {
                     if lang == *subtag {
-                        self.set_region(subtag).unwrap();
+                        self.region = Some(subtag.parse().unwrap());
                         return true;
                     }
                 }
                 return false;
             }
         };
         let langid: LanguageIdentifier = extended.parse().expect("Failed to parse langid.");
-        self.set_language(langid.language()).unwrap();
-        if let Some(subtag) = langid.script() {
-            self.set_script(subtag).unwrap();
-        } else {
-            self.clear_script();
-        }
-        if let Some(subtag) = langid.region() {
-            self.set_region(subtag).unwrap();
-        } else {
-            self.clear_region();
-        }
+        self.language = langid.language;
+        self.script = langid.script;
+        self.region = langid.region;
         true
     }
 }

src/negotiate/mod.rs

@@ -181,7 +181,7 @@ pub fn filter_matches<'a, R: 'a + AsRef<LanguageIdentifier>, A: 'a + AsRef<Langu
 
         // Per Unicode TR35, 4.4 Locale Matching, we don't add likely subtags to
         // requested locales, so we'll skip it from the rest of the steps.
-        if req.language() == "und" {
+        if req.language.is_empty() {
             continue;
         }
 
@@ -195,13 +195,13 @@ pub fn filter_matches<'a, R: 'a + AsRef<LanguageIdentifier>, A: 'a + AsRef<Langu
         test_strategy!(true, true);
 
         // 5) Try to match against the likely subtag without region
-        req.clear_region();
+        req.region = None;
         if req.maximize() {
             test_strategy!(true, false);
         }
 
         // 6) Try to match against a region as a range
-        req.clear_region();
+        req.region = None;
         test_strategy!(true, true);
     }