servo: Merge #16169 - Remove heapsize for Stylo (from servo:stylo-heapsize); r=emilio

It doesn’t seem to be used, and is causing compilation trouble for Gecko: https://bugzilla.mozilla.org/show_bug.cgi?id=1350581

Source-Repo: https://github.com/servo/servo
Source-Revision: 42f58503c0dfb5c02d4395d481b9bd65e3d69d3a

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : a8c8032b3e0bf905950726a89a7a703f587c86bb

servo/components/style/Cargo.toml

@@ -15,7 +15,7 @@ doctest = false
 [features]
 gecko = ["nsstring_vendor", "rayon/unstable", "num_cpus"]
 use_bindgen = ["bindgen", "regex"]
-servo = ["serde/unstable", "serde", "serde_derive", "heapsize_derive",
+servo = ["serde/unstable", "serde", "serde_derive", "heapsize", "heapsize_derive",
          "style_traits/servo", "servo_atoms", "html5ever-atoms",
          "cssparser/heapsize", "cssparser/serde", "encoding",
          "rayon/unstable", "servo_url/servo"]
@@ -31,7 +31,7 @@ cssparser = "0.12"
 encoding = {version = "0.2", optional = true}
 euclid = "0.11"
 fnv = "1.0"
-heapsize = "0.3.0"
+heapsize = {version = "0.3.0", optional = true}
 heapsize_derive = {version = "0.1", optional = true}
 html5ever-atoms = {version = "0.2", optional = true}
 lazy_static = "0.2"

servo/components/style/gecko_bindings/sugar/refptr.rs

@@ -6,7 +6,6 @@
 
 use gecko_bindings::structs;
 use gecko_bindings::sugar::ownership::HasArcFFI;
-use heapsize::HeapSizeOf;
 use std::{mem, ptr};
 use std::marker::PhantomData;
 use std::ops::{Deref, DerefMut};
@@ -231,10 +230,6 @@ impl<T: RefCounted> Clone for RefPtr<T> {
     }
 }
 
-impl<T: RefCounted> HeapSizeOf for RefPtr<T> {
-    fn heap_size_of_children(&self) -> usize { 0 }
-}
-
 impl<T: RefCounted> PartialEq for RefPtr<T> {
     fn eq(&self, other: &Self) -> bool {
         self.ptr == other.ptr

servo/components/style/gecko_string_cache/mod.rs

@@ -10,7 +10,6 @@ use gecko_bindings::bindings::Gecko_AddRefAtom;
 use gecko_bindings::bindings::Gecko_Atomize;
 use gecko_bindings::bindings::Gecko_ReleaseAtom;
 use gecko_bindings::structs::nsIAtom;
-use heapsize::HeapSizeOf;
 use std::borrow::{Cow, Borrow};
 use std::char::{self, DecodeUtf16};
 use std::fmt::{self, Write};
@@ -237,12 +236,6 @@ impl Default for Atom {
     }
 }
 
-impl HeapSizeOf for Atom {
-    fn heap_size_of_children(&self) -> usize {
-        0
-    }
-}
-
 impl fmt::Debug for Atom {
     fn fmt(&self, w: &mut fmt::Formatter) -> fmt::Result {
         write!(w, "Gecko Atom({:p}, {})", self.0, self)

servo/components/style/lib.rs

@@ -47,7 +47,7 @@ extern crate bitflags;
 extern crate euclid;
 extern crate fnv;
 #[cfg(feature = "gecko")] #[macro_use] pub mod gecko_string_cache;
-extern crate heapsize;
+#[cfg(feature = "servo")] extern crate heapsize;
 #[cfg(feature = "servo")] #[macro_use] extern crate heapsize_derive;
 #[cfg(feature = "servo")] #[macro_use] extern crate html5ever_atoms;
 #[macro_use]