refactor(sync): migrate remaining std mutex usage to parking_lot

src/channels/discord.rs

@@ -1,6 +1,7 @@
 use super::traits::{Channel, ChannelMessage, SendMessage};
 use async_trait::async_trait;
 use futures_util::{SinkExt, StreamExt};
+use parking_lot::Mutex;
 use serde_json::json;
 use tokio_tungstenite::tungstenite::Message;
 use uuid::Uuid;
@@ -13,7 +14,7 @@ pub struct DiscordChannel {
     listen_to_bots: bool,
     mention_only: bool,
     client: reqwest::Client,
-    typing_handle: std::sync::Mutex<Option<tokio::task::JoinHandle<()>>>,
+    typing_handle: Mutex<Option<tokio::task::JoinHandle<()>>>,
 }
 
 impl DiscordChannel {
@@ -31,7 +32,7 @@ impl DiscordChannel {
             listen_to_bots,
             mention_only,
             client: reqwest::Client::new(),
-            typing_handle: std::sync::Mutex::new(None),
+            typing_handle: Mutex::new(None),
         }
     }
 
@@ -451,18 +452,16 @@ impl Channel for DiscordChannel {
             }
         });
 
-        if let Ok(mut guard) = self.typing_handle.lock() {
-            *guard = Some(handle);
-        }
+        let mut guard = self.typing_handle.lock();
+        *guard = Some(handle);
 
         Ok(())
     }
 
     async fn stop_typing(&self, _recipient: &str) -> anyhow::Result<()> {
-        if let Ok(mut guard) = self.typing_handle.lock() {
-            if let Some(handle) = guard.take() {
-                handle.abort();
-            }
+        let mut guard = self.typing_handle.lock();
+        if let Some(handle) = guard.take() {
+            handle.abort();
         }
         Ok(())
     }
@@ -722,7 +721,7 @@ mod tests {
 
     #[test]
     fn split_multibyte_only_content_without_panics() {
-        let msg = "你".repeat(2500);
+        let msg = "🦀".repeat(2500);
         let chunks = split_message_for_discord(&msg);
         assert_eq!(chunks.len(), 2);
         assert_eq!(chunks[0].chars().count(), DISCORD_MAX_MESSAGE_LENGTH);
@@ -752,7 +751,7 @@ mod tests {
     #[test]
     fn typing_handle_starts_as_none() {
         let ch = DiscordChannel::new("fake".into(), None, vec![], false, false);
-        let guard = ch.typing_handle.lock().unwrap();
+        let guard = ch.typing_handle.lock();
         assert!(guard.is_none());
     }
 
@@ -760,7 +759,7 @@ mod tests {
     async fn start_typing_sets_handle() {
         let ch = DiscordChannel::new("fake".into(), None, vec![], false, false);
         let _ = ch.start_typing("123456").await;
-        let guard = ch.typing_handle.lock().unwrap();
+        let guard = ch.typing_handle.lock();
         assert!(guard.is_some());
     }
 
@@ -769,7 +768,7 @@ mod tests {
         let ch = DiscordChannel::new("fake".into(), None, vec![], false, false);
         let _ = ch.start_typing("123456").await;
         let _ = ch.stop_typing("123456").await;
-        let guard = ch.typing_handle.lock().unwrap();
+        let guard = ch.typing_handle.lock();
         assert!(guard.is_none());
     }
 
@@ -785,7 +784,7 @@ mod tests {
         let ch = DiscordChannel::new("fake".into(), None, vec![], false, false);
         let _ = ch.start_typing("111").await;
         let _ = ch.start_typing("222").await;
-        let guard = ch.typing_handle.lock().unwrap();
+        let guard = ch.typing_handle.lock();
         assert!(guard.is_some());
     }