fixup! feat(base): Introduce a DisplayName struct

Author: poljar

crates/matrix-sdk-base/src/deserialized_responses.rs

@@ -70,6 +70,19 @@ pub struct AmbiguityChanges {
     pub changes: BTreeMap<OwnedRoomId, BTreeMap<OwnedEventId, AmbiguityChange>>,
 }
 
+static MXID_REGEX: Lazy<Regex> = Lazy::new(|| {
+    Regex::new(DisplayName::MXID_PATTERN)
+        .expect("We should be able to create a regex from our static MXID pattern")
+});
+static LEFT_TO_RIGHT_REGEX: Lazy<Regex> = Lazy::new(|| {
+    Regex::new(DisplayName::LEFT_TO_RIGHT_PATTERN)
+        .expect("We should be able to create a regex from our static left-to-right pattern")
+});
+static HIDDEN_CHARACTERS_REGEX: Lazy<Regex> = Lazy::new(|| {
+    Regex::new(DisplayName::HIDDEN_CHARACTERS_PATTERN)
+        .expect("We should be able to create a regex from our static hidden characters pattern")
+});
+
 /// A high-level wrapper for strings representing display names.
 ///
 /// This wrapper provides attempts to determine whether a display name
@@ -145,19 +158,6 @@ impl DisplayName {
     const HIDDEN_CHARACTERS_PATTERN: &str =
         "[\u{2000}-\u{200D}\u{300}-\u{036f}\u{2062}-\u{2063}\u{2800}\u{061c}\u{feff}]";
 
-    const MXID_REGEX: Lazy<Regex> = Lazy::new(|| {
-        Regex::new(DisplayName::MXID_PATTERN)
-            .expect("We should be able to create a regex from our static MXID pattern")
-    });
-    const LEFT_TO_RIGHT_REGEX: Lazy<Regex> = Lazy::new(|| {
-        Regex::new(DisplayName::LEFT_TO_RIGHT_PATTERN)
-            .expect("We should be able to create a regex from our static left-to-right pattern")
-    });
-    const HIDDEN_CHARACTERS_REGEX: Lazy<Regex> = Lazy::new(|| {
-        Regex::new(DisplayName::HIDDEN_CHARACTERS_PATTERN)
-            .expect("We should be able to create a regex from our static hidden characters pattern")
-    });
-
     /// Creates a new [`DisplayName`] from the given raw string.
     ///
     /// The raw display name is transformed into a Unicode-normalized form, with
@@ -169,11 +169,11 @@ impl DisplayName {
     /// during construction.
     pub fn new(raw: &str) -> Self {
         let normalized = raw.nfd().collect::<String>();
-        let replaced = Self::HIDDEN_CHARACTERS_REGEX.replace_all(&normalized, "");
+        let replaced = HIDDEN_CHARACTERS_REGEX.replace_all(&normalized, "");
 
         let decancered = decancer::cure!(&replaced)
             .ok()
-            .map(|cured| Self::LEFT_TO_RIGHT_REGEX.replace_all(cured.as_ref(), "").to_string());
+            .map(|cured| LEFT_TO_RIGHT_REGEX.replace_all(cured.as_ref(), "").to_string());
 
         Self { raw: raw.to_owned(), decancered }
     }
@@ -226,11 +226,11 @@ impl DisplayName {
     }
 
     fn has_left_to_right_characters(&self) -> bool {
-        Self::LEFT_TO_RIGHT_REGEX.is_match(&self.raw)
+        LEFT_TO_RIGHT_REGEX.is_match(&self.raw)
     }
 
     fn might_look_like_an_mxid(&self) -> bool {
-        Self::MXID_REGEX.is_match(&self.raw)
+        MXID_REGEX.is_match(&self.raw)
     }
 }