From aaaf35bf1c979463b633bc6d8cafd869cfe90749 Mon Sep 17 00:00:00 2001
From: jonay2000 <jonabent@gmail.com>
Date: Mon, 1 Nov 2021 23:33:28 +0100
Subject: [PATCH] fix fmt and clippy

---
 server/src/db_connection.rs |  2 +-
 server/src/lib.rs           |  2 +-
 server/src/main.rs          |  1 -
 server/src/test_util.rs     | 36 ++++++++++++++++++------------------
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/server/src/db_connection.rs b/server/src/db_connection.rs
index c567c15..3fe156d 100644
--- a/server/src/db_connection.rs
+++ b/server/src/db_connection.rs
@@ -29,6 +29,6 @@ impl DBClient {
     }
 
     pub async fn delete_db(&self) {
-        self.database.drop(None).await.expect("couldn't drop db")
+        self.database.drop(None).await.expect("couldn't drop db");
     }
 }
diff --git a/server/src/lib.rs b/server/src/lib.rs
index b9d9308..6c48816 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -5,4 +5,4 @@ pub mod handlers;
 pub mod models;
 pub mod repository;
 
-pub mod test_util;
\ No newline at end of file
+pub mod test_util;
diff --git a/server/src/main.rs b/server/src/main.rs
index 7fc5214..852ebcd 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -110,4 +110,3 @@ fn random_password() -> String {
     }
     pw
 }
-
diff --git a/server/src/test_util.rs b/server/src/test_util.rs
index 27ef209..6715f21 100644
--- a/server/src/test_util.rs
+++ b/server/src/test_util.rs
@@ -1,9 +1,9 @@
 use crate::db_connection::DBClient;
-use uuid::Uuid;
-use tokio::runtime::Runtime;
 use std::env;
 use std::future::Future;
 use std::panic::resume_unwind;
+use tokio::runtime::Runtime;
+use uuid::Uuid;
 
 /// Use this function to temporarily crate a mongodb database
 /// given the env var `TEST_DB_URI` or `DB_URI` (preferring `TEST_DB_URI`).
@@ -13,18 +13,16 @@ use std::panic::resume_unwind;
 /// To ensure `should_panic` tests pass when no database URI is provided, call [`test_db_panic`]
 #[allow(unused)]
 pub fn test_db<F, Res>(f: F) -> bool
-    where
-        F: 'static + Send + FnOnce(DBClient) -> Res,
-        Res: Future<Output=()> + Send,
+where
+    F: 'static + Send + FnOnce(DBClient) -> Res,
+    Res: Future<Output = ()> + Send,
 {
     let _ignored = dotenv::dotenv();
 
     let name = format!("test_db_{}", Uuid::new_v4());
 
-    let client_uri = if let Ok(client_uri) = env::var("TEST_DB_URI")
-        .or_else(|_| {
-            env::var("DB_URI")
-        }) {
+    let client_uri = if let Ok(client_uri) = env::var("TEST_DB_URI").or_else(|_| env::var("DB_URI"))
+    {
         client_uri
     } else {
         eprintln!("WARNING: NOT RUNNING TEST DUE TO LACK OF DATABASE URI");
@@ -33,14 +31,15 @@ pub fn test_db<F, Res>(f: F) -> bool
 
     let rt = Runtime::new().expect("create runtime");
     rt.block_on(async move {
-        let client = DBClient::new(client_uri, name).await
+        let client = DBClient::new(client_uri, name)
+            .await
             .expect("start mongodb client");
 
-
         let local_client = client.clone();
         let res = tokio::spawn(async move {
-            f(local_client).await
-        }).await;
+            f(local_client).await;
+        })
+        .await;
 
         client.delete_db().await;
 
@@ -56,12 +55,13 @@ pub fn test_db<F, Res>(f: F) -> bool
 }
 
 /// Panics when tests could not be run due to the lack of db uri. This is to
-/// make sure should_panic tests stay working without a uri.
+/// make sure `should_panic` tests stay working without a uri.
 #[allow(unused)]
+#[allow(clippy::missing_panics_doc)]
 pub fn test_db_panic<F, Res>(f: F)
-    where
-        F: 'static + Send + FnOnce(DBClient) -> Res,
-        Res: Future<Output=()> + Send,
+where
+    F: 'static + Send + FnOnce(DBClient) -> Res,
+    Res: Future<Output = ()> + Send,
 {
     if !test_db(f) {
         panic!("no db found but test should panic");
@@ -79,4 +79,4 @@ mod tests {
             panic!("test");
         });
     }
-}
\ No newline at end of file
+}