Merge branch 'master' into keccak_fn

sync/src/block_sync.rs

@@ -20,6 +20,7 @@
 
 use std::collections::{HashSet, VecDeque};
 use std::cmp;
+use heapsize::HeapSizeOf;
 use util::*;
 use rlp::*;
 use ethcore::views::{BlockView};

sync/src/blocks.rs

@@ -18,6 +18,7 @@ use std::collections::{HashSet, HashMap};
 use std::collections::hash_map::Entry;
 use smallvec::SmallVec;
 use hash::{keccak, KECCAK_NULL_RLP, KECCAK_EMPTY_LIST_RLP};
+use heapsize::HeapSizeOf;
 use util::*;
 use rlp::*;
 use network::NetworkError;

sync/src/chain.rs

@@ -92,6 +92,7 @@
 use std::collections::{HashSet, HashMap};
 use std::cmp;
 use hash::keccak;
+use heapsize::HeapSizeOf;
 use util::*;
 use rlp::*;
 use network::*;