diff --git a/components/malloc_size_of/lib.rs b/components/malloc_size_of/lib.rs index 95d3bd6335b..413942e4322 100644 --- a/components/malloc_size_of/lib.rs +++ b/components/malloc_size_of/lib.rs @@ -64,8 +64,6 @@ extern crate servo_arc; extern crate smallbitvec; extern crate smallvec; -use servo_arc::Arc; -use smallvec::{Array, SmallVec}; use std::hash::{BuildHasher, Hash}; use std::ops::Range; use std::os::raw::c_void; @@ -244,7 +242,7 @@ impl MallocSizeOf for Vec { } } -impl MallocShallowSizeOf for SmallVec { +impl MallocShallowSizeOf for smallvec::SmallVec { fn shallow_size_of(&self, ops: &mut MallocSizeOfOps) -> usize { if self.spilled() { unsafe { ops.malloc_size_of(self.as_ptr()) } @@ -254,8 +252,8 @@ impl MallocShallowSizeOf for SmallVec { } } -impl MallocSizeOf for SmallVec - where A: Array, +impl MallocSizeOf for smallvec::SmallVec + where A: smallvec::Array, A::Item: MallocSizeOf { fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize { @@ -348,19 +346,19 @@ impl MallocSizeOf for hashglobe::hash_map::HashMap //impl !MallocSizeOf for Arc { } //impl !MallocShallowSizeOf for Arc { } -impl MallocUnconditionalShallowSizeOf for Arc { +impl MallocUnconditionalShallowSizeOf for servo_arc::Arc { fn unconditional_shallow_size_of(&self, ops: &mut MallocSizeOfOps) -> usize { unsafe { ops.malloc_size_of(self.heap_ptr()) } } } -impl MallocUnconditionalSizeOf for Arc { +impl MallocUnconditionalSizeOf for servo_arc::Arc { fn unconditional_size_of(&self, ops: &mut MallocSizeOfOps) -> usize { self.unconditional_shallow_size_of(ops) + (**self).size_of(ops) } } -impl MallocConditionalShallowSizeOf for Arc { +impl MallocConditionalShallowSizeOf for servo_arc::Arc { fn conditional_shallow_size_of(&self, ops: &mut MallocSizeOfOps) -> usize { if ops.have_seen_ptr(self.heap_ptr()) { 0 @@ -370,7 +368,7 @@ impl MallocConditionalShallowSizeOf for Arc { } } -impl MallocConditionalSizeOf for Arc { +impl MallocConditionalSizeOf for servo_arc::Arc { fn conditional_size_of(&self, ops: &mut MallocSizeOfOps) -> usize { if ops.have_seen_ptr(self.heap_ptr()) { 0