Cleanup

Author: zbraniecki

benches/negotiate.rs

@@ -4,8 +4,7 @@ use criterion::Criterion;
 
 use fluent_langneg::convert_vec_str_to_langids_lossy;
 use fluent_langneg::negotiate_languages;
-
-use icu_locid::LanguageIdentifier;
+use fluent_langneg::LangugeIdentifier;
 
 #[no_mangle]
 #[inline(never)]

src/lib.rs

@@ -22,11 +22,11 @@ pub use accepted_languages::parse as parse_accepted_languages;
 pub use negotiate::negotiate_languages;
 pub use negotiate::NegotiationStrategy;
 
-use icu_locid::{LanguageIdentifier, ParserError};
+pub use icu_locid::{LanguageIdentifier, ParserError as LangugeIdentifierParserError};
 
 pub fn convert_vec_str_to_langids<'a, I, J>(
     input: I,
-) -> Result<Vec<LanguageIdentifier>, ParserError>
+) -> Result<Vec<LanguageIdentifier>, LangugeIdentifierParserError>
 where
     I: IntoIterator<Item = J>,
     J: AsRef<[u8]> + 'a,

src/negotiate/likely_subtags.rs

@@ -12,11 +12,11 @@ static REGION_MATCHING_KEYS: &[(Language, Region)] = &[
     (language!("es"), region!("ES")),
     (language!("fi"), region!("FI")),
     (language!("fr"), region!("FR")),
-    (language!("nu"), region!("NU")),
     (language!("it"), region!("IT")),
     (language!("lt"), region!("LT")),
     (language!("lv"), region!("LV")),
     (language!("nl"), region!("NL")),
+    (language!("nu"), region!("NU")),
     (language!("pl"), region!("PL")),
     (language!("ro"), region!("RO")),
     (language!("ru"), region!("RU")),
@@ -62,3 +62,21 @@ impl LocaleExpander {
         TransformResult::Modified
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_region_matching_sort() {
+        for v in REGION_MATCHING_KEYS.windows(2) {
+            let (v1, v2) = (v[0], v[1]);
+            assert!(
+                v1.0 < v2.0,
+                "Language \"{}\" is placed after \"{}\"",
+                v1.0,
+                v2.0
+            );
+        }
+    }
+}