From 6bd37b6479cae0f6b0128bfe322487489e035c24 Mon Sep 17 00:00:00 2001
From: Mohammad Dashti <mdashti@gmail.com>
Date: Fri, 6 Oct 2023 13:29:48 -0700
Subject: [PATCH] Reverted an unwanted change + Applied `cargo fmt`.

---
 src/admin.rs    |  7 +++++--
 src/messages.rs | 50 ++++++++++++++++++++-----------------------------
 src/sharding.rs |  8 ++++++--
 3 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/src/admin.rs b/src/admin.rs
index 45c1938..a1cc017 100644
--- a/src/admin.rs
+++ b/src/admin.rs
@@ -283,7 +283,8 @@ where
 {
     let mut res = BytesMut::new();
 
-    let detail_msg = ["",
+    let detail_msg = [
+        "",
         "SHOW HELP|CONFIG|DATABASES|POOLS|CLIENTS|SERVERS|USERS|VERSION",
         // "SHOW PEERS|PEER_POOLS", // missing PEERS|PEER_POOLS
         // "SHOW FDS|SOCKETS|ACTIVE_SOCKETS|LISTS|MEM|STATE", // missing FDS|SOCKETS|ACTIVE_SOCKETS|MEM|STATE
@@ -299,7 +300,9 @@ where
         // "RECONNECT [<db>]", missing
         // "KILL <db>",
         // "SUSPEND",
-        "SHUTDOWN"];
+        // "WAIT_CLOSE [<db>]", // missing
+        "SHUTDOWN",
+    ];
 
     res.put(notify("Console usage", detail_msg.join("\n\t")));
     res.put(command_complete("SHOW"));
diff --git a/src/messages.rs b/src/messages.rs
index f13058d..3b0e4ca 100644
--- a/src/messages.rs
+++ b/src/messages.rs
@@ -163,12 +163,10 @@ where
 
     match stream.write_all(&startup).await {
         Ok(_) => Ok(()),
-        Err(err) => {
-            Err(Error::SocketError(format!(
-                "Error writing startup to server socket - Error: {:?}",
-                err
-            )))
-        }
+        Err(err) => Err(Error::SocketError(format!(
+            "Error writing startup to server socket - Error: {:?}",
+            err
+        ))),
     }
 }
 
@@ -571,12 +569,10 @@ where
 {
     match stream.write_all(&buf).await {
         Ok(_) => Ok(()),
-        Err(err) => {
-            Err(Error::SocketError(format!(
-                "Error writing to socket - Error: {:?}",
-                err
-            )))
-        }
+        Err(err) => Err(Error::SocketError(format!(
+            "Error writing to socket - Error: {:?}",
+            err
+        ))),
     }
 }
 
@@ -587,12 +583,10 @@ where
 {
     match stream.write_all(buf).await {
         Ok(_) => Ok(()),
-        Err(err) => {
-            Err(Error::SocketError(format!(
-                "Error writing to socket - Error: {:?}",
-                err
-            )))
-        }
+        Err(err) => Err(Error::SocketError(format!(
+            "Error writing to socket - Error: {:?}",
+            err
+        ))),
     }
 }
 
@@ -603,19 +597,15 @@ where
     match stream.write_all(buf).await {
         Ok(_) => match stream.flush().await {
             Ok(_) => Ok(()),
-            Err(err) => {
-                Err(Error::SocketError(format!(
-                    "Error flushing socket - Error: {:?}",
-                    err
-                )))
-            }
-        },
-        Err(err) => {
-            Err(Error::SocketError(format!(
-                "Error writing to socket - Error: {:?}",
+            Err(err) => Err(Error::SocketError(format!(
+                "Error flushing socket - Error: {:?}",
                 err
-            )))
-        }
+            ))),
+        },
+        Err(err) => Err(Error::SocketError(format!(
+            "Error writing to socket - Error: {:?}",
+            err
+        ))),
     }
 }
 
diff --git a/src/sharding.rs b/src/sharding.rs
index 811144c..a7a9df1 100644
--- a/src/sharding.rs
+++ b/src/sharding.rs
@@ -202,8 +202,12 @@ mod test {
     #[test]
     fn test_sha1_hash() {
         let sharder = Sharder::new(12, ShardingFunction::Sha1);
-        let ids = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19];
-        let shards = [4, 7, 8, 3, 6, 0, 0, 10, 3, 11, 1, 7, 4, 4, 11, 2, 5, 0, 8, 3];
+        let ids = [
+            0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+        ];
+        let shards = [
+            4, 7, 8, 3, 6, 0, 0, 10, 3, 11, 1, 7, 4, 4, 11, 2, 5, 0, 8, 3,
+        ];
 
         for (i, id) in ids.iter().enumerate() {
             assert_eq!(sharder.shard(*id), shards[i]);