Remove re-export of HeapSizeOf in util (part of #6418)

ethcore/Cargo.toml

@@ -35,6 +35,7 @@ ethstore = { path = "../ethstore" }
 evm = { path = "evm" }
 futures = "0.1"
 hardware-wallet = { path = "../hw" }
+heapsize = "0.4"
 hyper = { git = "https://github.com/paritytech/hyper", default-features = false }
 itertools = "0.5"
 lazy_static = "0.2"

ethcore/evm/Cargo.toml

@@ -10,6 +10,7 @@ common-types = { path = "../types" }
 ethcore-util = { path = "../../util" }
 evmjit = { path = "../../evmjit", optional = true }
 ethjson = { path = "../../json" }
+heapsize = "0.4"
 lazy_static = "0.2"
 log = "0.3"
 rlp = { path = "../../util/rlp" }

ethcore/evm/src/interpreter/shared_cache.rs

@@ -15,7 +15,8 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::sync::Arc;
-use util::{H256, HeapSizeOf, Mutex};
+use heapsize::HeapSizeOf;
+use util::{H256, Mutex};
 use util::sha3::*;
 use util::cache::MemoryLruCache;
 use bit_set::BitSet;

ethcore/evm/src/lib.rs

@@ -25,6 +25,7 @@ extern crate rlp;
 extern crate parity_wasm;
 extern crate wasm_utils;
 extern crate ethcore_logger;
+extern crate heapsize;
 extern crate vm;
 
 #[macro_use]

ethcore/light/Cargo.toml

@@ -19,6 +19,7 @@ ethcore-io = { path = "../../util/io" }
 ethcore-ipc = { path = "../../ipc/rpc", optional = true }
 ethcore-devtools = { path = "../../devtools" }
 evm = { path = "../evm" }
+heapsize = "0.4"
 vm = { path = "../vm" }
 rlp = { path = "../../util/rlp" }
 rlp_derive = { path = "../../util/rlp_derive" }

ethcore/light/src/cache.rs

@@ -26,7 +26,8 @@ use ethcore::receipt::Receipt;
 
 use stats::Corpus;
 use time::{SteadyTime, Duration};
-use util::{U256, H256, HeapSizeOf};
+use heapsize::HeapSizeOf;
+use util::{U256, H256};
 use util::cache::MemoryLruCache;
 
 /// Configuration for how much data to cache.

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()
 	}

ethcore/light/src/lib.rs

@@ -72,6 +72,7 @@ extern crate ethcore_network as network;
 extern crate ethcore_util as util;
 extern crate ethcore;
 extern crate evm;
+extern crate heapsize;
 extern crate futures;
 extern crate itertools;
 extern crate rand;

ethcore/src/blockchain/blockchain.rs

@@ -21,6 +21,7 @@ use std::sync::Arc;
 use std::mem;
 use itertools::Itertools;
 use bloomchain as bc;
+use heapsize::HeapSizeOf;
 use util::*;
 use rlp::*;
 use header::*;

ethcore/src/blockchain/extras.rs

@@ -25,7 +25,8 @@ use engines::epoch::{Transition as EpochTransition};
 use header::BlockNumber;
 use receipt::Receipt;
 
-use util::{HeapSizeOf, H256, H264, U256};
+use heapsize::HeapSizeOf;
+use util::{H256, H264, U256};
 use util::kvdb::PREFIX_LEN as DB_PREFIX_LEN;
 
 /// Represents index of extra data in database

ethcore/src/blooms/bloom.rs

@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use bloomchain as bc;
-use util::HeapSizeOf;
+use heapsize::HeapSizeOf;
 use basic_types::LogBloom;
 
 /// Helper structure representing bloom of the trace.

ethcore/src/blooms/bloom_group.rs

@@ -16,7 +16,7 @@
 
 use bloomchain::group as bc;
 use rlp::*;
-use util::HeapSizeOf;
+use heapsize::HeapSizeOf;
 use super::Bloom;
 
 /// Represents group of X consecutive blooms.

ethcore/src/blooms/group_position.rs

@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use bloomchain::group as bc;
-use util::HeapSizeOf;
+use heapsize::HeapSizeOf;
 
 /// Represents `BloomGroup` position in database.
 #[derive(PartialEq, Eq, Hash, Clone, Debug)]

ethcore/src/encoded.rs

@@ -28,7 +28,8 @@ use header::{BlockNumber, Header as FullHeader};
 use transaction::UnverifiedTransaction;
 use views;
 
-use util::{Address, Hashable, H256, H2048, U256, HeapSizeOf};
+use heapsize::HeapSizeOf;
+use util::{Address, Hashable, H256, H2048, U256};
 use rlp::Rlp;
 
 /// Owning header view.

ethcore/src/engines/validator_set/simple_list.rs

@@ -16,7 +16,8 @@
 
 /// Preconfigured validator list.
 
-use util::{H256, Address, HeapSizeOf};
+use heapsize::HeapSizeOf;
+use util::{H256, Address};
 
 use engines::{Call, Engine};
 use header::{BlockNumber, Header};

ethcore/src/engines/validator_set/test.rs

@@ -19,7 +19,8 @@
 use std::str::FromStr;
 use std::sync::Arc;
 use std::sync::atomic::{AtomicUsize, Ordering as AtomicOrdering};
-use util::{Bytes, H256, Address, HeapSizeOf};
+use heapsize::HeapSizeOf;
+use util::{Bytes, H256, Address};
 
 use engines::{Call, Engine};
 use header::{Header, BlockNumber};

ethcore/src/header.rs

@@ -18,6 +18,7 @@
 
 use std::cmp;
 use std::cell::RefCell;
+use heapsize::HeapSizeOf;
 use util::*;
 use basic_types::{LogBloom, ZERO_LOGBLOOM};
 use time::get_time;

ethcore/src/lib.rs

@@ -101,6 +101,7 @@ extern crate num;
 extern crate price_info;
 extern crate rand;
 extern crate rlp;
+extern crate heapsize;
 
 #[macro_use]
 extern crate rlp_derive;

ethcore/src/miner/transaction_queue.rs

@@ -105,7 +105,8 @@ use std::cmp::Ordering;
 use std::cmp;
 use std::collections::{HashSet, HashMap, BTreeSet, BTreeMap};
 use linked_hash_map::LinkedHashMap;
-use util::{Address, H256, U256, HeapSizeOf};
+use heapsize::HeapSizeOf;
+use util::{Address, H256, U256};
 use table::Table;
 use transaction::*;
 use error::{Error, TransactionError};

ethcore/src/trace/db.rs

@@ -20,7 +20,8 @@ use std::collections::{HashMap, VecDeque};
 use std::sync::Arc;
 use bloomchain::{Number, Config as BloomConfig};
 use bloomchain::group::{BloomGroupDatabase, BloomGroupChain, GroupPosition, BloomGroup};
-use util::{H256, H264, KeyValueDB, DBTransaction, RwLock, HeapSizeOf};
+use heapsize::HeapSizeOf;
+use util::{H256, H264, KeyValueDB, DBTransaction, RwLock};
 use header::BlockNumber;
 use trace::{LocalizedTrace, Config, Filter, Database as TraceDatabase, ImportRequest, DatabaseExtras};
 use db::{self, Key, Writable, Readable, CacheUpdatePolicy};

ethcore/src/trace/types/flat.rs

@@ -18,7 +18,7 @@
 
 use std::collections::VecDeque;
 use rlp::*;
-use util::HeapSizeOf;
+use heapsize::HeapSizeOf;
 use basic_types::LogBloom;
 use super::trace::{Action, Res};
 

ethcore/src/transaction.rs

@@ -19,7 +19,8 @@
 use std::ops::Deref;
 use rlp::*;
 use util::sha3::Hashable;
-use util::{H256, Address, U256, Bytes, HeapSizeOf};
+use heapsize::HeapSizeOf;
+use util::{H256, Address, U256, Bytes};
 use ethkey::{Signature, Secret, Public, recover, public_to_address, Error as EthkeyError};
 use error::*;
 use evm::Schedule;

ethcore/src/verification/queue/kind.rs

@@ -19,7 +19,8 @@
 use engines::Engine;
 use error::Error;
 
-use util::{HeapSizeOf, H256, U256};
+use heapsize::HeapSizeOf;
+use util::{H256, U256};
 
 pub use self::blocks::Blocks;
 pub use self::headers::Headers;
@@ -72,7 +73,8 @@ pub mod blocks {
 	use header::Header;
 	use verification::{PreverifiedBlock, verify_block_basic, verify_block_unordered};
 
-	use util::{Bytes, HeapSizeOf, H256, U256};
+	use heapsize::HeapSizeOf;
+	use util::{Bytes, H256, U256};
 
 	/// A mode for verifying blocks.
 	pub struct Blocks;

ethcore/src/verification/queue/mod.rs

@@ -22,6 +22,7 @@ use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering as AtomicOrdering};
 use std::sync::{Condvar as SCondvar, Mutex as SMutex, Arc};
 use std::cmp;
 use std::collections::{VecDeque, HashSet, HashMap};
+use heapsize::HeapSizeOf;
 use util::*;
 use io::*;
 use error::*;

ethcore/src/verification/verification.rs

@@ -22,6 +22,7 @@
 //! 3. Final verification against the blockchain done before enactment.
 
 use std::collections::HashSet;
+use heapsize::HeapSizeOf;
 use util::*;
 use engines::Engine;
 use error::{BlockError, Error};

ethcore/types/Cargo.toml

@@ -10,6 +10,7 @@ rlp_derive = { path = "../../util/rlp_derive" }
 ethcore-util = { path = "../../util" }
 ethjson = { path = "../../json" }
 bloomable = { path = "../../util/bloomable" }
+heapsize = "0.4"
 
 [dev-dependencies]
 rustc-hex= "1.0"

ethcore/types/src/lib.rs

@@ -22,6 +22,7 @@ extern crate rlp;
 #[macro_use]
 extern crate rlp_derive;
 extern crate bloomable;
+extern crate heapsize;
 
 #[cfg(test)]
 extern crate rustc_hex;

ethcore/types/src/log_entry.rs

@@ -17,7 +17,8 @@
 //! Log entry type definition.
 
 use std::ops::Deref;
-use util::{H256, Address, Bytes, HeapSizeOf, Hashable};
+use heapsize::HeapSizeOf;
+use util::{H256, Address, Bytes, Hashable};
 use bloomable::Bloomable;
 
 use {BlockNumber};

ethcore/types/src/receipt.rs

@@ -17,7 +17,7 @@
 //! Receipt
 
 use util::{H256, U256, Address};
-use util::HeapSizeOf;
+use heapsize::HeapSizeOf;
 use rlp::*;
 
 use {BlockNumber};

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

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

sync/src/chain.rs

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

util/src/lib.rs

@@ -151,7 +151,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