get this compiling again

1 files changed, 15 insertions, 15 deletions

diff --git a/tests/util.rs b/tests/util.rs
index 6921eea..390559e 100644
--- a/tests/util.rs
+++ b/tests/util.rs
@@ -4,66 +4,66 @@ extern crate rand;
 extern crate rustc_serialize as serialize;
 extern crate time;
 
-use std::io::prelude::*;
 use std::fs::File;
+use std::io::prelude::*;
 
-use self::rand::Rng;
+use self::rand::{Rng, RngCore};
 use self::serialize::base64::FromBase64;
 use self::serialize::hex::FromHex;
 
-pub fn read_as_hex_lines (filename: &str) -> Vec<Vec<u8>> {
+pub fn read_as_hex_lines(filename: &str) -> Vec<Vec<u8>> {
     let fh = File::open(filename).unwrap();
-    return ::std::io::BufReader::new(fh)
+    return std::io::BufReader::new(fh)
         .lines()
         .map(|line| line.unwrap().from_hex().unwrap())
         .collect();
 }
 
-pub fn read_as_base64_lines (filename: &str) -> Vec<Vec<u8>> {
+pub fn read_as_base64_lines(filename: &str) -> Vec<Vec<u8>> {
     let fh = File::open(filename).unwrap();
-    return ::std::io::BufReader::new(fh)
+    return std::io::BufReader::new(fh)
         .lines()
         .map(|line| line.unwrap().from_base64().unwrap())
         .collect();
 }
 
-pub fn read_as_lines (filename: &str) -> Vec<Vec<u8>> {
+pub fn read_as_lines(filename: &str) -> Vec<Vec<u8>> {
     let fh = File::open(filename).unwrap();
-    return ::std::io::BufReader::new(fh)
+    return std::io::BufReader::new(fh)
         .lines()
         .map(|line| line.unwrap().as_bytes().to_vec())
         .collect();
 }
 
-pub fn read_as_base64 (filename: &str) -> Vec<u8> {
+pub fn read_as_base64(filename: &str) -> Vec<u8> {
     let fh = File::open(filename).unwrap();
-    return ::std::io::BufReader::new(fh)
+    return std::io::BufReader::new(fh)
         .lines()
         .map(|line| line.unwrap().from_base64().unwrap())
         .collect::<Vec<Vec<u8>>>()
         .concat();
 }
 
-pub fn read (filename: &str) -> Vec<u8> {
+pub fn read(filename: &str) -> Vec<u8> {
     let outfh = File::open(filename).unwrap();
     return outfh.bytes().map(|c| c.unwrap()).collect();
 }
 
-pub fn write (filename: &str, data: &[u8]) {
+pub fn write(filename: &str, data: &[u8]) {
     let mut outfh = File::create(filename).unwrap();
     outfh.write(data).unwrap();
 }
 
-pub fn random_aes_128_key () -> [u8; 16] {
+pub fn random_aes_128_key() -> [u8; 16] {
     let mut key = [0; 16];
     self::rand::thread_rng().fill_bytes(&mut key);
     return key;
 }
 
-pub fn coinflip () -> bool {
+pub fn coinflip() -> bool {
     self::rand::thread_rng().gen()
 }
 
-pub fn now () -> u32 {
+pub fn now() -> u32 {
     return self::time::now().to_timespec().sec as u32;
 }