From f0d8a128d0c64750d5e41c711ff04898cf0fd2a1 Mon Sep 17 00:00:00 2001
From: Jun Kurihara <junkurihara@users.noreply.github.com>
Date: Sun, 9 Apr 2023 03:27:32 +0900
Subject: [PATCH] refactor

---
 src/backend/mod.rs          | 16 ++++++----------
 src/handler/handler_main.rs |  4 +---
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/backend/mod.rs b/src/backend/mod.rs
index b502369..409222d 100644
--- a/src/backend/mod.rs
+++ b/src/backend/mod.rs
@@ -69,12 +69,9 @@ fn opt_string_to_opt_pathbuf(input: &Option<String>) -> Option<PathBuf> {
 impl Backend {
   pub fn read_certs_and_key(&self) -> io::Result<CertifiedKey> {
     debug!("Read TLS server certificates and private key");
-    let (certs_path, certs_keys_path) =
-      if let (Some(c), Some(k)) = (self.tls_cert_path.as_ref(), self.tls_cert_key_path.as_ref()) {
-        (c, k)
-      } else {
-        return Err(io::Error::new(io::ErrorKind::Other, "Invalid certs and keys paths"));
-      };
+    let (Some(certs_path), Some(certs_keys_path)) = (self.tls_cert_path.as_ref(), self.tls_cert_key_path.as_ref()) else {
+      return Err(io::Error::new(io::ErrorKind::Other, "Invalid certs and keys paths"));
+    };
     let certs: Vec<_> = {
       let certs_path_str = certs_path.display().to_string();
       let mut reader = BufReader::new(File::open(certs_path).map_err(|e| {
@@ -144,11 +141,10 @@ impl Backend {
     debug!("Read CA certificates for client authentication");
     // Reads client certificate and returns client
     let client_ca_cert_path = {
-      if let Some(c) = self.client_ca_cert_path.as_ref() {
-        c
-      } else {
+      let Some(c) = self.client_ca_cert_path.as_ref() else {
         return Err(io::Error::new(io::ErrorKind::Other, "Invalid certs and keys paths"));
-      }
+      };
+      c
     };
     let certs: Vec<_> = {
       let certs_path_str = client_ca_cert_path.display().to_string();
diff --git a/src/handler/handler_main.rs b/src/handler/handler_main.rs
index 4f60ee5..2ef5665 100644
--- a/src/handler/handler_main.rs
+++ b/src/handler/handler_main.rs
@@ -141,9 +141,7 @@ where
       false
     } {
       if let Some(request_upgraded) = request_upgraded {
-        let onupgrade = if let Some(onupgrade) = res_backend.extensions_mut().remove::<hyper::upgrade::OnUpgrade>() {
-          onupgrade
-        } else {
+        let Some(onupgrade) = res_backend.extensions_mut().remove::<hyper::upgrade::OnUpgrade>() else {
           error!("Response does not have an upgrade extension");
           return self.return_with_error_log(StatusCode::INTERNAL_SERVER_ERROR, &mut log_data);
         };