Merge branch 'master' into auth-round

util/benches/bigint.rs

@@ -24,7 +24,7 @@
 #![feature(asm)]
 
 extern crate test;
-extern crate bigint;
+extern crate ethcore_bigint as bigint;
 
 use test::{Bencher, black_box};
 use bigint::uint::{U256, U512, Uint, U128};

util/benches/rlp.rs

@@ -23,12 +23,13 @@
 #![feature(test)]
 
 extern crate test;
-extern crate ethcore_util;
+extern crate rlp;
+extern crate ethcore_bigint as bigint;
 
 use test::Bencher;
 use std::str::FromStr;
-use ethcore_util::rlp::*;
-use ethcore_util::U256;
+use rlp::*;
+use bigint::uint::U256;
 
 #[bench]
 fn bench_stream_u64_value(b: &mut Bencher) {