Update to unic-locale 0.7

Author: zbraniecki

Cargo.toml

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

src/negotiate/likely_subtags.rs

@@ -23,17 +23,25 @@ impl MockLikelySubtags for LanguageIdentifier {
 
                 for subtag in REGION_MATCHING_KEYS {
                     if lang == *subtag {
-                        self.set_region(Some(subtag)).unwrap();
+                        self.set_region(subtag).unwrap();
                         return true;
                     }
                 }
                 return false;
             }
         };
         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();
+        self.set_language(langid.get_language()).unwrap();
+        if let Some(subtag) = langid.get_script() {
+            self.set_script(subtag).unwrap();
+        } else {
+            self.clear_script();
+        }
+        if let Some(subtag) = langid.get_region() {
+            self.set_region(subtag).unwrap();
+        } else {
+            self.clear_region();
+        }
         return true;
     }
 }

src/negotiate/mod.rs

@@ -230,7 +230,7 @@ pub fn filter_matches<'a, R: 'a + AsRef<LanguageIdentifier>, A: 'a + AsRef<Langu
         };
 
         // 4) Try to match against a variant as a range
-        req.set_variants(&[]).unwrap();
+        req.clear_variants();
         av_map.retain(|key, value| {
             if strategy != NegotiationStrategy::Filtering && match_found {
                 return true;
@@ -255,7 +255,7 @@ pub fn filter_matches<'a, R: 'a + AsRef<LanguageIdentifier>, A: 'a + AsRef<Langu
         match_found = false;
 
         // 5) Try to match against the likely subtag without region
-        req.set_region(None).unwrap();
+        req.clear_region();
         if req.add_likely_subtags() {
             av_map.retain(|key, value| {
                 if strategy != NegotiationStrategy::Filtering && match_found {
@@ -282,7 +282,7 @@ pub fn filter_matches<'a, R: 'a + AsRef<LanguageIdentifier>, A: 'a + AsRef<Langu
         }
 
         // 6) Try to match against a region as a range
-        req.set_region(None).unwrap();
+        req.clear_region();
         av_map.retain(|key, value| {
             if strategy != NegotiationStrategy::Filtering && match_found {
                 return true;