From f8d7f82c50c46fd0d723ad94c39e0ddc96a43201 Mon Sep 17 00:00:00 2001
From: Florian Briand <florian.briand@digital-engine.info>
Date: Wed, 24 Jul 2024 23:39:27 +0200
Subject: [PATCH] chore: Refactor process_tauri_request function for improved
 readability and error handling

---
 crates/desktop/src/lib.rs | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/crates/desktop/src/lib.rs b/crates/desktop/src/lib.rs
index 3cadb71..daa8cd9 100644
--- a/crates/desktop/src/lib.rs
+++ b/crates/desktop/src/lib.rs
@@ -1,4 +1,3 @@
-use core::panic;
 use std::sync::Arc;
 
 use tauri::{path::BaseDirectory, Manager};
@@ -24,23 +23,18 @@ async fn process_tauri_request(
     let request = AxumRequest::from_parts(parts, body);
 
     // Process the request with the router
-    let response = match router.as_service().ready().await {
-        Ok(ready_service) => ready_service.call(request).await,
-        Err(_error) => panic!("Failed to get ready service"),
-    };
-
-    let response = match response {
-        Ok(response) => response,
-        Err(_error) => panic!("Problem getting response from request."),
-    };
+    let response = router
+        .as_service()
+        .ready().await
+        .expect("Failed to get ready service")
+        .call(request).await
+        .expect("Failed to get response from router");
 
     // Convert the Axum response to a Tauri response
     let (parts, body) = response.into_parts();
-    let body = to_bytes(body, usize::MAX).await {
-        Ok(bytes) => bytes.to_vec(),
-        Err(_error) => panic!("Problem converting response body to bytes."),
-    };
-
+    let body = to_bytes(body, usize::MAX).await
+        .expect("Failed to convert body to bytes")
+        .to_vec();
     let response = TauriResponse::from_parts(parts, body);
 
     response