Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #16169 - servo:stylo-heapsize, r=emilio

Browse source 
Remove heapsize for Stylo

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

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16169)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-04-05 03:59:26 -05:00 • committed by GitHub
commit 42f58503c0
4 changed files with 3 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/style/Cargo.toml
View file

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

5
components/style/gecko_bindings/sugar/refptr.rs
View file

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

7
components/style/gecko_string_cache/mod.rs
View file

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

2
components/style/lib.rs
View file

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