diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-02-05 03:40:36 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-02-05 03:40:36 +0530 |
| commit | 2a6707ce58df27d93e865bffb6b44d396b810c99 (patch) | |
| tree | 849afb2986272f67b1abfc8720b8f530dc1c2227 /components/script/mem.rs | |
| parent | 9e68285d35a2e7b72c9edfd9e5e37399e724c4e6 (diff) | |
| parent | cb5cd8d881c39f549381e078b44f341dea733e68 (diff) | |
| download | servo-2a6707ce58df27d93e865bffb6b44d396b810c99.tar.gz servo-2a6707ce58df27d93e865bffb6b44d396b810c99.zip | |
Auto merge of #9532 - nox:dedup-heapsize, r=Manishearth
Say farewell to in-tree HeapSizeOf
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9532)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/mem.rs')
| -rw-r--r-- | components/script/mem.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/mem.rs b/components/script/mem.rs index 113f03b8396..e276b1a5c3d 100644 --- a/components/script/mem.rs +++ b/components/script/mem.rs @@ -6,8 +6,8 @@ use dom::bindings::conversions::get_dom_class; use dom::bindings::reflector::Reflectable; +use heapsize::{HeapSizeOf, heap_size_of}; use libc::c_void; -use util::mem::{HeapSizeOf, heap_size_of}; // This is equivalent to measuring a Box<T>, except that DOM objects lose their // associated box in order to stash their pointers in a reserved slot of their |