Refactorings/fixes for back-end

diff --git a/back_end/src/json_handlers.rs b/back_end/src/json_handlers.rs
index 4a3ee173f6549f1adb8db94f8ddd4f28a7c592c4..cbccb1bc02ec4209b8727e7211e8a48b9b4792b0 100644 (file)
--- a/back_end/src/json_handlers.rs
+++ b/back_end/src/json_handlers.rs
@@ -10,9 +10,7 @@ pub fn handle_json(root: Value) -> Result<String, String> {
             "disconnect" => handle_disconnect(root),
             "request_board_state" => handle_request_board_state(root),
             "game_state" => handle_game_state(root),
-            _ => {
-                Err("{\"type\":\"invalid_type\"}".into())
-            }
+            _ => Err("{\"type\":\"invalid_type\"}".into()),
         }
     } else {
         Err("{\"type\":\"invalid_json\"}".into())

diff --git a/back_end/src/main.rs b/back_end/src/main.rs
index ee63d036647f134ee531f7b05e0d7c5311e645b8..65a9759ea980729576786a279eda248c4f0a1213 100644 (file)
--- a/back_end/src/main.rs
+++ b/back_end/src/main.rs
@@ -9,16 +9,8 @@ async fn main() {
         .and(warp::body::json())
         .map(|json_value: Value| {
             let result = json_handlers::handle_json(json_value);
-            if let Ok(result_str) = result {
-                result_str
-            } else if let Err(error_str) = result {
-                error_str
-            } else {
-                unreachable!()
-            }
+            result.unwrap_or_else(|e| e)
         });
 
-    warp::serve(route)
-        .run(([0,0,0,0], 1237))
-        .await;
+    warp::serve(route).run(([0, 0, 0, 0], 1237)).await;
 }