Format (#257)

* Add Rustfmt

* Add Taplo

src/tests/full_test.rs

@@ -7,39 +7,37 @@
 
 #![allow(unsafe_code)]
 
-use crate::{
-    ciphersuite::CipherSuite,
-    envelope::EnvelopeLen,
-    errors::*,
-    hash::{OutputSize, ProxyHash},
-    key_exchange::{
-        group::KeGroup,
-        traits::{Ke1MessageLen, Ke1StateLen, Ke2MessageLen},
-        tripledh::{NonceLen, TripleDH},
-    },
-    messages::{
-        CredentialRequestLen, CredentialResponseLen, CredentialResponseWithoutKeLen,
-        RegistrationResponseLen, RegistrationUploadLen,
-    },
-    opaque::*,
-    slow_hash::NoOpHash,
-    tests::mock_rng::CycleRng,
-    *,
-};
 use core::ops::Add;
+use std::string::{String, ToString};
+use std::vec::Vec;
+use std::{format, println, vec};
+
 use digest::core_api::{BlockSizeUser, CoreProxy};
 use digest::Output;
 use generic_array::typenum::{IsLess, Le, NonZero, Sum, Unsigned, U256};
 use generic_array::ArrayLength;
 use rand::rngs::OsRng;
 use serde_json::Value;
-use std::string::{String, ToString};
-use std::vec::Vec;
-use std::{format, println, vec};
 use subtle::ConstantTimeEq;
 use voprf::Group;
 use zeroize::Zeroize;
 
+use crate::ciphersuite::CipherSuite;
+use crate::envelope::EnvelopeLen;
+use crate::errors::*;
+use crate::hash::{OutputSize, ProxyHash};
+use crate::key_exchange::group::KeGroup;
+use crate::key_exchange::traits::{Ke1MessageLen, Ke1StateLen, Ke2MessageLen};
+use crate::key_exchange::tripledh::{NonceLen, TripleDH};
+use crate::messages::{
+    CredentialRequestLen, CredentialResponseLen, CredentialResponseWithoutKeLen,
+    RegistrationResponseLen, RegistrationUploadLen,
+};
+use crate::opaque::*;
+use crate::slow_hash::NoOpHash;
+use crate::tests::mock_rng::CycleRng;
+use crate::*;
+
 // Tests
 // =====
 
@@ -491,9 +489,10 @@ where
     CredentialResponseWithoutKeLen<CS>: Add<Ke2MessageLen<CS>>,
     CredentialResponseLen<CS>: ArrayLength<u8>,
 {
-    use crate::keypair::KeyPair;
     use rand::RngCore;
 
+    use crate::keypair::KeyPair;
+
     let mut rng = OsRng;
 
     // Inputs

src/tests/mock_rng.rs

@@ -6,22 +6,21 @@
 // of this source tree.
 
 use core::cmp::min;
-use rand::{CryptoRng, Error, RngCore};
 use std::vec::Vec;
 
+use rand::{CryptoRng, Error, RngCore};
+
 /// A simple implementation of `RngCore` for testing purposes.
 ///
 /// This generates a cyclic sequence (i.e. cycles over an initial buffer)
-///
-///
 #[derive(Clone, Debug)]
 pub struct CycleRng {
     v: Vec<u8>,
 }
 
 impl CycleRng {
-    /// Create a `CycleRng`, yielding a sequence starting with
-    /// `initial` and looping thereafter
+    /// Create a `CycleRng`, yielding a sequence starting with `initial` and
+    /// looping thereafter
     pub fn new(initial: Vec<u8>) -> Self {
         CycleRng { v: initial }
     }

src/tests/opaque_vectors.rs

@@ -5,8 +5,7 @@
 // License, Version 2.0 found in the LICENSE-APACHE file in the root directory
 // of this source tree.
 
-//! The OPAQUE test vectors taken from:
-//! https://github.com/cfrg/draft-irtf-cfrg-opaque/blob/master/draft-irtf-cfrg-opaque.md
+//! The OPAQUE test vectors taken from: https://github.com/cfrg/draft-irtf-cfrg-opaque/blob/master/draft-irtf-cfrg-opaque.md
 
 pub(crate) static VECTORS: &str = r#"
 ## Real Test Vectors {#real-vectors}

src/tests/test_opaque_vectors.rs

@@ -5,35 +5,33 @@
 // License, Version 2.0 found in the LICENSE-APACHE file in the root directory
 // of this source tree.
 
-use crate::{
-    ciphersuite::CipherSuite,
-    envelope::EnvelopeLen,
-    errors::*,
-    hash::{OutputSize, ProxyHash},
-    key_exchange::{
-        group::KeGroup,
-        traits::{Ke1MessageLen, Ke2MessageLen},
-        tripledh::{NonceLen, TripleDH},
-    },
-    messages::{
-        CredentialRequestLen, CredentialResponseLen, CredentialResponseWithoutKeLen,
-        RegistrationResponseLen, RegistrationUploadLen,
-    },
-    opaque::*,
-    slow_hash::NoOpHash,
-    tests::mock_rng::CycleRng,
-    *,
-};
 use core::ops::Add;
+use std::string::ToString;
+use std::vec::Vec;
+use std::{println, vec};
+
 use digest::core_api::{BlockSizeUser, CoreProxy};
-use generic_array::{
-    typenum::{IsLess, Le, NonZero, Sum, U256},
-    ArrayLength,
-};
+use generic_array::typenum::{IsLess, Le, NonZero, Sum, U256};
+use generic_array::ArrayLength;
 use json::JsonValue;
-use std::{println, string::ToString, vec, vec::Vec};
 use voprf::Group;
 
+use crate::ciphersuite::CipherSuite;
+use crate::envelope::EnvelopeLen;
+use crate::errors::*;
+use crate::hash::{OutputSize, ProxyHash};
+use crate::key_exchange::group::KeGroup;
+use crate::key_exchange::traits::{Ke1MessageLen, Ke2MessageLen};
+use crate::key_exchange::tripledh::{NonceLen, TripleDH};
+use crate::messages::{
+    CredentialRequestLen, CredentialResponseLen, CredentialResponseWithoutKeLen,
+    RegistrationResponseLen, RegistrationUploadLen,
+};
+use crate::opaque::*;
+use crate::slow_hash::NoOpHash;
+use crate::tests::mock_rng::CycleRng;
+use crate::*;
+
 #[allow(non_snake_case)]
 #[derive(Debug)]
 pub struct OpaqueTestVectorParameters {
@@ -95,7 +93,8 @@ macro_rules! parse_default {
 macro_rules! parse_default_random {
     ( $v:ident, $s:expr, $size:expr ) => {
         parse_default!($v, $s, {
-            use rand::{rngs::OsRng, RngCore};
+            use rand::rngs::OsRng;
+            use rand::RngCore;
             let mut rng = OsRng;
             let mut v = vec![0u8; $size];
             rng.fill_bytes(&mut v);