Fix warnings reported by clippy

Signed-off-by: Anderson Toshiyuki Sasaki <[email protected]>

Author: ansasaki

keylime-agent/src/main.rs

@@ -982,7 +982,7 @@ mod testing {
         TSSError(#[from] tss_esapi::Error),
     }
 
-    impl<'a> Drop for QuoteData<'a> {
+    impl Drop for QuoteData<'_> {
         /// Flush the created AK when dropping
         fn drop(&mut self) {
             self.tpmcontext

keylime/src/crypto/x509.rs

@@ -75,7 +75,7 @@ impl<'a> CertificateBuilder<'a> {
     pub fn common_name(
         &'a mut self,
         cn: &'a str,
-    ) -> &mut CertificateBuilder<'a> {
+    ) -> &'a mut CertificateBuilder<'a> {
         self.common_name = Some(cn);
         self
     }
@@ -88,7 +88,7 @@ impl<'a> CertificateBuilder<'a> {
     pub fn hash_algorithm(
         &'a mut self,
         hash_algorithm: MessageDigest,
-    ) -> &mut CertificateBuilder<'a> {
+    ) -> &'a mut CertificateBuilder<'a> {
         self.hash_algorithm = Some(hash_algorithm);
         self
     }
@@ -102,7 +102,7 @@ impl<'a> CertificateBuilder<'a> {
     pub fn not_before(
         &'a mut self,
         days_from_now: u32,
-    ) -> &mut CertificateBuilder<'a> {
+    ) -> &'a mut CertificateBuilder<'a> {
         self.not_before = Some(days_from_now);
         self
     }
@@ -115,7 +115,7 @@ impl<'a> CertificateBuilder<'a> {
     pub fn not_after(
         &'a mut self,
         days_from_now: u32,
-    ) -> &mut CertificateBuilder<'a> {
+    ) -> &'a mut CertificateBuilder<'a> {
         self.not_after = Some(days_from_now);
         self
     }
@@ -131,7 +131,7 @@ impl<'a> CertificateBuilder<'a> {
     pub fn version(
         &'a mut self,
         version: i32,
-    ) -> &mut CertificateBuilder<'a> {
+    ) -> &'a mut CertificateBuilder<'a> {
         self.version = Some(version);
         self
     }
@@ -144,7 +144,7 @@ impl<'a> CertificateBuilder<'a> {
     pub fn private_key(
         &'a mut self,
         private_key: &'a PKey<Private>,
-    ) -> &mut CertificateBuilder<'a> {
+    ) -> &'a mut CertificateBuilder<'a> {
         self.private_key = Some(private_key);
         self
     }
@@ -158,7 +158,7 @@ impl<'a> CertificateBuilder<'a> {
     pub fn add_dns_names(
         &'a mut self,
         dns_names: Vec<&'a str>,
-    ) -> &mut CertificateBuilder<'a> {
+    ) -> &'a mut CertificateBuilder<'a> {
         match &mut self.dns_names {
             None => {
                 self.dns_names = Some(dns_names);
@@ -181,7 +181,7 @@ impl<'a> CertificateBuilder<'a> {
     pub fn add_ips(
         &'a mut self,
         ips: Vec<&'a str>,
-    ) -> &mut CertificateBuilder<'a> {
+    ) -> &'a mut CertificateBuilder<'a> {
         match &mut self.ips {
             None => {
                 self.ips = Some(ips);
@@ -204,7 +204,7 @@ impl<'a> CertificateBuilder<'a> {
     pub fn add_extensions(
         &'a mut self,
         extensions: Vec<X509Extension>,
-    ) -> &mut CertificateBuilder<'a> {
+    ) -> &'a mut CertificateBuilder<'a> {
         match &mut self.extensions {
             None => {
                 self.extensions = Some(extensions);

keylime/src/hostname_parser.rs

@@ -60,7 +60,7 @@ pub fn parse_hostname(hostname: &str) -> Result<&str, HostnameParsingError> {
     else {
         return Err(HostnameParsingError::InvalidInput(hostname.to_string()));
     };
-    return Ok(pair.as_str());
+    Ok(pair.as_str())
 }
 
 // Unit Testing

keylime/src/ip_parser.rs

@@ -85,7 +85,7 @@ pub fn parse_ip(ip: &str) -> Result<&str, IpParsingError> {
     else {
         return Err(IpParsingError::InvalidInput(ip.to_string()));
     };
-    return get_inner_ip(pair);
+    get_inner_ip(pair)
 }
 
 // Unit Testing

keylime/src/tpm.rs

@@ -487,7 +487,7 @@ pub struct Context<'a> {
 
 static TPM_CTX: OnceLock<Arc<Mutex<tss_esapi::Context>>> = OnceLock::new();
 
-impl<'a> Context<'a> {
+impl Context<'_> {
     /// Creates a connection context.
     pub fn new() -> Result<Self> {
         let tcti_path = match std::env::var("TCTI") {