aboutsummaryrefslogtreecommitdiffstats
path: root/components/script_traits/lib.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-02-05 03:40:36 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2016-02-05 03:40:36 +0530
commit2a6707ce58df27d93e865bffb6b44d396b810c99 (patch)
tree849afb2986272f67b1abfc8720b8f530dc1c2227 /components/script_traits/lib.rs
parent9e68285d35a2e7b72c9edfd9e5e37399e724c4e6 (diff)
parentcb5cd8d881c39f549381e078b44f341dea733e68 (diff)
downloadservo-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_traits/lib.rs')
-rw-r--r--components/script_traits/lib.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs
index 9229c626ab6..83761f20090 100644
--- a/components/script_traits/lib.rs
+++ b/components/script_traits/lib.rs
@@ -7,7 +7,7 @@
//! to depend on script.
#![feature(custom_derive, plugin)]
-#![plugin(plugins, serde_macros)]
+#![plugin(heapsize_plugin, plugins, serde_macros)]
#![deny(missing_docs)]
extern crate app_units;
@@ -15,6 +15,7 @@ extern crate canvas_traits;
extern crate devtools_traits;
extern crate euclid;
extern crate gfx_traits;
+extern crate heapsize;
extern crate ipc_channel;
extern crate libc;
extern crate msg;
@@ -50,7 +51,6 @@ use profile_traits::mem;
use std::any::Any;
use url::Url;
use util::ipc::OptionalOpaqueIpcSender;
-use util::mem::HeapSizeOf;
pub use script_msg::{LayoutMsg, ScriptMsg};