Even more changes

Use a more rusty expr instead of match
cashubtc · Dec 16, 2024 · 9d83391 · 9d83391
1 parent a26bb7a
commit 9d83391
Showing 1 changed file with 27 additions and 19 deletions.
diff --git a/crates/cdk-axum/src/cache/backend/redis.rs b/crates/cdk-axum/src/cache/backend/redis.rs
@@ -51,40 +51,48 @@ impl HttpCacheStorage for HttpCacheRedis {
     }
 
     async fn get(&self, key: &HttpCacheKey) -> Option<Vec<u8>> {
-        let mut conn = match self.client.get_multiplexed_tokio_connection().await {
-            Ok(conn) => conn,
-            Err(err) => {
+        let mut conn = self
+            .client
+            .get_multiplexed_tokio_connection()
+            .await
+            .map_err(|err| {
                 tracing::error!("Failed to get redis connection: {:?}", err);
-                return None;
-            }
-        };
+                err
+            })
+            .ok()?;
 
         let mut db_key = self.prefix.clone().unwrap_or_default();
         db_key.extend(&**key);
 
-        match conn.get(db_key).await {
-            Ok(result) => result,
-            Err(err) => {
+        conn.get(db_key)
+            .await
+            .map_err(|err| {
                 tracing::error!("Failed to get value from redis: {:?}", err);
-                None
-            }
-        }
+                err
+            })
+            .ok()?
     }
 
     async fn set(&self, key: HttpCacheKey, value: Vec<u8>) {
         let mut db_key = self.prefix.clone().unwrap_or_default();
         db_key.extend(&*key);
 
-        let mut conn = match self.client.get_multiplexed_tokio_connection().await {
-            Ok(conn) => conn,
-            Err(err) => {
+        let mut conn = self
+            .client
+            .get_multiplexed_tokio_connection()
+            .await
+            .map_err(|err| {
                 tracing::error!("Failed to get redis connection: {:?}", err);
-                return;
-            }
-        };
+                err
+            })
+            .ok()?;
 
         let _: Result<(), _> = conn
             .set_ex(db_key, value, self.cache_ttl.as_secs() as usize)
-            .await;
+            .await
+            .map_err(|err| {
+                tracing::error!("Failed to set value in redis: {:?}", err);
+                err
+            });
     }
 }