Fix the privateuse matching by blocking it for now

Zibi Braniecki · Zibi Braniecki · commit 3d67d34092b7 · 2018-07-31T16:08:22.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,34 +1,23 @@
-sudo: false
 language: rust
+sudo: required
 cache: cargo
+dist: trusty
 rust:
   - stable
   - beta
   - nightly
-# Dependencies of kcov, used by coverage
 addons:
-  apt:
-    packages:
-      - libcurl4-openssl-dev
-      - libelf-dev
-      - libdw-dev
-      - binutils-dev
-      - cmake
-    sources:
-      - kalakris-cmake
+    apt:
+        packages:
+            - libssl-dev
 
-before_script:
-  - |
-      cargo install cargo-travis || echo "cargo-travis already installed"
-      export PATH=$HOME/.cargo/bin:$PATH
-
-# the main build
 script:
-  - |
-      cargo build &&
-      cargo test &&
-      cargo doc
+  - cargo build
+  - cargo test
+  - cargo doc
 
-after_success:
-# measure code coverage and upload to coveralls.io
-  - cargo coveralls
+after_success: |
+  if [[ "$TRAVIS_RUST_VERSION" == stable ]]; then
+    RUSTFLAGS="--cfg procmacro2_semver_exempt" cargo install cargo-tarpaulin
+    cargo tarpaulin --ciserver travis-ci --coveralls $TRAVIS_JOB_ID
+  fi
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,6 +13,9 @@ categories = ["internationalization", "localization"]
 
 [badges]
 travis-ci = { repository = "projectfluent/fluent-locale-rs" }
+coveralls = { repository = "projectfluent/fluent-locale-rs", branch = "master", service = "github" }
+
+maintenance = { status = "actively-developed" }
 
 [dependencies]
 
diff --git a/benches/lib.rs b/benches/lib.rs
@@ -3,54 +3,30 @@
 extern crate fluent_locale;
 extern crate test;
 
-use test::Bencher;
-use fluent_locale::Locale;
 use fluent_locale::negotiate_languages;
+use fluent_locale::Locale;
+use test::Bencher;
 
 #[bench]
 fn bench_locale(b: &mut Bencher) {
     let locales = [
-        "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",
+        "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::new(*locale, None);
+    b.iter(|| {
+        for locale in &locales {
+            let _ = Locale::new(*locale, None);
+        }
     });
 }
 
 #[bench]
 fn bench_negotiate(b: &mut Bencher) {
     let requested = vec!["de", "it", "ru"];
     let available = vec![
-        "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",
+        "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(|| {
diff --git a/examples/locale.rs b/examples/locale.rs
@@ -1,7 +1,7 @@
 extern crate fluent_locale;
 
-use std::collections::BTreeMap;
 use fluent_locale::Locale;
+use std::collections::BTreeMap;
 
 fn main() {
     let locale = Locale::from("en-US");
@@ -14,17 +14,13 @@ fn main() {
     println!("region: {:?}", locale.get_region());
     println!("======\n\n");
 
-
-
     let mut locale = Locale::from("de-DE");
     locale.set_region("AT").unwrap();
 
     println!("======");
     println!("Locale: {}", locale);
     println!("======\n\n");
 
-
-
     let mut options = BTreeMap::new();
     options.insert("hour-cycle", "h12");
 
diff --git a/examples/negotiate.rs b/examples/negotiate.rs
@@ -1,7 +1,7 @@
 extern crate fluent_locale;
 
-use fluent_locale::negotiate_languages;
 use fluent_locale::negotiate::NegotiationStrategy;
+use fluent_locale::negotiate_languages;
 
 fn main() {
     let supported = negotiate_languages(
diff --git a/src/lib.rs b/src/lib.rs
@@ -15,11 +15,11 @@
 //! but is arguably a better option for use cases involving operations on
 //! language tags and for language negotiation.
 
+pub mod accepted_languages;
 pub mod locale;
 pub mod negotiate;
-pub mod accepted_languages;
 
+pub use accepted_languages::parse as parse_accepted_languages;
 pub use locale::Locale;
 pub use negotiate::negotiate_languages;
 pub use negotiate::NegotiationStrategy;
-pub use accepted_languages::parse as parse_accepted_languages;
diff --git a/src/locale/mod.rs b/src/locale/mod.rs
@@ -1,8 +1,8 @@
-use std::fmt;
 use std::collections::BTreeMap;
+use std::fmt;
 
-mod parser;
 mod options;
+mod parser;
 
 /// A Locale object.
 ///
@@ -170,6 +170,10 @@ impl Locale {
         self.variants = None;
     }
 
+    pub fn has_privateuse(&self) -> bool {
+        !self.privateuse.is_empty()
+    }
+
     pub fn get_extensions(&self) -> BTreeMap<String, &BTreeMap<String, String>> {
         self.extensions.as_ref().map_or(BTreeMap::new(), |map| {
             map.iter()
@@ -192,6 +196,10 @@ impl Locale {
     }
 
     pub fn matches(&self, other: &Locale, available_range: bool, requested_range: bool) -> bool {
+        if !self.privateuse.is_empty() || other.has_privateuse() {
+            return false;
+        }
+
         if (!available_range || !self.language.is_none())
             && (!requested_range || !other.get_language().is_empty())
             && self.get_language() != other.get_language()
diff --git a/src/locale/options.rs b/src/locale/options.rs
@@ -1,5 +1,5 @@
-use std::collections::BTreeMap;
 use super::Locale;
+use std::collections::BTreeMap;
 
 pub fn option_name_for_key(key: &str) -> &'static str {
     match key {
@@ -17,7 +17,6 @@ pub fn option_key_for_name(key: &str) -> &'static str {
     }
 }
 
-
 pub fn apply_options(loc: &mut Locale, opts: BTreeMap<&str, &str>) {
     for (key, value) in opts {
         match key {
@@ -26,7 +25,8 @@ pub fn apply_options(loc: &mut Locale, opts: BTreeMap<&str, &str>) {
             "region" => loc.region = Some(value.to_owned()),
 
             _ => if let Some(ref mut exts) = loc.extensions {
-                let uext = exts.entry("unicode".to_owned())
+                let uext = exts
+                    .entry("unicode".to_owned())
                     .or_insert_with(BTreeMap::new);
                 uext.insert(key.to_owned(), value.to_owned());
             } else {
diff --git a/src/locale/parser.rs b/src/locale/parser.rs
@@ -1,8 +1,8 @@
+use super::options;
+use super::Locale;
 use std::collections::BTreeMap;
-use std::fmt::{self, Display};
 use std::error::Error as ErrorTrait;
-use super::Locale;
-use super::options;
+use std::fmt::{self, Display};
 
 pub type Result<T> = ::std::result::Result<T, Error>;
 
@@ -168,7 +168,8 @@ pub fn parse_language_tag(t: &str) -> Result<Locale> {
                     } else {
                         position = 2;
                     }
-                } else if position == 1 && slen == 3
+                } else if position == 1
+                    && slen == 3
                     && subtag.chars().all(|c| c.is_ascii_alphabetic())
                 {
                     // extlangs
@@ -177,7 +178,8 @@ pub fn parse_language_tag(t: &str) -> Result<Locale> {
                     } else {
                         locale.extlangs = Some(vec![subtag.to_owned()]);
                     }
-                } else if position <= 2 && slen == 4
+                } else if position <= 2
+                    && slen == 4
                     && subtag.chars().all(|c| c.is_ascii_alphabetic())
                 {
                     // Script
diff --git a/src/negotiate/likely_subtags.rs b/src/negotiate/likely_subtags.rs
@@ -1,21 +1,7 @@
 use locale::Locale;
 
 static REGION_MATCHING_KEYS: &[&str] = &[
-    "az",
-    "bg",
-    "cs",
-    "de",
-    "es",
-    "fi",
-    "fr",
-    "hu",
-    "it",
-    "lt",
-    "lv",
-    "nl",
-    "pl",
-    "ro",
-    "ru",
+    "az", "bg", "cs", "de", "es", "fi", "fr", "hu", "it", "lt", "lv", "nl", "pl", "ro", "ru",
 ];
 
 pub fn add(loc: &str) -> Option<String> {
diff --git a/src/negotiate/mod.rs b/src/negotiate/mod.rs
@@ -110,8 +110,8 @@
 //! ```
 //!
 
-use std::collections::HashMap;
 use super::locale::Locale;
+use std::collections::HashMap;
 
 mod likely_subtags;
 
diff --git a/tests/fixtures/negotiate/lookup/main.json b/tests/fixtures/negotiate/lookup/main.json
@@ -13,5 +13,10 @@
     "input": [["en", "de"], ["en-GB", "en-US", "de"], "it"],
     "strategy": "lookup",
     "output": ["en-US"]
+  },
+  {
+    "input": [["x-testing"], ["en-GB", "en-US", "de"], "it"],
+    "strategy": "lookup",
+    "output": ["it"]
   }
 ]
diff --git a/tests/lib.rs b/tests/lib.rs
@@ -1,11 +1,11 @@
 extern crate fluent_locale;
 extern crate serde_json;
 
+use std::collections::BTreeMap;
 use std::error::Error;
-use std::fs::File;
 use std::fs;
+use std::fs::File;
 use std::path::Path;
-use std::collections::BTreeMap;
 
 use self::fluent_locale::locale::Locale;
 use self::fluent_locale::negotiate::negotiate_languages;
