From a530eec63ea4dfcf1671c47652ff9946e935eced Mon Sep 17 00:00:00 2001 From: Niklas Adolfsson Date: Thu, 5 Jul 2018 11:33:17 +0200 Subject: [PATCH] ethereum-types `make it work in no_std` (#42) * fix error on nightly * make it work on no-std by disabling default ft --- src/hash.rs | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/hash.rs b/src/hash.rs index 1d67bed..c89a1c4 100644 --- a/src/hash.rs +++ b/src/hash.rs @@ -319,7 +319,7 @@ macro_rules! construct_hash { } } -#[cfg(feature="heapsizeof")] +#[cfg(all(feature="heapsizeof", feature="libc", not(target_os = "unknown")))] #[macro_export] #[doc(hidden)] macro_rules! impl_heapsize_for_hash { @@ -332,7 +332,7 @@ macro_rules! impl_heapsize_for_hash { } } -#[cfg(not(feature="heapsizeof"))] +#[cfg(any(not(feature="heapsizeof"), not(feature="libc"), target_os = "unknown"))] #[macro_export] #[doc(hidden)] macro_rules! impl_heapsize_for_hash { @@ -425,19 +425,6 @@ macro_rules! impl_std_for_hash_internals { ($from: ident, $size: tt) => {} } -#[cfg(all(feature="libc", not(target_os = "unknown")))] -#[macro_export] -#[doc(hidden)] -macro_rules! impl_heapsize_for_hash { - ($name: ident) => { - impl $crate::heapsize::HeapSizeOf for $name { - fn heap_size_of_children(&self) -> usize { - 0 - } - } - } -} - #[cfg(all(feature="libc", not(target_os = "unknown")))] #[macro_export] #[doc(hidden)]