Skip to content

Add different mode for malloc_size_of_is_0 macro dealing with generics #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NikVolf merged 5 commits into from
Feb 6, 2020
Merged

Add different mode for malloc_size_of_is_0 macro dealing with generics #334

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fc16713
add another mode for malloc_size_of_is_0 macro dealing with generics
NikVolf Feb 6, 2020
b37afd0
identations
NikVolf Feb 6, 2020
3850f7c
add version bump and log
NikVolf Feb 6, 2020
c503601
add doc comments
NikVolf Feb 6, 2020
2cd7999
fix version
NikVolf Feb 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion parity-util-mem/src/malloc_size.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,16 @@ macro_rules! malloc_size_of_is_0(
}
}
)+
);
(any: $($ty:ident<$($gen:ident),+>),+) => (
Comment thread
NikVolf marked this conversation as resolved.
$(
impl<$($gen),+> $crate::MallocSizeOf for $ty<$($gen),+> {
#[inline(always)]
fn size_of(&self, _: &mut $crate::MallocSizeOfOps) -> usize {
0
}
}
)+
);
($($ty:ident<$($gen:ident),+>),+) => (
$(
Expand All @@ -585,7 +595,7 @@ macro_rules! malloc_size_of_is_0(
}
}
)+
);
);
Comment thread
NikVolf marked this conversation as resolved.
);

malloc_size_of_is_0!(bool, char, str);
Expand Down Expand Up @@ -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);
}
}