From d9af302417d585448caf444a67b661e3b4b9f372 Mon Sep 17 00:00:00 2001
From: Sayan Nandan <nandansayan@outlook.com>
Date: Fri, 30 Apr 2021 21:17:12 +0530
Subject: [PATCH] Don't use additional scope

---
 server/src/dbnet/connection.rs |  2 +-
 server/src/dbnet/mod.rs        | 33 ++++++++++++++++-----------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/server/src/dbnet/connection.rs b/server/src/dbnet/connection.rs
index 51a51589..d01fb0f7 100644
--- a/server/src/dbnet/connection.rs
+++ b/server/src/dbnet/connection.rs
@@ -335,7 +335,7 @@ where
                 #[cfg(windows)]
                 Err(e) => match e.kind() {
                     ErrorKind::ConnectionReset => return Ok(()),
-                    _ => return Err(e.into())
+                    _ => return Err(e.into()),
                 },
                 Err(e) => return Err(e.into()),
             }
diff --git a/server/src/dbnet/mod.rs b/server/src/dbnet/mod.rs
index 533c56d3..4f4dfb4a 100644
--- a/server/src/dbnet/mod.rs
+++ b/server/src/dbnet/mod.rs
@@ -394,26 +394,25 @@ pub async fn run(
     if let Err(e) = lock.unlock().await {
         log::error!("Failed to release lock on data file with '{}'", e);
         process::exit(0x100);
-    } else {
-        if let Err(e) = flush_db!(db) {
-            log::error!("Failed to flush data to disk with '{}'", e);
-            loop {
-                // Keep looping until we successfully write the in-memory table to disk
-                log::warn!("Press enter to try again...");
-                io::stdout().flush().unwrap();
-                io::stdin().read(&mut [0]).unwrap();
-                if let Ok(_) = flush_db!(db) {
-                    log::info!("Successfully saved data to disk");
-                    break;
-                } else {
-                    continue;
-                }
+    }
+    if let Err(e) = flush_db!(db) {
+        log::error!("Failed to flush data to disk with '{}'", e);
+        loop {
+            // Keep looping until we successfully write the in-memory table to disk
+            log::warn!("Press enter to try again...");
+            io::stdout().flush().unwrap();
+            io::stdin().read(&mut [0]).unwrap();
+            if let Ok(_) = flush_db!(db) {
+                log::info!("Successfully saved data to disk");
+                break;
+            } else {
+                continue;
             }
-        } else {
-            log::info!("Successfully saved data to disk");
         }
-        terminal::write_info("Goodbye :)\n").unwrap();
+    } else {
+        log::info!("Successfully saved data to disk");
     }
+    terminal::write_info("Goodbye :)\n").unwrap();
 }
 
 /// This is a **test only** function