Remove heapsize

ethbloom/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ethbloom"
-version = "0.6.4"
+version = "0.7.0"
 authors = ["Parity Technologies <[email protected]>"]
 description = "Ethereum bloom filter"
 license = "MIT"
@@ -11,7 +11,7 @@ repository = "https://github.com/paritytech/parity-common"
 [dependencies]
 tiny-keccak = "1.4"
 crunchy = { version = "0.2", default-features = false, features = ["limit_256"] }
-fixed-hash = { path = "../fixed-hash", version = "0.3", default-features = false }
+fixed-hash = { path = "../fixed-hash", version = "0.4", default-features = false }
 impl-serde = { path = "../primitive-types/impls/serde", version = "0.2", default-features = false, optional = true }
 impl-rlp = { path = "../primitive-types/impls/rlp", version = "0.2", default-features = false }
 
@@ -20,7 +20,6 @@ rand = { version = "0.4" }
 hex-literal = "0.1.1"
 
 [features]
-default = ["std", "heapsize", "serialize", "fixed-hash/libc", "fixed-hash/rustc-hex"]
+default = ["std", "serialize", "fixed-hash/libc", "fixed-hash/rustc-hex"]
 std = ["fixed-hash/std", "crunchy/std"]
-heapsize = ["fixed-hash/heapsize"]
 serialize = ["std", "impl-serde"]

ethereum-types/Cargo.toml

@@ -1,24 +1,23 @@
 [package]
 name = "ethereum-types"
-version = "0.6.0"
+version = "0.7.0"
 authors = ["Parity Technologies <[email protected]>"]
 license = "MIT"
 homepage = "https://github.com/paritytech/parity-common"
 description = "Ethereum types"
 
 [dependencies]
-ethbloom = { path = "../ethbloom", version = "0.6", default-features = false }
-fixed-hash = { path = "../fixed-hash", version = "0.3", default-features = false, features = ["byteorder", "rustc-hex"] }
-uint = { path = "../uint", version = "0.7", default-features = false }
-primitive-types = { path = "../primitive-types", version = "0.3", features = ["rlp", "byteorder", "rustc-hex"], default-features = false }
+ethbloom = { path = "../ethbloom", version = "0.7", default-features = false }
+fixed-hash = { path = "../fixed-hash", version = "0.4", default-features = false, features = ["byteorder", "rustc-hex"] }
+uint = { path = "../uint", version = "0.8", default-features = false }
+primitive-types = { path = "../primitive-types", version = "0.4", features = ["rlp", "byteorder", "rustc-hex"], default-features = false }
 impl-serde = { path = "../primitive-types/impls/serde", version = "0.2", default-features = false, optional = true }
 impl-rlp = { path = "../primitive-types/impls/rlp", version = "0.2", default-features = false }
 
 [dev-dependencies]
 serde_json = "1.0"
 
 [features]
-default = ["std", "heapsize", "serialize"]
+default = ["std", "serialize"]
 std = ["uint/std", "fixed-hash/std", "ethbloom/std", "primitive-types/std"]
-heapsize = ["uint/heapsize", "primitive-types/heapsize", "fixed-hash/heapsize", "ethbloom/heapsize"]
 serialize = ["std", "impl-serde", "primitive-types/serde", "ethbloom/serialize"]

fixed-hash/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fixed-hash"
-version = "0.3.2"
+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);
 	}
 }
@@ -667,45 +666,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

@@ -43,10 +43,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([

keccak-hash/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "keccak-hash"
-version = "0.2.0"
+version = "0.3.0"
 description = "`keccak-hash` is a set of utility functions to facilitate working with Keccak hashes (256/512 bits long)."
 authors = ["Parity Technologies <[email protected]>"]
 repository = "https://github.com/paritytech/parity-common"
@@ -9,7 +9,7 @@ license = "GPL-3.0"
 
 [dependencies]
 tiny-keccak = "1.4"
-primitive-types = { path = "../primitive-types", version = "0.3" }
+primitive-types = { path = "../primitive-types", version = "0.4" }
 
 [dev-dependencies]
 tempdir = "0.3"

kvdb-rocksdb/Cargo.toml

@@ -19,4 +19,4 @@ parity-rocksdb = "0.5"
 
 [dev-dependencies]
 tempdir = "0.3"
-ethereum-types = { version = "0.6", path = "../ethereum-types" }
+ethereum-types = { version = "0.7", path = "../ethereum-types" }

parity-util-mem/Cargo.toml

@@ -13,9 +13,9 @@ malloc_size_of_derive = "0.1.0"
 dlmalloc = { version = "0.1", features = ["global"], optional = true }
 wee_alloc = { version = "0.4", optional = true }
 
-elastic-array = { version = "*", optional = true }
-ethereum-types = { version = "*", optional = true }
-parking_lot = { version = "*", optional = true }
+elastic-array = { version = "0", optional = true }
+ethereum-types = { version = "0", optional = true }
+parking_lot = { version = "0", optional = true }
 
 [target.'cfg(target_os = "windows")'.dependencies.winapi]
 version = "0.3.4"
@@ -27,8 +27,6 @@ optional = true
 [features]
 default = ["std", "ethereum-impls"]
 std = []
-# when activated mem is removed through volatile primitive instead of clear_on_drop crate
-volatile-erase = []
 # use dlmalloc as global allocator
 dlmalloc-global = ["dlmalloc", "estimate-heapsize"]
 # use wee_alloc as global allocator

parity-util-mem/README.md

@@ -4,13 +4,14 @@ Collection of memory related utilities.
 
 ## Features
 
-- volatile-erase : Not set by default, `Memzero` struct will be erasing memory through a simple [`write_volatile`](https://doc.rust-lang.org/std/ptr/fn.write_volatile.html) call.
 - estimate-heapsize : Do not use allocator, but `size_of` or `size_of_val`.
 
 Others features define global allocator, see `src/alloc.rs`.
 
 ## Dependency
 
-This crate groups common dependency, [`clear_on_drop`](https://crates.io/crates/clear_on_drop) is reexported, and a patched copy of unpublished [`malloc_size_of`](https://github.com/servo/servo/tree/master/components/malloc_size_of) from servo project is copied and partially reexported.
+This crate groups common dependency, a patched copy of unpublished [`malloc_size_of`](https://github.com/servo/servo/tree/master/components/malloc_size_of) from servo project is copied and partially reexported.
 
 `Malloc_size_of` code is used internally as a module with a few modification to be able to implement type locally.
+
+For existing code using deprecated `HeapsizeOf` crate, calls to `heapsize_of_children` should be replace by calls to `size_of`.

parity-util-mem/src/allocators.rs

@@ -45,8 +45,6 @@ use malloc_size::MallocUnconditionalSizeOf;
 use std::os::raw::c_void;
 #[cfg(not(feature = "std"))]
 use core::ffi::c_void;
-#[cfg(not(feature = "std"))]
-use alloc::collections::btree_set::BTreeSet;
 
 mod usable_size {
 

parity-util-mem/src/lib.rs

@@ -29,19 +29,12 @@ extern crate cfg_if;
 #[cfg(not(feature = "std"))]
 extern crate alloc;
 
-extern crate clear_on_drop as cod;
-
-#[macro_use] extern crate malloc_size_of_derive as malloc_size_derive;
+extern crate malloc_size_of_derive as malloc_size_derive;
 
 use std::ops::{Deref, DerefMut};
 
-#[cfg(feature = "volatile-erase")]
 use std::ptr;
 
-#[cfg(not(feature = "volatile-erase"))]
-pub use cod::clear::Clear;
-
-
 cfg_if! {
 	if #[cfg(all(
 		feature = "jemalloc-global",
@@ -91,11 +84,6 @@ use core as std;
 #[cfg(feature = "ethereum-impls")]
 pub mod impls;
 
-/// Reexport clear_on_drop crate.
-pub mod clear_on_drop {
-	pub use cod::*;
-}
-
 pub use malloc_size_derive::*;
 pub use malloc_size::{
  	MallocSizeOfOps,
@@ -115,7 +103,6 @@ impl<T: AsMut<[u8]>> From<T> for Memzero<T> {
 	}
 }
 
-#[cfg(feature = "volatile-erase")]
 impl<T: AsMut<[u8]>> Drop for Memzero<T> {
 	fn drop(&mut self) {
 		unsafe {
@@ -126,13 +113,6 @@ impl<T: AsMut<[u8]>> Drop for Memzero<T> {
 	}
 }
 
-#[cfg(not(feature = "volatile-erase"))]
-impl<T: AsMut<[u8]>> Drop for Memzero<T> {
-	fn drop(&mut self) {
-		self.as_mut().clear();
-	}
-}
-
 impl<T: AsMut<[u8]>> Deref for Memzero<T> {
 	type Target = T;
 

parity-util-mem/src/malloc_size.rs

@@ -50,8 +50,6 @@
 #[cfg(not(feature = "std"))]
 use alloc::vec::Vec;
 #[cfg(not(feature = "std"))]
-use alloc::string::String;
-#[cfg(not(feature = "std"))]
 mod std {
   pub use core::*;
   pub use alloc::collections;
@@ -60,7 +58,9 @@ mod std {
 #[cfg(feature = "std")]
 use std::sync::Arc;
 
-use std::hash::{BuildHasher, Hash};
+#[cfg(feature = "std")]
+use std::hash::BuildHasher;
+use std::hash::Hash;
 use std::mem::size_of;
 use std::ops::Range;
 use std::ops::{Deref, DerefMut};
@@ -75,7 +75,7 @@ pub use alloc::boxed::Box;
 pub type VoidPtrToSizeFn = unsafe extern "C" fn(ptr: *const c_void) -> usize;
 
 /// A closure implementing a stateful predicate on pointers.
-pub type VoidPtrToBoolFnMut = FnMut(*const c_void) -> bool;
+pub type VoidPtrToBoolFnMut = dyn FnMut(*const c_void) -> bool;
 
 /// Operations used when measuring heap usage of data structures.
 pub struct MallocSizeOfOps {
@@ -211,6 +211,9 @@ pub mod inner_allocator_use {
 
 use super::*;
 
+#[cfg(not(feature = "std"))]
+use alloc::string::String;
+
 impl<T: ?Sized> MallocShallowSizeOf for Box<T> {
     fn shallow_size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
         unsafe { ops.malloc_size_of(&**self) }

parity-util-mem/src/sizeof.rs

@@ -24,7 +24,21 @@ use crate::malloc_size::{
 	MallocUnconditionalShallowSizeOf,
 	MallocSizeOfOps
 };
+#[cfg(not(feature = "std"))]
+use alloc::boxed::Box;
+#[cfg(not(feature = "std"))]
+use alloc::vec::Vec;
+#[cfg(not(feature = "std"))]
+use alloc::string::String;
+#[cfg(not(feature = "std"))]
+use core::mem::{size_of, size_of_val};
+#[cfg(not(feature = "std"))]
+use alloc::sync::Arc;
+
+#[cfg(feature = "std")]
 use std::mem::{size_of, size_of_val};
+#[cfg(feature = "std")]
+use std::sync::Arc;
 
 impl<T: ?Sized> MallocShallowSizeOf for Box<T> {
 	fn shallow_size_of(&self, _ops: &mut MallocSizeOfOps) -> usize {
@@ -44,7 +58,7 @@ impl<T> MallocShallowSizeOf for Vec<T> {
 	}
 }
 
-impl<T> MallocUnconditionalShallowSizeOf for std::sync::Arc<T> {
+impl<T> MallocUnconditionalShallowSizeOf for Arc<T> {
 	fn unconditional_shallow_size_of(&self, _ops: &mut MallocSizeOfOps) -> usize {
 		size_of::<T>()
 	}

primitive-types/Cargo.toml

@@ -1,22 +1,21 @@
 [package]
 name = "primitive-types"
-version = "0.3.0"
+version = "0.4.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.7", path = "../uint", default-features = false }
+fixed-hash = { version = "0.4", path = "../fixed-hash", default-features = false }
+uint = { version = "0.8", path = "../uint", default-features = false }
 impl-serde = { version = "0.2", path = "impls/serde", default-features = false, optional = true }
 impl-codec = { version = "0.2", path = "impls/codec", default-features = false, optional = true }
 impl-rlp = { version = "0.2", 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"]