Add different mode for malloc_size_of_is_0 macro dealing with generics

parity-util-mem/CHANGELOG.md

@@ -7,7 +7,10 @@ The format is based on [Keep a Changelog].
 ## [Unreleased]
 
 ## [0.5.0] - 2019-02-05
-- Bump parking_lot to 0.10. [#332](https://github.com/paritytech/parity-common/pull/332
+- Add different mode for malloc_size_of_is_0 macro dealing with generics #334. [#332](https://github.com/paritytech/parity-common/pull/334)
+
+## [0.5.0] - 2019-02-05
+- Bump parking_lot to 0.10. [#332](https://github.com/paritytech/parity-common/pull/332)
 
 ## [0.4.2] - 2020-02-04
 - Implementation of `MallocSizeOf` for `BTreeSet`. [#325](https://github.com/paritytech/parity-common/pull/325)

parity-util-mem/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "parity-util-mem"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 repository = "https://github.com/paritytech/parity-common"
 description = "Collection of memory related utilities"

parity-util-mem/src/malloc_size.rs

@@ -566,26 +566,36 @@ impl<T: MallocSizeOf> MallocSizeOf for parking_lot::RwLock<T> {
 
 #[macro_export]
 macro_rules! malloc_size_of_is_0(
-    ($($ty:ty),+) => (
-        $(
-            impl $crate::MallocSizeOf for $ty {
-                #[inline(always)]
-                fn size_of(&self, _: &mut $crate::MallocSizeOfOps) -> usize {
-                    0
-                }
-            }
-        )+
-    );
-    ($($ty:ident<$($gen:ident),+>),+) => (
-        $(
-        impl<$($gen: $crate::MallocSizeOf),+> $crate::MallocSizeOf for $ty<$($gen),+> {
-            #[inline(always)]
-            fn size_of(&self, _: &mut $crate::MallocSizeOfOps) -> usize {
-                0
-            }
-        }
-        )+
-    );
+	($($ty:ty),+) => (
+		$(
+			impl $crate::MallocSizeOf for $ty {
+				#[inline(always)]
+				fn size_of(&self, _: &mut $crate::MallocSizeOfOps) -> usize {
+					0
+				}
+			}
+		)+
+	);
+	(any: $($ty:ident<$($gen:ident),+>),+) => (
+		$(
+		impl<$($gen),+> $crate::MallocSizeOf for $ty<$($gen),+> {
+			#[inline(always)]
+			fn size_of(&self, _: &mut $crate::MallocSizeOfOps) -> usize {
+				0
+			}
+		}
+		)+
+	);
+	($($ty:ident<$($gen:ident),+>),+) => (
+		$(
+		impl<$($gen: $crate::MallocSizeOf),+> $crate::MallocSizeOf for $ty<$($gen),+> {
+			#[inline(always)]
+			fn size_of(&self, _: &mut $crate::MallocSizeOfOps) -> usize {
+				0
+			}
+		}
+		)+
+	);
 );
 
 malloc_size_of_is_0!(bool, char, str);
@@ -763,4 +773,16 @@ mod tests {
 		// ~36 per value
 		assert!(crate::malloc_size(&set) > 3000);
 	}
+
+	#[test]
+	fn special_malloc_size_of_0() {
+		struct Data<P> {
+			phantom: std::marker::PhantomData<P>,
+		}
+
+		malloc_size_of_is_0!(any: Data<P>);
+
+		// MallocSizeOf is not implemented for [u8; 333]
+		assert_eq!(crate::malloc_size(&Data::<[u8; 333]> { phantom: std::marker::PhantomData }), 0);
+	}
 }