From a80c8efa6f35bf0f6c3e7e39f9d849b84d3dbc35 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Thu, 31 Dec 2020 21:55:52 +0100 Subject: Re-group some imports --- openssl/src/cms.rs | 2 +- openssl/src/dh.rs | 2 +- openssl/src/pkcs7.rs | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/openssl/src/cms.rs b/openssl/src/cms.rs index 91ae21b2..b23df640 100644 --- a/openssl/src/cms.rs +++ b/openssl/src/cms.rs @@ -6,6 +6,7 @@ //! Data accepted by this module will be smime type `enveloped-data`. use foreign_types::{ForeignType, ForeignTypeRef}; +use libc::c_uint; use std::ptr; use crate::bio::{MemBio, MemBioSlice}; @@ -15,7 +16,6 @@ use crate::stack::StackRef; use crate::symm::Cipher; use crate::x509::{X509Ref, X509}; use crate::{cvt, cvt_p}; -use libc::c_uint; bitflags! { pub struct CMSOptions : c_uint { diff --git a/openssl/src/dh.rs b/openssl/src/dh.rs index ceae8d0b..068b96b6 100644 --- a/openssl/src/dh.rs +++ b/openssl/src/dh.rs @@ -1,9 +1,9 @@ -use crate::error::ErrorStack; use foreign_types::{ForeignType, ForeignTypeRef}; use std::mem; use std::ptr; use crate::bn::{BigNum, BigNumRef}; +use crate::error::ErrorStack; use crate::pkey::{HasParams, HasPrivate, HasPublic, Params, Private}; use crate::{cvt, cvt_p}; diff --git a/openssl/src/pkcs7.rs b/openssl/src/pkcs7.rs index 9717727e..76a96f3e 100644 --- a/openssl/src/pkcs7.rs +++ b/openssl/src/pkcs7.rs @@ -1,3 +1,7 @@ +use foreign_types::ForeignTypeRef; +use libc::c_int; +use std::ptr; + use crate::bio::{MemBio, MemBioSlice}; use crate::error::ErrorStack; use crate::pkey::{HasPrivate, PKeyRef}; @@ -6,9 +10,6 @@ use crate::symm::Cipher; use crate::x509::store::X509StoreRef; use crate::x509::{X509Ref, X509}; use crate::{cvt, cvt_p}; -use foreign_types::ForeignTypeRef; -use libc::c_int; -use std::ptr; foreign_type_and_impl_send_sync! { type CType = ffi::PKCS7; -- cgit v1.2.3