Fixed Rust 1.62 clippy errors for 7.x.y branch.

Signed-off-by: Jesper Brynolf <[email protected]>

Author: Superhepper

tss-esapi/src/abstraction/pcr/data.rs

@@ -101,7 +101,7 @@ impl PcrData {
     }
 }
 
-impl<'a> IntoIterator for PcrData {
+impl IntoIterator for PcrData {
     type Item = (HashingAlgorithm, PcrBank);
     type IntoIter = ::std::vec::IntoIter<(HashingAlgorithm, PcrBank)>;
 

tss-esapi/tests/integration_tests/abstraction_tests/nv_tests.rs

@@ -80,9 +80,9 @@ fn list() {
         .map(|(public, _)| public.nv_index())
         .any(|x| x == nv_index));
 
-    let _ = context
+    context
         .nv_undefine_space(Provision::Owner, owner_nv_index_handle)
-        .unwrap();
+        .expect("Call to nv_undefine_space failed");
 }
 
 #[test]
@@ -96,9 +96,9 @@ fn read_full() {
     // Now read it back
     let read_result = nv::read_full(&mut context, NvAuth::Owner, nv_index);
 
-    let _ = context
+    context
         .nv_undefine_space(Provision::Owner, owner_nv_index_handle)
-        .unwrap();
+        .expect("Call to nv_undefine_space failed");
 
     let read_result = read_result.unwrap();
     assert_eq!(read_result.len(), 1540);
@@ -154,8 +154,8 @@ fn write() {
 
     let owner_nv_index_handle = context
         .execute_without_session(|ctx| ctx.tr_from_tpm_public(nv_index.into()))
-        .unwrap();
+        .expect("Call to tr_from_tpm_public failed");
     context
         .nv_undefine_space(Provision::Owner, owner_nv_index_handle.into())
-        .unwrap();
+        .expect("Call to nv_undefine_space failed");
 }

tss-esapi/tests/integration_tests/context_tests/general_esys_tr_tests.rs

@@ -63,7 +63,9 @@ mod test_tr_from_tpm_public {
                        fn_name: &str|
          -> tss_esapi::Error {
             // Set password authorization
-            let _ = context.nv_undefine_space(Provision::Owner, handle).unwrap();
+            context
+                .nv_undefine_space(Provision::Owner, handle)
+                .expect("Call to nv_undefine_space failed");
             panic!("{} failed: {}", fn_name, e);
         };
 
@@ -113,9 +115,9 @@ mod test_tr_from_tpm_public {
             .unwrap();
         //////////////////////////////////////////////
         // Remove undefine the space
-        let _ = context
+        context
             .nv_undefine_space(Provision::Owner, new_nv_index_handle.into())
-            .unwrap();
+            .expect("Call to nv_undefine_space failed");
 
         assert_eq!(expected_name, actual_name);
     }
@@ -140,7 +142,7 @@ mod test_tr_from_tpm_public {
          -> tss_esapi::Error {
             // Set password authorization
             context.set_sessions((Some(AuthSession::Password), None, None));
-            let _ = context
+            context
                 .nv_undefine_space(Provision::Owner, handle)
                 .expect("Failed to call nv_undefine_space");
             panic!("{} failed: {}", fn_name, e);
@@ -213,9 +215,9 @@ mod test_tr_from_tpm_public {
         //
         // Set password authorization
         context.set_sessions((Some(AuthSession::Password), None, None));
-        let _ = context
+        context
             .nv_undefine_space(Provision::Owner, new_nv_index_handle.into())
-            .expect("Failed to call nv_undefine_space");
+            .expect("Call to nv_undefine_space failed");
         ///////////////////////////////////////////////////////////////
         // Check that we got the correct name
         //
@@ -243,7 +245,9 @@ mod test_tr_from_tpm_public {
          -> tss_esapi::Error {
             // Set password authorization
             context.set_sessions((Some(AuthSession::Password), None, None));
-            let _ = context.nv_undefine_space(Provision::Owner, handle).unwrap();
+            context
+                .nv_undefine_space(Provision::Owner, handle)
+                .expect("Call to nv_undefine_space failed");
             panic!("{} failed: {}", fn_name, e);
         };
 
@@ -362,9 +366,9 @@ mod test_tr_from_tpm_public {
         //
         // Set password authorization
         context.set_sessions((Some(AuthSession::Password), None, None));
-        let _ = context
+        context
             .nv_undefine_space(Provision::Owner, new_nv_index_handle)
-            .unwrap();
+            .expect("Call to nv_undefine_space failed");
         ///////////////////////////////////////////////////////////////
         // The name will have changed
         //

tss-esapi/tests/integration_tests/context_tests/tpm_commands/non_volatile_storage_tests.rs

@@ -97,7 +97,7 @@ mod test_nv_define_space {
             .nv_define_space(Provision::Owner, None, owner_nv_public)
             .expect("Call to nv_define_space failed");
 
-        let _ = context
+        context
             .nv_undefine_space(Provision::Owner, owner_nv_index_handle)
             .expect("Call to nv_undefine_space failed");
 
@@ -108,7 +108,7 @@ mod test_nv_define_space {
             .nv_define_space(Provision::Platform, None, platform_nv_public)
             .expect("Call to nv_define_space failed");
 
-        let _ = context
+        context
             .nv_undefine_space(Provision::Platform, platform_nv_index_handle)
             .expect("Call to nv_undefine_space failed");
     }
@@ -149,7 +149,7 @@ mod test_nv_undefine_space {
             .expect("Call to nv_define_space failed");
 
         // Succeeds
-        let _ = context
+        context
             .nv_undefine_space(Provision::Owner, owner_nv_index_handle)
             .expect("Call to nv_undefine_space failed");
     }
@@ -190,9 +190,9 @@ mod test_nv_read_public {
 
         let read_public_result = context.nv_read_public(nv_index_handle);
 
-        let _ = context
+        context
             .nv_undefine_space(Provision::Owner, nv_index_handle)
-            .unwrap();
+            .expect("Call to nv_undefine_space failed");
 
         // Report error
         if let Err(e) = read_public_result {
@@ -250,7 +250,7 @@ mod test_nv_write {
             0,
         );
 
-        let _ = context
+        context
             .nv_undefine_space(Provision::Owner, owner_nv_index_handle)
             .expect("Call to nv_undefine_space failed");
 
@@ -311,7 +311,7 @@ mod test_nv_read {
         // read data using owner authorization
         let read_result =
             context.nv_read(NvAuth::Owner, owner_nv_index_handle, value.len() as u16, 0);
-        let _ = context
+        context
             .nv_undefine_space(Provision::Owner, owner_nv_index_handle)
             .expect("Call to nv_undefine_space failed");