diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/set1.rs | 5 | ||||
-rw-r--r-- | tests/set2.rs | 6 | ||||
-rw-r--r-- | tests/set3.rs | 6 | ||||
-rw-r--r-- | tests/set4.rs | 3 | ||||
-rw-r--r-- | tests/util.rs | 16 |
5 files changed, 9 insertions, 27 deletions
diff --git a/tests/set1.rs b/tests/set1.rs index e1dacd1..f1db7e5 100644 --- a/tests/set1.rs +++ b/tests/set1.rs @@ -1,7 +1,4 @@ -extern crate matasano; -extern crate rustc_serialize as serialize; - -use serialize::hex::FromHex; +use rustc_serialize::hex::FromHex; mod util; diff --git a/tests/set2.rs b/tests/set2.rs index d5cc5d5..a8de407 100644 --- a/tests/set2.rs +++ b/tests/set2.rs @@ -1,12 +1,8 @@ -extern crate matasano; -extern crate rand; -extern crate rustc_serialize as serialize; - use std::borrow::ToOwned; use std::collections::HashMap; use rand::Rng; -use serialize::base64::FromBase64; +use rustc_serialize::base64::FromBase64; mod util; diff --git a/tests/set3.rs b/tests/set3.rs index 4cbd9e2..5d66e88 100644 --- a/tests/set3.rs +++ b/tests/set3.rs @@ -1,9 +1,5 @@ -extern crate matasano; -extern crate rand; -extern crate rustc_serialize as serialize; - use rand::{FromEntropy, Rng}; -use serialize::base64::FromBase64; +use rustc_serialize::base64::FromBase64; mod util; diff --git a/tests/set4.rs b/tests/set4.rs index 5f5916d..c0c06e3 100644 --- a/tests/set4.rs +++ b/tests/set4.rs @@ -1,6 +1,3 @@ -extern crate matasano; -extern crate rand; - use rand::Rng; mod util; diff --git a/tests/util.rs b/tests/util.rs index 390559e..a253c2d 100644 --- a/tests/util.rs +++ b/tests/util.rs @@ -1,15 +1,11 @@ #![allow(dead_code)] -extern crate rand; -extern crate rustc_serialize as serialize; -extern crate time; - +use rand::{Rng, RngCore}; use std::fs::File; use std::io::prelude::*; -use self::rand::{Rng, RngCore}; -use self::serialize::base64::FromBase64; -use self::serialize::hex::FromHex; +use rustc_serialize::base64::FromBase64; +use rustc_serialize::hex::FromHex; pub fn read_as_hex_lines(filename: &str) -> Vec<Vec<u8>> { let fh = File::open(filename).unwrap(); @@ -56,14 +52,14 @@ pub fn write(filename: &str, data: &[u8]) { pub fn random_aes_128_key() -> [u8; 16] { let mut key = [0; 16]; - self::rand::thread_rng().fill_bytes(&mut key); + rand::thread_rng().fill_bytes(&mut key); return key; } pub fn coinflip() -> bool { - self::rand::thread_rng().gen() + rand::thread_rng().gen() } pub fn now() -> u32 { - return self::time::now().to_timespec().sec as u32; + return time::now().to_timespec().sec as u32; } |