Remove heapsize

fixed-hash/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fixed-hash"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Parity Technologies <[email protected]>"]
 license = "MIT"
 homepage = "https://github.com/paritytech/parity-common"
@@ -10,10 +10,9 @@ documentation = "https://docs.rs/fixed-hash/"
 readme = "README.md"
 
 [package.metadata.docs.rs]
-features = ["heapsize", "quickcheck", "api-dummy"]
+features = ["quickcheck", "api-dummy"]
 
 [dependencies]
-heapsize = { version = "0.4", optional = true }
 rand = { version = "0.5", optional = true, default-features = false }
 rustc-hex = { version = "2.0", optional = true, default-features = false }
 quickcheck = { version = "0.7", optional = true }

fixed-hash/README.md

@@ -63,8 +63,6 @@ fixed-hash = { version = "0.3", default-features = false }
     - Enabled by default.
 - `byteorder`: Provide API based on the `byteorder` crate.
     - Enabled by default.
-- `heapsize`: Provide `HeapsizeOf` implementation for hash types.
-    - Disabled by default.
 - `quickcheck`: Provide `quickcheck` implementation for hash types.
     - Disabled by default.
 - `api-dummy`: Generate a dummy hash type for API documentation.

fixed-hash/src/hash.rs

@@ -323,7 +323,6 @@ macro_rules! construct_fixed_hash {
 		impl_rand_for_fixed_hash!($name);
 		impl_libc_for_fixed_hash!($name);
 		impl_rustc_hex_for_fixed_hash!($name);
-		impl_heapsize_for_fixed_hash!($name);
 		impl_quickcheck_for_fixed_hash!($name);
 	}
 }
@@ -665,45 +664,6 @@ macro_rules! impl_rustc_hex_for_fixed_hash {
 	}
 }
 
-// Implementation for disabled heapsize crate support.
-// 
-// # Note
-//
-// Feature guarded macro definitions instead of feature guarded impl blocks
-// to work around the problems of introducing `heapsize` crate feature in
-// a user crate.
-#[cfg(not(
-	all(feature = "heapsize", not(target_os = "unknown"))
-))]
-#[macro_export]
-#[doc(hidden)]
-macro_rules! impl_heapsize_for_fixed_hash {
-	( $name:ident ) => {}
-}
-
-// Implementation for enabled heapsize crate support.
-// 
-// # Note
-//
-// Feature guarded macro definitions instead of feature guarded impl blocks
-// to work around the problems of introducing `heapsize` crate feature in
-// a user crate.
-#[cfg(
-	all(feature = "heapsize", not(target_os = "unknown"))
-)]
-#[macro_export]
-#[doc(hidden)]
-macro_rules! impl_heapsize_for_fixed_hash {
-	( $name:ident ) => {
-		impl $crate::heapsize::HeapSizeOf for $name {
-			#[inline]
-			fn heap_size_of_children(&self) -> usize {
-				0
-			}
-		}
-	}
-}
-
 // Implementation for disabled quickcheck crate support.
 // 
 // # Note

fixed-hash/src/lib.rs

@@ -37,10 +37,6 @@ pub extern crate byteorder;
 #[doc(hidden)]
 pub mod libc {}
 
-#[cfg(feature = "heapsize")]
-#[doc(hidden)]
-pub extern crate heapsize;
-
 #[cfg(feature = "rustc-hex")]
 #[doc(hidden)]
 pub extern crate rustc_hex;

fixed-hash/src/tests.rs

@@ -310,17 +310,6 @@ mod from_str {
 	}
 }
 
-#[cfg(all(
-	feature = "heapsize",
-	not(target_os = "unknown")
-))]
-#[test]
-fn test_heapsizeof() {
-	use heapsize::HeapSizeOf;
-	let h = H128::zero();
-	assert_eq!(h.heap_size_of_children(), 0);
-}
-
 #[test]
 fn from_h160_to_h256() {
 	let h160 = H160::from([

memorydb/Cargo.toml

@@ -1,19 +1,19 @@
 [package]
 name = "memorydb"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Parity Technologies <[email protected]>"]
 description = "in-memory implementation of hashdb"
 repository = "https://github.com/paritytech/parity-common"
 license = "GPL-3.0"
 
 [dependencies]
-heapsize = "0.4"
+parity-util-mem = { version = "0.1", path = "../parity-util-mem" }
 hashdb = { version = "0.3.0", path = "../hashdb" }
 plain_hasher = { version = "0.2", path = "../plain_hasher", default-features = false }
 rlp = { version = "0.3.0", path = "../rlp", default-features = false }
 
 [dev-dependencies]
 tiny-keccak = "1.4.2"
 ethereum-types = "0.4"
-keccak-hasher = { version = "0.1", path = "../test-support/keccak-hasher" }
-keccak-hash = { version = "0.1", path = "../keccak-hash" }
+keccak-hasher = { version = "*" } # ,  path = "../test-support/keccak-hasher" }
+keccak-hash = { version = "*" } #, path = "../keccak-hash" }

memorydb/src/lib.rs

@@ -16,14 +16,14 @@
 
 //! Reference-counted memory-based `HashDB` implementation.
 extern crate hashdb;
-extern crate heapsize;
+extern crate parity_util_mem as malloc_size_of;
 extern crate rlp;
 #[cfg(test)] extern crate keccak_hasher;
 #[cfg(test)] extern crate tiny_keccak;
 #[cfg(test)] extern crate ethereum_types;
 
 use hashdb::{HashDB, Hasher as KeyHasher, AsHashDB};
-use heapsize::HeapSizeOf;
+use malloc_size_of::{MallocSizeOf, MallocSizeOfOps, MallocSizeOfExt};
 use rlp::NULL_RLP;
 use std::collections::hash_map::Entry;
 use std::collections::HashMap;
@@ -91,7 +91,6 @@ pub struct MemoryDB<H: KeyHasher, T> {
 impl<'a, H, T> Default for MemoryDB<H, T>
 where
 	H: KeyHasher,
-	H::Out: HeapSizeOf,
 	T: From<&'a [u8]> + Clone
 {
 	fn default() -> Self { Self::new() }
@@ -100,7 +99,6 @@ where
 impl<'a, H, T> MemoryDB<H, T>
 where
 	H: KeyHasher,
-	H::Out: HeapSizeOf,
 	T: From<&'a [u8]> + Clone,
 {
 	/// Create a new instance of the memory DB.
@@ -112,7 +110,6 @@ where
 impl<H, T> MemoryDB<H, T>
 where
 	H: KeyHasher,
-	H::Out: HeapSizeOf,
 	T: Default,
 {
 	/// Remove an element and delete it from storage if reference count reaches zero.
@@ -216,13 +213,26 @@ impl<H: KeyHasher, T: Clone> MemoryDB<H, T> {
 
 impl<H, T> MemoryDB<H, T>
 where
-	H: KeyHasher,
-	H::Out: HeapSizeOf,
-	T: HeapSizeOf,
+H: KeyHasher,
+	H::Out: MallocSizeOf,
+	T: MallocSizeOf,
 {
 	/// Returns the size of allocated heap memory
 	pub fn mem_used(&self) -> usize {
-		self.data.heap_size_of_children()
+		self.malloc_size_of()
+	}
+}
+
+impl<H, T> MallocSizeOf for MemoryDB<H, T>
+where
+H: KeyHasher,
+	H::Out: MallocSizeOf,
+	T: MallocSizeOf,
+{
+	fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
+		self.data.size_of(ops)
+			+ self.null_node_data.size_of(ops)
+			+ self.hashed_null_node.size_of(ops)
 	}
 }
 

patricia_trie/Cargo.toml

@@ -17,7 +17,7 @@ parity-bytes = { version = "0.1", path = "../parity-bytes" }
 env_logger = "0.5"
 ethereum-types = "0.4"
 keccak-hash = { version = "0.1", path = "../keccak-hash" }
-memorydb = { version = "0.3.0", path = "../memorydb", default-features = false }
+memorydb = { version = "0.4.0", path = "../memorydb", default-features = false }
 rlp = { version = "0.3.0", path = "../rlp", default-features = false }
 trie-standardmap = { version = "0.1", path = "../trie-standardmap", default-features = false }
 triehash = { version = "0.3.0", path = "../triehash", default-features = false }

primitive-types/Cargo.toml

@@ -1,22 +1,21 @@
 [package]
 name = "primitive-types"
-version = "0.1.5"
+version = "0.2.0"
 authors = ["Parity Technologies <[email protected]>"]
 license = "Apache-2.0/MIT"
 homepage = "https://github.com/paritytech/parity-common"
 description = "Primitive types shared by Ethereum and Substrate"
 
 [dependencies]
-fixed-hash = { version = "0.3", path = "../fixed-hash", default-features = false }
-uint = { version = "0.6", path = "../uint", default-features = false }
+fixed-hash = { version = "0.4", path = "../fixed-hash", default-features = false }
+uint = { version = "0.7", path = "../uint", default-features = false }
 impl-serde = { version = "0.1", path = "impls/serde", default-features = false, optional = true }
 impl-codec = { version = "0.1", path = "impls/codec", default-features = false, optional = true }
 impl-rlp = { version = "0.1", path = "impls/rlp", default-features = false, optional = true }
 
 [features]
 default = ["std"]
 std = ["uint/std", "fixed-hash/std", "impl-codec/std"]
-heapsize = ["uint/heapsize", "fixed-hash/heapsize"]
 byteorder = ["fixed-hash/byteorder"]
 libc = ["fixed-hash/libc"]
 rustc-hex = ["fixed-hash/rustc-hex"]

uint/Cargo.toml

@@ -4,13 +4,12 @@ homepage = "http://parity.io"
 repository = "https://github.com/paritytech/parity-common"
 license = "MIT/Apache-2.0"
 name = "uint"
-version = "0.6.0"
+version = "0.7.0"
 authors = ["Parity Technologies <[email protected]>"]
 readme = "README.md"
 
 [dependencies]
 byteorder = { version = "1", default-features = false }
-heapsize = { version = "0.4.2", optional = true }
 rustc-hex = { version = "2.0", default-features = false }
 quickcheck = { version = "0.6", optional = true }
 crunchy = { version = "0.2", default-features = true }

uint/README.md

@@ -52,5 +52,3 @@ cargo bench
 	- Enabled by default.
 - `quickcheck`: Enable quickcheck-style property testing
 	- Use with `cargo test --release --features=quickcheck`.
-- `heapsize`: Implement base trait of the `heapsizeof` crate
-	- Use with `cargo build --feature=heapsize`.

uint/src/lib.rs

@@ -13,10 +13,6 @@
 #[doc(hidden)]
 pub extern crate byteorder;
 
-#[cfg(feature="heapsize")]
-#[doc(hidden)]
-pub extern crate heapsize;
-
 // Re-export libcore using an alias so that the macros can work without
 // requiring `extern crate core` downstream.
 #[doc(hidden)]

uint/src/uint.rs

@@ -1317,7 +1317,6 @@ macro_rules! construct_uint {
 		}
 
 		impl_std_for_uint!($name, $n_words);
-		impl_heapsize_for_uint!($name);
 		// `$n_words * 8` because macro expects bytes and
 		// uints use 64 bit (8 byte) words
 		impl_quickcheck_arbitrary_for_uint!($name, ($n_words * 8));
@@ -1359,26 +1358,6 @@ macro_rules! impl_std_for_uint {
 	($name: ident, $n_words: tt) => {}
 }
 
-#[cfg(feature="heapsize")]
-#[macro_export]
-#[doc(hidden)]
-macro_rules! impl_heapsize_for_uint {
-	($name: ident) => {
-		impl $crate::heapsize::HeapSizeOf for $name {
-			fn heap_size_of_children(&self) -> usize {
-				0
-			}
-		}
-	}
-}
-
-#[cfg(not(feature="heapsize"))]
-#[macro_export]
-#[doc(hidden)]
-macro_rules! impl_heapsize_for_uint {
-	($name: ident) => {}
-}
-
 #[cfg(feature="quickcheck")]
 #[macro_export]
 #[doc(hidden)]