From 4b86d2a6c108c4e113e0dda959ef0fb0d08365ae Mon Sep 17 00:00:00 2001
From: finga <git@onders.org>
Date: Sat, 29 Aug 2020 01:13:06 +0200
Subject: [PATCH] Use a type alias instead of struct for `Keys`

---
 src/main.rs  | 14 +++++---------
 src/tests.rs | 26 +++++++++++---------------
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index fd93c7f..f0bffef 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -42,9 +42,7 @@ struct Ldap0rConfig {
 
 const BASE62: &[u8] = b"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 
-struct Keys {
-    keys: Arc<Mutex<HashMap<String, String>>>,
-}
+type Keys = Arc<Mutex<HashMap<String, String>>>;
 
 fn reset_prepare(config: &Ldap0rConfig, keys: &Keys, email_address: &str) -> Result<()> {
     // ldap lookup
@@ -70,7 +68,7 @@ fn reset_prepare(config: &Ldap0rConfig, keys: &Keys, email_address: &str) -> Res
         .collect();
 
     // store key with id
-    let keys = Arc::clone(&keys.keys);
+    let keys = Arc::clone(&keys);
     let mut keys = keys
         .lock()
         .map_err(|e| anyhow!("Could not aquire lock for keys: {}", e))?;
@@ -117,7 +115,7 @@ fn set_password(
     }
 
     // key lookup
-    let keys = Arc::clone(&keys.keys);
+    let keys = Arc::clone(&keys);
     let mut keys = match keys.lock() {
         Ok(keys) => keys,
         Err(e) => {
@@ -226,7 +224,7 @@ fn reset_email(
 
 #[get("/reset/<key>")]
 fn reset_key(keys: State<Keys>, key: String, flash: Option<FlashMessage>) -> Option<Template> {
-    let keys = Arc::clone(&keys.keys);
+    let keys = Arc::clone(&keys);
     if let Ok(keys) = keys.lock() {
         let mut context = HashMap::new();
 
@@ -310,8 +308,6 @@ fn main() {
             Ok(rocket.manage(ldap0r_config))
         }))
         .attach(Template::fairing())
-        .manage(Keys {
-            keys: Arc::new(Mutex::new(HashMap::new())),
-        })
+        .manage(Keys::new(Mutex::new(HashMap::new())))
         .launch();
 }
diff --git a/src/tests.rs b/src/tests.rs
index f5d0b0c..196054b 100644
--- a/src/tests.rs
+++ b/src/tests.rs
@@ -33,7 +33,7 @@ fn reset() {
 fn reset_valid_url() {
     use super::Keys;
     use std::collections::HashMap;
-    use std::sync::{Arc, Mutex};
+    use std::sync::Mutex;
 
     let mut context = HashMap::new();
     context.insert(
@@ -44,16 +44,14 @@ fn reset_valid_url() {
     let rocket = rocket::ignite()
         .mount("/", routes![super::reset_key])
         .attach(Template::fairing())
-        .manage(Keys {
-            keys: Arc::new(Mutex::new(
-                Some((
-                    "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz".to_string(),
-                    "foobar".to_string(),
-                ))
-                .into_iter()
-                .collect(),
-            )),
-        });
+        .manage(Keys::new(Mutex::new(
+            Some((
+                "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz".to_string(),
+                "foobar".to_string(),
+            ))
+            .into_iter()
+            .collect(),
+        )));
     let client = Client::new(rocket).unwrap();
     let mut response = client
         .get("/reset/0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")
@@ -67,13 +65,11 @@ fn reset_valid_url() {
 fn reset_invalid_url() {
     use super::Keys;
     use std::collections::HashMap;
-    use std::sync::{Arc, Mutex};
+    use std::sync::Mutex;
 
     let rocket = rocket::ignite()
         .mount("/", routes![super::reset, super::reset_key])
-        .manage(Keys {
-            keys: Arc::new(Mutex::new(HashMap::new())),
-        });
+        .manage(Keys::new(Mutex::new(HashMap::new())));
     let client = Client::new(rocket).unwrap();
     let response = client
         .get("/reset/0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")