successfully upgrades icu crate dependency to v2

Author: sts10

src/lib.rs

@@ -1,8 +1,6 @@
-use icu::collator::options;
-
-use icu::collator::options::CollatorOptions;
-// use icu::locid::Locale;
-use icu::locale::locale;
+// use core::cmp::Ordering;
+use icu::locale::Locale;
+// use icu::locale::locale;
 use rand::prelude::SliceRandom;
 use rand::rng;
 pub mod cards;
@@ -337,21 +335,23 @@ pub fn tidy_list(req: TidyRequest) -> Vec<String> {
         // accented characters very well.
 
         // First, parse the given locale into a valid Locale
-        let locale: Locale = req
-            .locale
+        let loc = req.locale.to_string();
+        let loc: Locale = loc
             .parse()
             .expect("Error: given locale is not parse-able. Try form similar to en-US or es-ES.");
+
         // Now use that Locale to sort the list more carefully
-        tidied_list = sort_carefully(tidied_list, locale);
+        tidied_list = sort_carefully(tidied_list, loc);
     }
     if req.sort_by_length {
         // First, parse the given locale into a valid Locale
-        let locale: Locale = req
-            .locale
+        let loc = req.locale.to_string();
+        let loc: Locale = loc
             .parse()
             .expect("Error: given locale is not parse-able. Try form similar to en-US or es-ES.");
+
         eprintln!("Calling sort_by_length");
-        tidied_list = sort_by_length(tidied_list, locale);
+        tidied_list = sort_by_length(tidied_list, loc);
     }
     // And remove duplicates one more time
     tidied_list = dedup_without_sorting(&mut tidied_list);

src/list_manipulations.rs

@@ -16,17 +16,20 @@ pub fn normalize_unicode(word: &str, nf: &str) -> Result<String, String> {
     }
 }
 
-use icu::collator::options::CollatorOptions;
-use icu::collator::*;
-// use icu::locid::Locale;
+// use core::cmp::Ordering;
+use icu::collator::{options::*, *};
+// use icu::locale::locale;
+use icu::locale::Locale;
 /// Sort a Vector of words alphabetically, taking into account the locale of the words
 /// `.sorted()` words -> ["Zambia", "abbey", "eager", "enlever", "ezra", "zoo", "énigme"]
 /// sort_carefully words -> ["abbey", "eager", "énigme", "enlever", "ezra", "Zambia", "zoo"]
-pub fn sort_carefully(list: Vec<String>, locale: Locale) -> Vec<String> {
-    // https://github.com/unicode-org/icu4x/tree/main/components/collator#examples
-    let mut options = CollatorOptions::new();
-    options.strength = Some(Strength::Secondary);
-    let collator: Collator = Collator::try_new(&locale.into(), options).unwrap();
+pub fn sort_carefully(list: Vec<String>, loc: Locale) -> Vec<String> {
+    // Examples:  https://github.com/unicode-org/icu4x/tree/main/components/collator#examples
+    // Reference: https://docs.rs/icu/latest/icu/collator/index.html
+    //            https://docs.rs/icu/latest/icu/locale/struct.Locale.html
+    let mut options = CollatorOptions::default();
+    options.strength = Some(Strength::Secondary); // Note this is not the locally defined passphrase Strength!
+    let collator = Collator::try_new(loc.into(), options).unwrap();
 
     let mut newly_sorted_list = list;
     newly_sorted_list.sort_by(|a, b| collator.compare(a, b));
@@ -35,11 +38,12 @@ pub fn sort_carefully(list: Vec<String>, locale: Locale) -> Vec<String> {
 
 /// Sort by word length, with longest words first. For words of equal length, sorts
 /// word alphabetically, respecting inputted locale.
-pub fn sort_by_length(list: Vec<String>, locale: Locale) -> Vec<String> {
+pub fn sort_by_length(list: Vec<String>, loc: Locale) -> Vec<String> {
     // Set up the collator again
-    let mut options = CollatorOptions::new();
+    let mut options = CollatorOptions::default();
     options.strength = Some(Strength::Secondary);
-    let collator: Collator = Collator::try_new(&locale.into(), options).unwrap();
+    // let collator = Collator::try_new(locale, options).unwrap();
+    let collator = Collator::try_new(loc.into(), options).unwrap();
 
     let mut list = list;
     // Order by count_characters(w) descending, then within that,