Merge pull request RustCrypto#123 from RustCrypto/reexport-typenum-co…

…nsts Re-export `typenum::consts` as `consts`
dns2utf8 · May 23, 2020 · ac59f82 · ac59f82
2 parents a3c342d + 371db89
commit ac59f82
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/aead/src/lib.rs b/aead/src/lib.rs
@@ -25,15 +25,17 @@ extern crate alloc;
 #[cfg(feature = "std")]
 extern crate std;
 
-pub use generic_array;
+pub use generic_array::{self, typenum::consts};
+
 #[cfg(feature = "heapless")]
 pub use heapless;
 
-#[cfg(feature = "alloc")]
-use alloc::vec::Vec;
 use core::fmt;
 use generic_array::{typenum::Unsigned, ArrayLength, GenericArray};
 
+#[cfg(feature = "alloc")]
+use alloc::vec::Vec;
+
 /// Error type
 #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub struct Error;

diff --git a/block-cipher-trait/src/lib.rs b/block-cipher-trait/src/lib.rs
@@ -15,7 +15,7 @@ pub mod dev;
 mod errors;
 
 pub use crate::errors::InvalidKeyLength;
-pub use generic_array;
+pub use generic_array::{self, typenum::consts};
 
 use generic_array::typenum::Unsigned;
 use generic_array::{ArrayLength, GenericArray};

diff --git a/crypto-mac/src/lib.rs b/crypto-mac/src/lib.rs
@@ -14,7 +14,7 @@ pub mod dev;
 mod errors;
 
 pub use crate::errors::{InvalidKeyLength, MacError};
-pub use generic_array;
+pub use generic_array::{self, typenum::consts};
 
 use generic_array::typenum::Unsigned;
 use generic_array::{ArrayLength, GenericArray};

diff --git a/digest/src/lib.rs b/digest/src/lib.rs
@@ -33,7 +33,7 @@ mod errors;
 
 pub use crate::digest::{Digest, Output};
 pub use crate::errors::InvalidOutputSize;
-pub use generic_array;
+pub use generic_array::{self, typenum::consts};
 
 #[cfg(feature = "std")]
 #[cfg_attr(docsrs, doc(cfg(feature = "std")))]

diff --git a/stream-cipher/src/lib.rs b/stream-cipher/src/lib.rs
@@ -18,7 +18,7 @@ pub mod dev;
 mod errors;
 
 pub use crate::errors::{InvalidKeyNonceLength, LoopError};
-pub use generic_array;
+pub use generic_array::{self, typenum::consts};
 
 use generic_array::typenum::Unsigned;
 use generic_array::{ArrayLength, GenericArray};

diff --git a/universal-hash/src/lib.rs b/universal-hash/src/lib.rs
@@ -21,7 +21,7 @@
 #[cfg(feature = "std")]
 extern crate std;
 
-pub use generic_array;
+pub use generic_array::{self, typenum::consts};
 
 use generic_array::typenum::Unsigned;
 use generic_array::{ArrayLength, GenericArray};
@@ -32,6 +32,7 @@ use subtle::{Choice, ConstantTimeEq};
 pub trait UniversalHash: Clone {
     /// Size of the key for the universal hash function
     type KeySize: ArrayLength<u8>;
+
     /// Size of the inputs to and outputs from the universal hash function
     type BlockSize: ArrayLength<u8>;