tidy: fmt

Author: NuSkooler

tss-esapi/src/context.rs

@@ -15,7 +15,7 @@ use handle_manager::HandleManager;
 use log::{debug, error};
 use malloced::Malloced;
 use std::collections::HashMap;
-use std::{ptr, ptr::null_mut, ffi::c_void};
+use std::{ffi::c_void, ptr, ptr::null_mut};
 
 /// Safe abstraction over an ESYS_CONTEXT.
 ///

tss-esapi/src/context/tpm_commands/object_commands/create_command_output.rs

@@ -2,9 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
+    ffi::take_from_esys,
     structures::{CreateKeyResult, CreationData, CreationTicket, Digest, Private, Public},
     tss2_esys::{TPM2B_CREATION_DATA, TPM2B_DIGEST, TPM2B_PRIVATE, TPM2B_PUBLIC, TPMT_TK_CREATION},
-    Error, Result, ffi::take_from_esys,
+    Error, Result,
 };
 use std::convert::TryFrom;
 use std::ptr::null_mut;
@@ -68,23 +69,26 @@ impl TryFrom<CreateCommandOutputHandler> for CreateKeyResult {
         let out_private_owned = unsafe { take_from_esys(ffi_data_handler.ffi_out_private_ptr)? };
         ffi_data_handler.ffi_out_private_ptr = null_mut();
 
-        let out_public_owned  = unsafe { take_from_esys(ffi_data_handler.ffi_out_public_ptr)? };
+        let out_public_owned = unsafe { take_from_esys(ffi_data_handler.ffi_out_public_ptr)? };
         ffi_data_handler.ffi_out_public_ptr = null_mut();
 
-        let creation_data_owned = unsafe { take_from_esys(ffi_data_handler.ffi_creation_data_ptr)? };
+        let creation_data_owned =
+            unsafe { take_from_esys(ffi_data_handler.ffi_creation_data_ptr)? };
         ffi_data_handler.ffi_creation_data_ptr = null_mut();
 
-        let creation_hash_owned = unsafe { take_from_esys(ffi_data_handler.ffi_creation_hash_ptr)? };
+        let creation_hash_owned =
+            unsafe { take_from_esys(ffi_data_handler.ffi_creation_hash_ptr)? };
         ffi_data_handler.ffi_creation_hash_ptr = null_mut();
 
-        let creation_ticket_owned = unsafe { take_from_esys(ffi_data_handler.ffi_creation_ticket_ptr)? };
+        let creation_ticket_owned =
+            unsafe { take_from_esys(ffi_data_handler.ffi_creation_ticket_ptr)? };
         ffi_data_handler.ffi_creation_ticket_ptr = null_mut();
 
         Ok(CreateKeyResult {
-            out_private:    Private::try_from(out_private_owned)?,
-            out_public:     Public::try_from(out_public_owned)?,
-            creation_data:  CreationData::try_from(creation_data_owned)?,
-            creation_hash:  Digest::try_from(creation_hash_owned)?,
+            out_private: Private::try_from(out_private_owned)?,
+            out_public: Public::try_from(out_public_owned)?,
+            creation_data: CreationData::try_from(creation_data_owned)?,
+            creation_hash: Digest::try_from(creation_hash_owned)?,
             creation_ticket: CreationTicket::try_from(creation_ticket_owned)?,
         })
     }

tss-esapi/src/ffi.rs

@@ -2,11 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 pub mod data_zeroize;
-use crate::{ffi::data_zeroize::FfiDataZeroize, tss2_esys::Esys_Free, Error, Result, WrapperErrorKind};
+use crate::{
+    ffi::data_zeroize::FfiDataZeroize, tss2_esys::Esys_Free, Error, Result, WrapperErrorKind,
+};
 use log::error;
 use malloced::Malloced;
 use std::convert::TryFrom;
-use std::{ptr, ffi::c_void};
+use std::{ffi::c_void, ptr};
 
 /// Move a value `T` out of ESAPI-allocated memory and free the source with Esys_Free.
 /// The memory is zeroized before being freed.