diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-09-17 23:19:54 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-17 23:19:54 -0500 |
commit | bb998dbdf31920d5ddc2a91d6bdfe8a880e11604 (patch) | |
tree | 47d5222139bd9b037411b2182a20409c2323520c /components/script/dom/bindings/codegen/CodegenRust.py | |
parent | 2387dbedbb27629cd9e8c4657e8328ae04ff6d58 (diff) | |
parent | 09143e627b602e34288876d48fc6ef60d5482b21 (diff) | |
download | servo-bb998dbdf31920d5ddc2a91d6bdfe8a880e11604.tar.gz servo-bb998dbdf31920d5ddc2a91d6bdfe8a880e11604.zip |
Auto merge of #18549 - nnethercote:fix-enclosing-crash, r=heycam
Fix a panic in Stylo memory reporting.
`MallocSizeOfOps::enclosing_size_of_op` is an `Option<>` type, and the panic in
question is caused by not providing a value in a case where it's needed for
measuring a HashSet.
HashMaps and HashSets are common enough that it makes sense to make
`enclosing_size_of_op` non-optional, which this patch does.
<!-- Please describe your changes on the following line: -->
---
<!-- 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
- [ ] These changes fix #__ (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because tests are on the Gecko side.
<!-- 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/18549)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/bindings/codegen/CodegenRust.py')
0 files changed, 0 insertions, 0 deletions