From b268d98b86ade5f5833a3c74a3ab42bde983f039 Mon Sep 17 00:00:00 2001
From: Brandon Thomas <echelon@gmail.com>
Date: Mon, 29 Jun 2020 19:42:32 -0400
Subject: [PATCH] cleanup

---
 src/main.rs | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index a54a7fe..7d69d8b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -95,14 +95,6 @@ fn debug_request(req: Request<Body>) -> BoxFut {
   Box::new(future::ok(response))
 }
 
-fn speak_request(req: Request<Body>, remote_addr: SocketAddr) -> BoxFut {
-  speak_proxy(req, remote_addr, "/speak")
-}
-
-fn speak_spectrogram_request(req: Request<Body>, remote_addr: SocketAddr) -> BoxFut {
-  speak_proxy(req, remote_addr, "/speak_spectrogram")
-}
-
 fn speak_proxy(req: Request<Body>, remote_addr: SocketAddr, endpoint: &'static str) -> BoxFut {
   let mut headers = req.headers().clone();
   // NB: Rehydrating the request payload can change the content length if whitespace is changed.
@@ -182,14 +174,13 @@ fn main() -> AnyhowResult<()> {
         _ => {},
       }
 
-      let remote_addr2 = remote_addr.clone();
-
-      if req.uri().path().eq("/speak") {
-        speak_request(req, remote_addr2)
-      } else if req.uri().path().eq("/speak_spectrogram") {
-        speak_spectrogram_request(req, remote_addr2)
-      } else {
-        debug_request(req)
+      match req.uri().path() {
+        "/speak" =>
+          speak_proxy(req, remote_addr.clone(), "/speak"),
+        "/speak_spectrogram" =>
+          speak_proxy(req, remote_addr.clone(), "/speak_spectrogram"),
+        _ =>
+          debug_request(req),
       }
     })
   });