[WIP] Bump hybrid-array to v0.2.0-pre.6

Cargo.toml

@@ -5,7 +5,7 @@ members = [
     "async-signature",
     "cipher",
     "crypto",
-    "crypto-common",
+    #"crypto-common",
     "digest",
     "elliptic-curve",
     "kem",
@@ -14,9 +14,9 @@ members = [
     "signature_derive",
     "universal-hash",
 ]
+exclude = ["crypto-common"]
 
 [patch.crates-io]
 block-buffer = { git = "https://github.com/RustCrypto/utils.git" }
-crypto-common = { path = "crypto-common" }
-hybrid-array = { git = "https://github.com/RustCrypto/utils.git" }
+#crypto-common = { path = "crypto-common" }
 inout = { git = "https://github.com/RustCrypto/utils.git" }

crypto-common/Cargo.toml

@@ -13,7 +13,7 @@ keywords = ["crypto", "traits"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-hybrid-array = "=0.2.0-pre.5"
+hybrid-array = "=0.2.0-pre.6"
 
 # optional dependencies
 rand_core = { version = "0.6.4", optional = true }

crypto-common/src/lib.rs

@@ -23,7 +23,7 @@ pub use hybrid_array::typenum;
 use core::fmt;
 use hybrid_array::{
     typenum::{Diff, Sum, Unsigned},
-    Array, ArraySize, ByteArray,
+    Array, ArraySize,
 };
 
 #[cfg(feature = "rand_core")]
@@ -36,19 +36,19 @@ pub use serializable_state::{
 };
 
 /// Block on which [`BlockSizeUser`] implementors operate.
-pub type Block<B> = ByteArray<<B as BlockSizeUser>::BlockSize>;
+pub type Block<B> = Array<u8, <B as BlockSizeUser>::BlockSize>;
 
 /// Parallel blocks on which [`ParBlocksSizeUser`] implementors operate.
 pub type ParBlocks<T> = Array<Block<T>, <T as ParBlocksSizeUser>::ParBlocksSize>;
 
 /// Output array of [`OutputSizeUser`] implementors.
-pub type Output<T> = ByteArray<<T as OutputSizeUser>::OutputSize>;
+pub type Output<T> = Array<u8, <T as OutputSizeUser>::OutputSize>;
 
 /// Key used by [`KeySizeUser`] implementors.
-pub type Key<B> = ByteArray<<B as KeySizeUser>::KeySize>;
+pub type Key<B> = Array<u8, <B as KeySizeUser>::KeySize>;
 
 /// Initialization vector (nonce) used by [`IvSizeUser`] implementors.
-pub type Iv<B> = ByteArray<<B as IvSizeUser>::IvSize>;
+pub type Iv<B> = Array<u8, <B as IvSizeUser>::IvSize>;
 
 /// Alias for `AddBlockSize<A, B> = Sum<T, B::BlockSize>`
 pub type AddBlockSize<T, B> = Sum<T, <B as BlockSizeUser>::BlockSize>;

crypto-common/src/serializable_state.rs

@@ -1,12 +1,12 @@
 use crate::array::{
     self,
     typenum::{Diff, Prod, Sum, Unsigned, U1, U16, U2, U4, U8},
-    ArraySize, ByteArray,
+    Array, ArraySize,
 };
 use core::{convert::TryInto, default::Default, fmt};
 
 /// Serialized internal state.
-pub type SerializedState<T> = ByteArray<<T as SerializableState>::SerializedStateSize>;
+pub type SerializedState<T> = Array<u8, <T as SerializableState>::SerializedStateSize>;
 
 /// Alias for `AddSerializedStateSize<T, S> = Sum<T, S::SerializedStateSize>`
 pub type AddSerializedStateSize<T, S> = Sum<T, <S as SerializableState>::SerializedStateSize>;