Merge branch 'master' into keccak_fn

ethcore/light/src/client/header_chain.rs

@@ -36,7 +36,8 @@ use ethcore::header::Header;
 use ethcore::ids::BlockId;
 
 use rlp::{Encodable, Decodable, DecoderError, RlpStream, Rlp, UntrustedRlp};
-use util::{H256, U256, HeapSizeOf, RwLock};
+use heapsize::HeapSizeOf;
+use util::{H256, U256, RwLock};
 use util::kvdb::{DBTransaction, KeyValueDB};
 
 use cache::Cache;

ethcore/light/src/client/mod.rs

@@ -330,7 +330,7 @@ impl Client {
 
 	/// Get blockchain mem usage in bytes.
 	pub fn chain_mem_used(&self) -> usize {
-		use util::HeapSizeOf;
+		use heapsize::HeapSizeOf;
 
 		self.chain.heap_size_of_children()
 	}