Rustfmt

2 files changed, 13 insertions, 27 deletions

diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs
index b7cbe363..b49a9848 100644
--- a/openssl/src/x509/mod.rs
+++ b/openssl/src/x509/mod.rs
@@ -26,17 +26,10 @@ use nid::Nid;
 use opaque::Opaque;
 
 #[cfg(ossl10x)]
-use ffi::{
-    X509_set_notBefore,
-    X509_set_notAfter,
-    ASN1_STRING_data,
-};
+use ffi::{X509_set_notBefore, X509_set_notAfter, ASN1_STRING_data};
 #[cfg(ossl110)]
-use ffi::{
-    X509_set1_notBefore as X509_set_notBefore,
-    X509_set1_notAfter as X509_set_notAfter,
-    ASN1_STRING_get0_data as ASN1_STRING_data,
-};
+use ffi::{X509_set1_notBefore as X509_set_notBefore, X509_set1_notAfter as X509_set_notAfter,
+          ASN1_STRING_get0_data as ASN1_STRING_data};
 
 #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))]
 pub mod verify;
@@ -68,9 +61,7 @@ impl X509StoreContextRef {
     }
 
     pub fn error(&self) -> Option<X509VerifyError> {
-        unsafe {
-            X509VerifyError::from_raw(ffi::X509_STORE_CTX_get_error(self.as_ptr()) as c_long)
-        }
+        unsafe { X509VerifyError::from_raw(ffi::X509_STORE_CTX_get_error(self.as_ptr()) as c_long) }
     }
 
     pub fn current_cert(&self) -> Option<&X509Ref> {
@@ -386,9 +377,7 @@ impl X509Ref {
                 return None;
             }
 
-            Some(GeneralNames {
-                stack: stack as *mut _,
-            })
+            Some(GeneralNames { stack: stack as *mut _ })
         }
     }
 
@@ -495,9 +484,7 @@ impl Deref for X509 {
     type Target = X509Ref;
 
     fn deref(&self) -> &X509Ref {
-        unsafe {
-            X509Ref::from_ptr(self.0)
-        }
+        unsafe { X509Ref::from_ptr(self.0) }
     }
 }
 
@@ -749,8 +736,8 @@ impl Drop for GeneralNames {
     fn drop(&mut self) {
         unsafe {
             // This transmute is dubious but it's what openssl itself does...
-            let free: unsafe extern fn(*mut ffi::GENERAL_NAME) = ffi::GENERAL_NAME_free;
-            let free: unsafe extern fn(*mut c_void) = mem::transmute(free);
+            let free: unsafe extern "C" fn(*mut ffi::GENERAL_NAME) = ffi::GENERAL_NAME_free;
+            let free: unsafe extern "C" fn(*mut c_void) = mem::transmute(free);
             ffi::sk_pop_free(&mut (*self.stack).stack, Some(free));
         }
     }
@@ -759,8 +746,8 @@ impl Drop for GeneralNames {
     fn drop(&mut self) {
         unsafe {
             // This transmute is dubious but it's what openssl itself does...
-            let free: unsafe extern fn(*mut ffi::GENERAL_NAME) = ffi::GENERAL_NAME_free;
-            let free: unsafe extern fn(*mut c_void) = mem::transmute(free);
+            let free: unsafe extern "C" fn(*mut ffi::GENERAL_NAME) = ffi::GENERAL_NAME_free;
+            let free: unsafe extern "C" fn(*mut c_void) = mem::transmute(free);
             ffi::OPENSSL_sk_pop_free(self.stack as *mut _, Some(free));
         }
     }
diff --git a/openssl/src/x509/tests.rs b/openssl/src/x509/tests.rs
index 185c4910..1c248ba2 100644
--- a/openssl/src/x509/tests.rs
+++ b/openssl/src/x509/tests.rs
@@ -60,10 +60,9 @@ fn test_cert_gen_extension_ordering() {
 fn test_cert_gen_extension_bad_ordering() {
     let pkey = pkey();
     let result = get_generator()
-                     .add_extension(OtherNid(nid::AUTHORITY_KEY_IDENTIFIER,
-                                             "keyid:always".to_owned()))
-                     .add_extension(OtherNid(nid::SUBJECT_KEY_IDENTIFIER, "hash".to_owned()))
-                     .sign(&pkey);
+        .add_extension(OtherNid(nid::AUTHORITY_KEY_IDENTIFIER, "keyid:always".to_owned()))
+        .add_extension(OtherNid(nid::SUBJECT_KEY_IDENTIFIER, "hash".to_owned()))
+        .sign(&pkey);
 
     assert!(result.is_err());
 }