Switched from std::RwLock to parking_lot

src/light_sensor.rs

@@ -1,5 +1,6 @@
-use std::sync::{Weak, RwLock};
+use std::sync::Weak;
 
+use parking_lot::RwLock;
 use pollster::FutureExt as _;
 use rumqttc::{AsyncClient, matches};
 use tracing::{span, Level, log::{error, trace}, debug};
@@ -34,7 +35,7 @@ impl LightSensor {
         let _span = span!(Level::TRACE, "darkness_update").entered();
         listeners.into_iter().for_each(|listener| {
             if let Some(listener) = listener.upgrade() {
-                listener.write().unwrap().on_darkness(dark);
+                listener.write().on_darkness(dark);
             }
         })
     }

src/main.rs

@@ -1,5 +1,6 @@
 #![feature(async_closure)]
-use std::{time::Duration, sync::{Arc, RwLock}, process};
+use std::{time::Duration, sync::Arc, process};
+use parking_lot::RwLock;
 
 use axum::{Router, Json, routing::post, http::StatusCode, extract::FromRef};
 
@@ -67,7 +68,7 @@ async fn main() {
             device_config.into(identifier, &config, client.clone())
         })
         .for_each(|device| {
-            devices.write().unwrap().add_device(device);
+            devices.write().add_device(device);
         });
 
     // Setup presence system
@@ -101,7 +102,7 @@ async fn main() {
             // Handle request might block, so we need to spawn a blocking task
             tokio::task::spawn_blocking(move || {
                 let gc = GoogleHome::new(&user.preferred_username);
-                let result = gc.handle_request(payload, &mut devices.write().unwrap().as_google_home_devices()).unwrap();
+                let result = gc.handle_request(payload, &mut devices.write().as_google_home_devices()).unwrap();
 
                 return (StatusCode::OK, Json(result));
             }).await.unwrap()

src/mqtt.rs

@@ -1,4 +1,5 @@
-use std::sync::{Weak, RwLock};
+use std::sync::Weak;
+use parking_lot::RwLock;
 use serde::{Serialize, Deserialize};
 use tracing::{error, debug, span, Level};
 
@@ -24,7 +25,7 @@ impl Mqtt {
         let _span = span!(Level::TRACE, "mqtt_message").entered();
         listeners.into_iter().for_each(|listener| {
             if let Some(listener) = listener.upgrade() {
-                listener.write().unwrap().on_mqtt(&message);
+                listener.write().on_mqtt(&message);
             }
         })
     }

src/presence.rs

@@ -1,5 +1,6 @@
-use std::{sync::{Weak, RwLock}, collections::HashMap};
+use std::{sync::Weak, collections::HashMap};
 
+use parking_lot::RwLock;
 use tracing::{debug, span, Level, error};
 use rumqttc::{AsyncClient, matches};
 use pollster::FutureExt as _;
@@ -32,7 +33,7 @@ impl Presence {
         let _span = span!(Level::TRACE, "presence_update").entered();
         listeners.into_iter().for_each(|listener| {
             if let Some(listener) = listener.upgrade() {
-                listener.write().unwrap().on_presence(presence);
+                listener.write().on_presence(presence);
             }
         })
     }