Global search-and-replace

Author: sffc

components/locale/src/canonicalizer.rs

@@ -54,7 +54,7 @@ fn uts35_rule_matches<'a, I>(
 where
     I: Iterator<Item = &'a str>,
 {
-    (language.is_unknown() || language == source.language)
+    (language.is_und() || language == source.language)
         && (script.is_none() || script == source.script)
         && (region.is_none() || region == source.region)
         && {
@@ -95,8 +95,7 @@ fn uts35_replacement<'a, I>(
 ) where
     I: Iterator<Item = &'a str>,
 {
-    if ruletype_has_language || (source.language.is_unknown() && !replacement.language.is_unknown())
-    {
+    if ruletype_has_language || (source.language.is_und() && !replacement.language.is_und()) {
         source.language = replacement.language;
     }
     if ruletype_has_script || (source.script.is_none() && replacement.script.is_some()) {
@@ -165,7 +164,7 @@ fn uts35_check_language_rules(
     langid: &mut LanguageIdentifier,
     alias_data: &DataPayload<LocaleAliasesV1>,
 ) -> TransformResult {
-    if !langid.language.is_unknown() {
+    if !langid.language.is_und() {
         let lang: TinyAsciiStr<3> = langid.language.into();
         let replacement = if lang.len() == 2 {
             alias_data
@@ -341,7 +340,7 @@ impl<Expander: AsRef<LocaleExpander>> LocaleCanonicalizer<Expander> {
                 continue;
             }
 
-            if !locale.id.language.is_unknown() {
+            if !locale.id.language.is_und() {
                 // If the region is specified, check sgn-region rules first
                 if let Some(region) = locale.id.region {
                     if locale.id.language == language!("sgn") {
@@ -517,14 +516,7 @@ impl<Expander: AsRef<LocaleExpander>> LocaleCanonicalizer<Expander> {
             // if is_iter_sorted(raw_variants.clone()) { // can we sort at construction?
             if uts35_rule_matches(lid, lang, None, None, raw_variants.clone()) {
                 if let Ok(to) = raw_to.parse() {
-                    uts35_replacement(
-                        lid,
-                        !lang.is_unknown(),
-                        false,
-                        false,
-                        Some(raw_variants),
-                        &to,
-                    );
+                    uts35_replacement(lid, !lang.is_und(), false, false, Some(raw_variants), &to);
                     return true;
                 }
             }
@@ -551,7 +543,7 @@ impl<Expander: AsRef<LocaleExpander>> LocaleCanonicalizer<Expander> {
                     if let Ok(to) = raw_to.parse() {
                         uts35_replacement(
                             lid,
-                            !from.language.is_unknown(),
+                            !from.language.is_und(),
                             from.script.is_some(),
                             from.region.is_some(),
                             Some(from.variants.iter().map(Variant::as_str)),
@@ -613,7 +605,7 @@ mod test {
             let result = result.parse::<Locale>().unwrap();
             uts35_replacement(
                 &mut locale.id,
-                !rule_0.language.is_unknown(),
+                !rule_0.language.is_und(),
                 rule_0.script.is_some(),
                 rule_0.region.is_some(),
                 Some(rule_0.variants.iter().map(Variant::as_str)),

components/locale/src/expander.rs

@@ -156,7 +156,7 @@ fn update_langid(
 ) -> TransformResult {
     let mut modified = false;
 
-    if langid.language.is_unknown() && !language.is_unknown() {
+    if langid.language.is_und() && !language.is_und() {
         langid.language = language;
         modified = true;
     }
@@ -375,11 +375,11 @@ impl LocaleExpander {
     pub fn maximize(&self, langid: &mut LanguageIdentifier) -> TransformResult {
         let data = self.as_borrowed();
 
-        if !langid.language.is_unknown() && langid.script.is_some() && langid.region.is_some() {
+        if !langid.language.is_und() && langid.script.is_some() && langid.region.is_some() {
             return TransformResult::Unmodified;
         }
 
-        if !langid.language.is_unknown() {
+        if !langid.language.is_und() {
             if let Some(region) = langid.region {
                 if let Some(script) = data.get_lr(langid.language, region) {
                     return update_langid(Language::UND, Some(script), None, langid);
@@ -414,7 +414,7 @@ impl LocaleExpander {
 
         // We failed to find anything in the und-SR, und-S, or und-R tables,
         // to fall back to bare "und"
-        debug_assert!(langid.language.is_unknown());
+        debug_assert!(langid.language.is_und());
         update_langid(
             data.get_und().0,
             Some(data.get_und().1),
@@ -550,7 +550,7 @@ impl LocaleExpander {
         // 3. region
         // we need to check all cases, because e.g. for "en-US" the default script is associated
         // with "en" but not "en-US"
-        if !language.is_unknown() {
+        if !language.is_und() {
             if let Some(region) = region {
                 // 1. we know both language and region
                 if let Some(script) = data.get_lr(language, region) {

components/locale/src/fallback/algorithms.rs

@@ -121,7 +121,7 @@ impl LocaleFallbackIteratorInner<'_> {
             return;
         }
         // 8. Remove language+script
-        debug_assert!(!locale.language.is_unknown() || locale.script.is_some()); // don't call .step() on und
+        debug_assert!(!locale.language.is_und() || locale.script.is_some()); // don't call .step() on und
         locale.script = None;
         locale.language = Language::UND;
     }
@@ -139,7 +139,7 @@ impl LocaleFallbackIteratorInner<'_> {
             return;
         }
         // 5. Remove language+script
-        if !locale.language.is_unknown() || locale.script.is_some() {
+        if !locale.language.is_und() || locale.script.is_some() {
             locale.script = None;
             locale.language = Language::UND;
             // Don't produce und-variant
@@ -190,7 +190,7 @@ impl LocaleFallbackIteratorInner<'_> {
         }
 
         // Remove the script if we have a language
-        if !locale.language.is_unknown() {
+        if !locale.language.is_und() {
             let language_implied_script = self
                 .likely_subtags
                 .language
@@ -498,7 +498,7 @@ mod tests {
                     if i == 19 {
                         eprintln!("20 iterations reached!");
                     }
-                    if it.get().is_unknown() {
+                    if it.get().is_und() {
                         break;
                     }
                     actual_chain.push(it.get().write_to_string().into_owned());

components/locale/src/fallback/mod.rs

@@ -20,7 +20,7 @@ mod algorithms;
 /// algorithm. See *[the design doc]* for a detailed description and [#2243](
 /// https://github.com/unicode-org/icu4x/issues/2243) to track alignment with *UTS #35*.
 ///
-/// If running fallback in a loop, use [`DataLocale::is_unknown()`] to break from the loop.
+/// If running fallback in a loop, use [`DataLocale::is_und()`] to break from the loop.
 ///
 /// # Examples
 ///

components/locale_core/src/data.rs

@@ -318,12 +318,12 @@ impl DataLocale {
     /// ```
     /// use icu_provider::DataLocale;
     ///
-    /// assert!("und".parse::<DataLocale>().unwrap().is_unknown());
-    /// assert!(!"de-u-sd-denw".parse::<DataLocale>().unwrap().is_unknown());
-    /// assert!(!"und-ES".parse::<DataLocale>().unwrap().is_unknown());
+    /// assert!("und".parse::<DataLocale>().unwrap().is_und());
+    /// assert!(!"de-u-sd-denw".parse::<DataLocale>().unwrap().is_und());
+    /// assert!(!"und-ES".parse::<DataLocale>().unwrap().is_und());
     /// ```
-    pub fn is_unknown(&self) -> bool {
-        self.language.is_unknown()
+    pub fn is_und(&self) -> bool {
+        self.language.is_und()
             && self.script.is_none()
             && self.region.is_none()
             && self.variant.is_none()

components/locale_core/src/langid.rs

@@ -164,8 +164,8 @@ impl LanguageIdentifier {
     }
 
     /// Whether this language identifier equals [`Self::default`].
-    pub const fn is_unknown(&self) -> bool {
-        self.language.is_unknown()
+    pub const fn is_und(&self) -> bool {
+        self.language.is_und()
             && self.script.is_none()
             && self.region.is_none()
             && self.variants.is_empty()

components/locale_core/src/preferences/locale.rs

@@ -158,7 +158,7 @@ impl LocalePreferences {
 
     /// Extends the preferences with the values from another set of preferences.
     pub fn extend(&mut self, other: LocalePreferences) {
-        if !other.language.is_unknown() {
+        if !other.language.is_und() {
             self.language = other.language;
         }
         if let Some(script) = other.script {

components/locale_core/src/subtags/language.rs

@@ -70,7 +70,7 @@ impl Language {
 
     /// Tests if the [`Language`] subtag is the default one (`"und"`).
     #[inline]
-    pub const fn is_unknown(self) -> bool {
+    pub const fn is_und(self) -> bool {
         matches!(self, Self::UND)
     }
 }

components/locale_core/tests/langid.rs

@@ -81,7 +81,7 @@ fn test_langid_subtag_language() {
 
     lang = Default::default();
     assert_eq!(lang, subtags::Language::UND);
-    assert!(lang.is_unknown());
+    assert!(lang.is_und());
 
     assert_writeable_eq!(lang, "und");
 }

ffi/capi/src/fallbacker.rs

@@ -162,7 +162,7 @@ pub mod ffi {
         )]
         pub fn next(&mut self) -> Option<Box<Locale>> {
             let current = self.0.get();
-            if current.is_unknown() {
+            if current.is_und() {
                 None
             } else {
                 let current = *current;