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/devtools_traits/lib.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/devtools_traits/lib.rs')
| -rw-r--r-- | components/devtools_traits/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/devtools_traits/lib.rs b/components/devtools_traits/lib.rs index 81644badc44..8408a79b197 100644 --- a/components/devtools_traits/lib.rs +++ b/components/devtools_traits/lib.rs @@ -13,10 +13,11 @@ #![deny(unsafe_code)] #![feature(custom_derive, plugin)] -#![plugin(serde_macros, plugins)] +#![plugin(heapsize_plugin, serde_macros)] #[macro_use] extern crate bitflags; +extern crate heapsize; extern crate hyper; extern crate ipc_channel; extern crate msg; @@ -36,7 +37,6 @@ use std::net::TcpStream; use time::Duration; use time::Tm; use url::Url; -use util::mem::HeapSizeOf; // Information would be attached to NewGlobal to be received and show in devtools. // Extend these fields if we need more information. |