Merge branch 'master' into keccak_fn

2017-08-31 11:53:26 +02:00
parent 7849fff41e e04d58f647
commit 94f717a255
55 changed files with 704 additions and 120 deletions
--- a/util/src/lib.rs
+++ b/util/src/lib.rs
@@ -150,7 +150,6 @@ pub use bigint::prelude::*;
 pub use bigint::hash;

 pub use ansi_term::{Colour, Style};
-pub use heapsize::HeapSizeOf;
 pub use parking_lot::{Condvar, Mutex, MutexGuard, RwLock, RwLockReadGuard, RwLockWriteGuard};

 /// 160-bit integer representing account address