Switch to use unic_langid

Author: zbraniecki

Cargo.toml

@@ -19,7 +19,7 @@ coveralls = { repository = "projectfluent/fluent-locale-rs", branch = "master",
 maintenance = { status = "actively-developed" }
 
 [dependencies]
-unic-locale = "^0.1"
+unic-langid = { path = "../../unic-locale/unic-langid" }
 
 [dev-dependencies]
 serde = "^1.0"

benches/lib.rs

@@ -2,20 +2,22 @@
 
 extern crate test;
 
+use fluent_locale::convert_vec_str_to_langids;
 use fluent_locale::negotiate_languages;
-use unic_locale::Locale;
+use std::convert::TryFrom;
 use test::Bencher;
+use unic_langid::LanguageIdentifier;
 
 #[bench]
 fn bench_locale(b: &mut Bencher) {
-    let locales = [
+    let langids = [
         "en-US", "fr", "de", "en-GB", "it", "pl", "ru", "sr-Cyrl", "sr-Latn", "zh-Hant", "zh-Hans",
         "ja-JP", "he-IL", "de-DE", "de-IT",
     ];
 
     b.iter(|| {
-        for locale in &locales {
-            let _ = Locale::from_str(*locale);
+        for locale in &langids {
+            let _ = LanguageIdentifier::try_from(*locale).unwrap();
         }
     });
 }
@@ -28,12 +30,15 @@ fn bench_negotiate(b: &mut Bencher) {
         "ja-JP", "he-IL", "de-DE", "de-IT",
     ];
 
+    let requested = convert_vec_str_to_langids(&requested);
+    let available = convert_vec_str_to_langids(&available);
+
     b.iter(|| {
         negotiate_languages(
             &requested,
             &available,
             None,
-            &fluent_locale::NegotiationStrategy::Filtering,
+            fluent_locale::NegotiationStrategy::Filtering,
         );
     });
 }

examples/negotiate.rs

@@ -1,13 +1,11 @@
 use fluent_locale::negotiate::NegotiationStrategy;
-use fluent_locale::negotiate_languages;
+use fluent_locale::{convert_vec_str_to_langids, negotiate_languages};
 
 fn main() {
-    let supported = negotiate_languages(
-        &["it", "pl", "ru"],
-        &["fr", "en-GB", "en-US", "ru", "pl"],
-        None,
-        &NegotiationStrategy::Filtering,
-    );
+    let requested = convert_vec_str_to_langids(&["it", "pl", "ru"]);
+    let available = convert_vec_str_to_langids(&["fr", "en-GB", "en-US", "ru", "pl"]);
+    let supported =
+        negotiate_languages(&requested, &available, None, NegotiationStrategy::Filtering);
 
     println!("{:?}", supported);
 }

src/accepted_languages.rs

@@ -4,27 +4,41 @@
 //! # Example:
 //!
 //! ```
+//! use std::convert::TryFrom;
+//!
 //! use fluent_locale::negotiate_languages;
 //! use fluent_locale::NegotiationStrategy;
 //! use fluent_locale::parse_accepted_languages;
+//! use fluent_locale::convert_vec_str_to_langids;
+//! use unic_langid::LanguageIdentifier;
 //!
 //! let requested = parse_accepted_languages("de-AT;0.9,de-DE;0.8,de;0.7;en-US;0.5");
+//! let available = convert_vec_str_to_langids(&["fr", "pl", "de", "en-US"]);
+//! let default = LanguageIdentifier::try_from("en-US").expect("Failed to parse a langid.");
 //!
 //! let supported = negotiate_languages(
 //!   &requested,
-//!   &["fr", "pl", "de", "en-US"],
-//!   Some("en-US"),
-//!   &NegotiationStrategy::Filtering
+//!   &available,
+//!   Some(&default),
+//!   NegotiationStrategy::Filtering
 //! );
-//! assert_eq!(supported, vec!["de", "en-US"]);
+//!
+//! let expected = convert_vec_str_to_langids(&["de", "en-US"]);
+//! assert_eq!(supported,
+//!            expected.iter().map(|t| t.as_ref()).collect::<Vec<&LanguageIdentifier>>());
 //! ```
 //!
 //! This function ignores the weights associated with the locales, since Fluent Locale
 //! language negotiation only uses the order of locales, not the weights.
 //!
-pub fn parse(s: &str) -> Vec<&str> {
+
+use std::convert::TryFrom;
+use unic_langid::LanguageIdentifier;
+
+pub fn parse(s: &str) -> Vec<LanguageIdentifier> {
     s.split(',')
         .map(|t| t.trim().split(';').nth(0).unwrap())
         .filter(|t| !t.is_empty())
+        .filter_map(|t| LanguageIdentifier::try_from(t).ok())
         .collect()
 }

src/lib.rs

@@ -19,5 +19,6 @@ pub mod accepted_languages;
 pub mod negotiate;
 
 pub use accepted_languages::parse as parse_accepted_languages;
+pub use negotiate::convert_vec_str_to_langids;
 pub use negotiate::negotiate_languages;
 pub use negotiate::NegotiationStrategy;

src/negotiate/likely_subtags.rs

@@ -1,32 +1,32 @@
-use unic_locale::Locale;
+use std::convert::TryFrom;
+use unic_langid::LanguageIdentifier;
 
 static REGION_MATCHING_KEYS: &[&str] = &[
     "az", "bg", "cs", "de", "es", "fi", "fr", "hu", "it", "lt", "lv", "nl", "pl", "ro", "ru",
 ];
 
-pub fn add(loc: &str) -> Option<String> {
-    let extended = match loc {
-        "en" => "en-Latn-US",
-        "fr" => "fr-Latn-FR",
-        "sr" => "sr-Cyrl-SR",
-        "sr-RU" => "sr-Latn-RU",
-        "az-IR" => "az-Arab-IR",
-        "zh-GB" => "zh-Hant-GB",
-        "zh-US" => "zh-Hant-US",
+pub fn add(langid: &LanguageIdentifier) -> Option<LanguageIdentifier> {
+    let extended = match langid.to_string().as_str() {
+        "en" => LanguageIdentifier::try_from("en-Latn-US"),
+        "fr" => LanguageIdentifier::try_from("fr-Latn-FR"),
+        "sr" => LanguageIdentifier::try_from("sr-Cyrl-SR"),
+        "sr-RU" => LanguageIdentifier::try_from("sr-Latn-SR"),
+        "az-IR" => LanguageIdentifier::try_from("az-Aram-IR"),
+        "zh-GB" => LanguageIdentifier::try_from("zh-Hant-GB"),
+        "zh-US" => LanguageIdentifier::try_from("zh-Hant-US"),
         _ => {
-            let mut locale = Locale::from_str(loc).unwrap();
-            let lang = locale.get_language().to_owned();
+            let lang = langid.get_language();
 
             for subtag in REGION_MATCHING_KEYS {
-                if lang.as_str() == *subtag {
-                    locale.set_region(Some(subtag)).unwrap();
-                    let loc = locale.to_string();
-                    return Some(loc);
+                if lang == *subtag {
+                    let mut new_lang = langid.clone();
+                    new_lang.set_region(Some(subtag)).unwrap();
+                    return Some(new_lang);
                 }
             }
             return None;
         }
     };
 
-    Some(extended.to_owned())
+    Some(extended.expect("Failed to parse langid.").to_owned())
 }