Merge pull request #110 from Frederick888/clippy into master

* clippy:
  style: Fix unnecessary_unwrap
  style: Fix mismatched_lifetime_syntaxes

Author: Frederick888

src/config.rs

@@ -435,13 +435,13 @@ impl Config {
     }
 
     #[cfg(not(feature = "encryption"))]
-    pub fn get_encryption_key(&self) -> Result<std::cell::Ref<Option<AesKey>>> {
+    pub fn get_encryption_key(&self) -> Result<std::cell::Ref<'_, Option<AesKey>>> {
         error!("Enable encryption to use this feature");
         Err(anyhow!("Encryption is not enabled in this build"))
     }
 
     #[cfg(feature = "encryption")]
-    pub fn get_encryption_key(&self) -> Result<std::cell::Ref<Option<AesKey>>> {
+    pub fn get_encryption_key(&self) -> Result<std::cell::Ref<'_, Option<AesKey>>> {
         if self.encryption_key.borrow().is_some() {
             return Ok(self.encryption_key.borrow());
         }
@@ -631,7 +631,7 @@ impl Encryption {
     }
 
     #[cfg(feature = "encryption")]
-    fn get_response(&self) -> Result<std::cell::Ref<Option<AesKey>>> {
+    fn get_response(&self) -> Result<std::cell::Ref<'_, Option<AesKey>>> {
         match self {
             #[cfg(not(feature = "yubikey"))]
             Encryption::ChallengeResponse { .. } => {

src/keepassxc/messages/structs.rs

@@ -74,20 +74,17 @@ where
             );
         };
         response_wrapper.log();
-        if response_wrapper.message.is_some() && response_wrapper.nonce.is_some() {
-            let (message, nonce) = (
-                response_wrapper.message.unwrap(),
-                response_wrapper.nonce.unwrap(),
-            );
-            let decrypted_response_json = to_decrypted_json(message, nonce)?;
-            let response: R = serde_json::from_str(&decrypted_response_json)?;
-            Ok((response, decrypted_response_json))
-        } else {
-            Err(KeePassError {
+        match (&response_wrapper.message, &response_wrapper.nonce) {
+            (Some(message), Some(nonce)) => {
+                let decrypted_response_json = to_decrypted_json(message, nonce)?;
+                let response: R = serde_json::from_str(&decrypted_response_json)?;
+                Ok((response, decrypted_response_json))
+            }
+            _ => Err(KeePassError {
                 message: response_wrapper.error_message(),
                 response: response_wrapper,
             }
-            .into())
+            .into()),
         }
     }
 
@@ -608,7 +605,7 @@ impl GetDatabaseGroupsResponse {
         &self.groups.groups
     }
 
-    pub fn get_flat_groups(&self) -> Vec<FlatGroup> {
+    pub fn get_flat_groups(&self) -> Vec<FlatGroup<'_>> {
         self.get_groups()
             .iter()
             .map(|g| g.get_flat_groups(vec![]))

src/utils/callers.rs

@@ -52,11 +52,8 @@ impl CurrentCaller {
             .ok_or_else(|| anyhow!("Failed to determine parent process path"))?;
         info!("Parent process path: {}", ppath.to_string_lossy());
         let canonical_ppath = ppath.canonicalize();
-        if canonical_ppath.is_ok() {
-            info!(
-                "Canonical parent process path: {}",
-                canonical_ppath.as_ref().unwrap().to_string_lossy()
-            );
+        if let Ok(p) = &canonical_ppath {
+            info!("Canonical parent process path: {}", p.to_string_lossy());
         } else {
             warn!("Failed to determine canonical parent process path");
         }