Auto merge of #18474 - nnethercote:malloc_size_of-tweaks, r=jdm

malloc_size_of tweaks

<!-- Please describe your changes on the following line: -->

A couple of tweaks.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #18473 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because they are tested in Gecko.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/18474)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-09-13 08:02:45 -05:00 committed by GitHub
commit 8ee055fdc1
3 changed files with 34 additions and 17 deletions

View file

@ -55,7 +55,7 @@ impl StyleRule {
// It's safe to measure this ThinArc directly because it's the
// "primary" reference. (The secondary references are on the
// Stylist.)
n += ops.malloc_size_of(selector.thin_arc_heap_ptr());
n += unsafe { ops.malloc_size_of(selector.thin_arc_heap_ptr()) };
}
n += self.block.unconditional_shallow_size_of(ops) +