Say farewell to in-tree HeapSizeOf

components/msg/Cargo.toml

@@ -22,10 +22,12 @@ path = "../plugins"
 
 [dependencies]
 bitflags = "0.3"
-cssparser = {version = "0.5.2", features = ["serde-serialization"]}
+cssparser = {version = "0.5.2", features = ["heap_size", "serde-serialization"]}
 euclid = {version = "0.6.1", features = ["plugins"]}
+heapsize = "0.2.5"
+heapsize_plugin = "0.1.2"
 hyper = { version = "0.7", features = [ "serde-serialization" ] }
 rustc-serialize = "0.3.4"
 serde = "0.6"
 serde_macros = "0.6"
-url = "0.5.4"
+url = {version = "0.5.4", features = ["heap_size"]}

components/msg/constellation_msg.rs

@@ -16,7 +16,6 @@ use std::cell::Cell;
 use std::fmt;
 use url::Url;
 use util::geometry::{PagePx, ViewportPx};
-use util::mem::HeapSizeOf;
 use webdriver_msg::{LoadStatus, WebDriverScriptCommand};
 
 #[derive(Deserialize, Serialize)]

components/msg/lib.rs

@@ -3,11 +3,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #![feature(custom_attribute, custom_derive, plugin)]
-#![plugin(serde_macros, plugins)]
+#![plugin(heapsize_plugin, serde_macros, plugins)]
 
 #[macro_use]
 extern crate bitflags;
 extern crate euclid;
+extern crate heapsize;
 extern crate hyper;
 extern crate ipc_channel;
 extern crate layers;