diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-09-03 08:12:22 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-03 08:12:22 -0400 |
commit | d8446f85a95723dec3a18b05bdd30514a57bddab (patch) | |
tree | 3e92a0a5fed4315519a34e8cef33c54840ada0d4 /components/malloc_size_of/lib.rs | |
parent | eb6aec37e9bde5aba2a3dc6b6ce5374579219f31 (diff) | |
parent | 1254cbf313243e8879a464538a5c78383ba3bc8b (diff) | |
download | servo-d8446f85a95723dec3a18b05bdd30514a57bddab.tar.gz servo-d8446f85a95723dec3a18b05bdd30514a57bddab.zip |
Auto merge of #21588 - emilio:gecko-sync, r=emilio
style: Sync changes from mozilla-central.
See each individual commit for details.
https://bugzilla.mozilla.org/show_bug.cgi?id=1488172
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21588)
<!-- Reviewable:end -->
Diffstat (limited to 'components/malloc_size_of/lib.rs')
-rw-r--r-- | components/malloc_size_of/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/malloc_size_of/lib.rs b/components/malloc_size_of/lib.rs index f4774d66a3e..11e96254172 100644 --- a/components/malloc_size_of/lib.rs +++ b/components/malloc_size_of/lib.rs @@ -845,8 +845,8 @@ macro_rules! malloc_size_of_is_0( ); malloc_size_of_is_0!(bool, char, str); -malloc_size_of_is_0!(u8, u16, u32, u64, usize); -malloc_size_of_is_0!(i8, i16, i32, i64, isize); +malloc_size_of_is_0!(u8, u16, u32, u64, u128, usize); +malloc_size_of_is_0!(i8, i16, i32, i64, i128, isize); malloc_size_of_is_0!(f32, f64); malloc_size_of_is_0!(std::sync::atomic::AtomicBool); |