Fix sha-1 usage and clippy+fmt complaints

brycx · Aug 8, 2020 · 2ac2d61 · 2ac2d61
1 parent 23c077b
commit 2ac2d61
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/api/mod.rs b/src/api/mod.rs
@@ -215,10 +215,10 @@ pub fn read_file(path: &str) -> Result<BufReader<File>, Error> {
 /// Return SHA1 digest of string.
 pub fn hash_password(password: &str) -> String {
     let mut sha_digest = Sha1::default();
-    sha_digest.input(password.as_bytes());
+    sha_digest.update(password.as_bytes());
     // Make uppercase for easier comparison with
     // HIBP API response
-    hex::encode(sha_digest.result()).to_uppercase()
+    hex::encode(sha_digest.finalize()).to_uppercase()
 }
 
 /// Strip all whitespace and all newlines from a given string.

diff --git a/src/config.rs b/src/config.rs
@@ -32,7 +32,7 @@ impl Config {
                 dir.push(CHECKPWN_CONFIG_DIR);
                 dir.push(CHECKPWN_CONFIG_FILE_NAME);
                 Some(ConfigPaths {
-                    config_file_path: dir.to_path_buf(),
+                    config_file_path: dir,
                 })
             }
             None => None,
@@ -55,7 +55,7 @@ impl Config {
             Ok(api_key) => {
                 self.api_key = api_key;
                 Ok(())
-            },
+            }
             Err(std::env::VarError::NotPresent) => {
                 let path = self
                     .get_config_path()
@@ -81,7 +81,7 @@ impl Config {
         self.api_key = config_yml.api_key;
     }
 
-    pub fn save_config(&self, api_key: &String) -> Result<(), Box<dyn std::error::Error>> {
+    pub fn save_config(&self, api_key: &str) -> Result<(), Box<dyn std::error::Error>> {
         let path: ConfigPaths = self
             .get_config_path()
             .expect("Failed to determine configuration file path.");