Use unic-langid 0.4

Author: zbraniecki

fluent-bundle/Cargo.toml

@@ -22,10 +22,11 @@ fluent-locale = { git = "https://github.com/projectfluent/fluent-locale-rs", bra
 fluent-syntax = "0.9"
 failure = "0.1"
 failure_derive = "0.1"
-intl_pluralrules = { git = "https://github.com/zbraniecki/pluralrules", branch = "master" }
+intl_pluralrules = "2.0"
 rental = "0.5.4"
 smallvec = "0.6.10"
-unic-langid = { git = "https://github.com/zbraniecki/unic-locale", branch = "master" }
+unic-langid = { version = "0.4", features = ["macros"] }
+unic-langid-impl = "0.4"
 
 [dev-dependencies]
 criterion = "0.2"

fluent-bundle/README.md

@@ -23,14 +23,14 @@ Usage
 
 ```rust
 use fluent_bundle::{FluentBundle, FluentResource};
-use unic_langid::LanguageIdentifier;
+use unic_langid::langid;
 
 fn main() {
     let ftl_string = "hello-world = Hello, world!".to_owned();
     let res = FluentResource::try_new(ftl_string)
         .expect("Could not parse an FTL string.");
 
-    let langid_en = "en".parse().expect("Parsing failed.");
+    let langid_en = langid!("en");
     let mut bundle = FluentBundle::new(&[langid_en]);
 
     bundle.add_resource(&res)

fluent-bundle/examples/external_arguments.rs

@@ -1,6 +1,6 @@
 use fluent_bundle::{FluentBundle, FluentResource, FluentValue};
 use std::collections::HashMap;
-use unic_langid::LanguageIdentifier;
+use unic_langid::langid;
 
 fn main() {
     let ftl_string = String::from(
@@ -15,7 +15,7 @@ unread-emails =
     ",
     );
     let res = FluentResource::try_new(ftl_string).expect("Could not parse an FTL string.");
-    let langid_en: LanguageIdentifier = "en".parse().expect("Parsing failed.");
+    let langid_en = langid!("en");
     let mut bundle = FluentBundle::new(&[langid_en]);
     bundle
         .add_resource(res)

fluent-bundle/examples/functions.rs

@@ -1,5 +1,5 @@
 use fluent_bundle::{FluentBundle, FluentResource, FluentValue};
-use unic_langid::LanguageIdentifier;
+use unic_langid::langid;
 
 fn main() {
     // We define the resources here so that they outlive
@@ -11,7 +11,7 @@ fn main() {
     let res2 = FluentResource::try_new(ftl_string2).expect("Could not parse an FTL string.");
     let res3 = FluentResource::try_new(ftl_string3).expect("Could not parse an FTL string.");
 
-    let langid_en_us: LanguageIdentifier = "en-US".parse().expect("Parsing failed.");
+    let langid_en_us = langid!("en-US");
     let mut bundle = FluentBundle::new(&[langid_en_us]);
 
     // Test for a simple function that returns a string

fluent-bundle/examples/simple-app.rs

@@ -26,7 +26,7 @@ use std::fs::File;
 use std::io;
 use std::io::prelude::*;
 use std::str::FromStr;
-use unic_langid::LanguageIdentifier;
+use unic_langid::{langid, LanguageIdentifier};
 
 /// We need a generic file read helper function to
 /// read the localization resource file.
@@ -82,7 +82,7 @@ fn main() {
     });
 
     // 4. Negotiate it against the available ones
-    let default_locale: LanguageIdentifier = "en-US".parse().expect("Parsing failed.");
+    let default_locale = langid!("en-US");
     let available = get_available_locales().expect("Retrieving available locales failed.");
     let resolved_locales = negotiate_languages(
         &requested,

fluent-bundle/src/bundle.rs

@@ -13,6 +13,7 @@ use fluent_locale::{negotiate_languages, NegotiationStrategy};
 use fluent_syntax::ast;
 use intl_pluralrules::{IntlPluralRules, PluralRuleType};
 use unic_langid::LanguageIdentifier;
+use unic_langid::langid;
 
 use crate::entry::Entry;
 use crate::entry::GetEntry;
@@ -35,13 +36,13 @@ pub struct FluentMessage<'m> {
 /// ```
 /// use fluent_bundle::{FluentBundle, FluentResource, FluentValue};
 /// use std::collections::HashMap;
-/// use unic_langid::LanguageIdentifier;
+/// use unic_langid::langid;
 ///
 /// let ftl_string = String::from("intro = Welcome, { $name }.");
 /// let resource = FluentResource::try_new(ftl_string)
 ///     .expect("Could not parse an FTL string.");
 ///
-/// let langid_en: LanguageIdentifier = "en-US".parse().expect("Parsing failed.");
+/// let langid_en = langid!("en-US");
 /// let mut bundle = FluentBundle::new(&[langid_en]);
 /// bundle.add_resource(&resource)
 ///     .expect("Failed to add FTL resources to the bundle.");
@@ -107,9 +108,9 @@ impl<R> FluentBundle<R> {
     /// ```
     /// use fluent_bundle::FluentBundle;
     /// use fluent_bundle::FluentResource;
-    /// use unic_langid::LanguageIdentifier;
+    /// use unic_langid::langid;
     ///
-    /// let langid_en: LanguageIdentifier = "en-US".parse().expect("Parsing failed.");
+    /// let langid_en = langid!("en-US");
     /// let mut bundle: FluentBundle<FluentResource> = FluentBundle::new(&[langid_en]);
     /// ```
     ///
@@ -123,7 +124,7 @@ impl<R> FluentBundle<R> {
             .into_iter()
             .map(|s| s.clone().into())
             .collect::<Vec<_>>();
-        let default_langid = "en".parse().expect("Parsing failed.");
+        let default_langid = langid!("en");
         let pr_locale = negotiate_languages(
             &locales,
             &IntlPluralRules::get_locales(PluralRuleType::CARDINAL),
@@ -158,15 +159,15 @@ impl<R> FluentBundle<R> {
     ///
     /// ```
     /// use fluent_bundle::{FluentBundle, FluentResource};
-    /// use unic_langid::LanguageIdentifier;
+    /// use unic_langid::langid;
     ///
     /// let ftl_string = String::from("
     /// hello = Hi!
     /// goodbye = Bye!
     /// ");
     /// let resource = FluentResource::try_new(ftl_string)
     ///     .expect("Could not parse an FTL string.");
-    /// let langid_en: LanguageIdentifier = "en-US".parse().expect("Parsing failed.");
+    /// let langid_en = langid!("en-US");
     /// let mut bundle = FluentBundle::new(&[langid_en]);
     /// bundle.add_resource(resource)
     ///     .expect("Failed to add FTL resources to the bundle.");
@@ -241,12 +242,12 @@ impl<R> FluentBundle<R> {
     ///
     /// ```
     /// use fluent_bundle::{FluentBundle, FluentResource};
-    /// use unic_langid::LanguageIdentifier;
+    /// use unic_langid::langid;
     ///
     /// let ftl_string = String::from("hello = Hi!");
     /// let resource = FluentResource::try_new(ftl_string)
     ///     .expect("Failed to parse an FTL string.");
-    /// let langid_en: LanguageIdentifier = "en-US".parse().expect("Parsing failed.");
+    /// let langid_en = langid!("en-US");
     /// let mut bundle = FluentBundle::new(&[langid_en]);
     /// bundle.add_resource(&resource)
     ///     .expect("Failed to add FTL resources to the bundle.");
@@ -308,12 +309,12 @@ impl<R> FluentBundle<R> {
     ///
     /// ```
     /// use fluent_bundle::{FluentBundle, FluentResource, FluentValue};
-    /// use unic_langid::LanguageIdentifier;
+    /// use unic_langid::langid;
     ///
     /// let ftl_string = String::from("length = { STRLEN(\"12345\") }");
     /// let resource = FluentResource::try_new(ftl_string)
     ///     .expect("Could not parse an FTL string.");
-    /// let langid_en: LanguageIdentifier = "en-US".parse().expect("Parsing failed.");
+    /// let langid_en = langid!("en-US");
     /// let mut bundle = FluentBundle::new(&[langid_en]);
     /// bundle.add_resource(&resource)
     ///     .expect("Failed to add FTL resources to the bundle.");
@@ -353,7 +354,7 @@ impl<R> FluentBundle<R> {
 
 impl<R> Default for FluentBundle<R> {
     fn default() -> Self {
-        let pr_langid: LanguageIdentifier = "en".parse().expect("Parsing failed.");
+        let pr_langid = langid!("en");
         let langid = LanguageIdentifier::default();
 
         let pr = IntlPluralRules::create(pr_langid, PluralRuleType::CARDINAL)

fluent-bundle/src/lib.rs

@@ -13,7 +13,7 @@
 //! ```
 //! use fluent_bundle::{FluentBundle, FluentValue, FluentResource};
 //! use std::collections::HashMap;
-//! use unic_langid::LanguageIdentifier;
+//! use unic_langid::langid;
 //!
 //! let ftl_string = String::from("
 //! hello-world = Hello, world!
@@ -22,7 +22,7 @@
 //! let res = FluentResource::try_new(ftl_string)
 //!     .expect("Could not parse an FTL string.");
 //!
-//! let langid_en: LanguageIdentifier = "en-US".parse().expect("Parsing failed.");
+//! let langid_en = langid!("en-US");
 //! let mut bundle = FluentBundle::new(&[langid_en]);
 //!
 //! bundle

fluent-bundle/tests/types_test.rs

@@ -2,7 +2,7 @@ use fluent_bundle::resolve::Scope;
 use fluent_bundle::types::FluentValue;
 use fluent_bundle::FluentBundle;
 use fluent_bundle::FluentResource;
-use unic_langid::LanguageIdentifier;
+use unic_langid::langid;
 
 #[test]
 fn fluent_value_number() {
@@ -14,7 +14,7 @@ fn fluent_value_number() {
 fn fluent_value_matches() {
     // We'll use `ars` locale since it happens to have all
     // plural rules categories.
-    let langid_ars: LanguageIdentifier = "ars".parse().expect("Parsing failed.");
+    let langid_ars  = langid!("ars");
     let bundle: FluentBundle<FluentResource> = FluentBundle::new(&[langid_ars]);
     let scope = Scope::new(&bundle, None);
 

fluent-fallback/Cargo.toml

@@ -24,4 +24,4 @@ reiterate = "0.1.3"
 
 [dev-dependencies]
 elsa = "1.3.2"
-unic-langid = { git = "https://github.com/zbraniecki/unic-locale", branch = "master" }
+unic-langid = "0.4"

fluent-resmgr/Cargo.toml

@@ -19,6 +19,6 @@ categories = ["localization", "internationalization"]
 [dependencies]
 fluent-bundle = { path = "../fluent-bundle" }
 fluent-locale = { git = "https://github.com/projectfluent/fluent-locale-rs", branch = "master" }
-unic-langid = { git = "https://github.com/zbraniecki/unic-locale", branch = "master" }
+unic-langid = "0.4"
 fluent-fallback = { path = "../fluent-fallback" }
 elsa = "1.3.2"