Auto merge of #68 - nnethercote:rm-heapsize, r=mbrubeck

Remove `heapsize` dependency.

The heapsize crate is being deprecated in favour of the malloc_size_of
crate within Servo.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-smallvec/68)
<!-- Reviewable:end -->

Author: bors-servo

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "smallvec"
-version = "0.4.4"
+version = "0.5.0"
 authors = ["Simon Sapin <[email protected]>"]
 license = "MPL-2.0"
 repository = "https://github.com/servo/rust-smallvec"
@@ -10,7 +10,6 @@ readme = "README.md"
 documentation = "http://doc.servo.org/smallvec/"
 
 [features]
-heapsizeof = ["heapsize", "std"]
 std = []
 default = ["std"]
 
@@ -19,7 +18,6 @@ name = "smallvec"
 path = "lib.rs"
 
 [dependencies]
-heapsize = { version = "0.4", optional = true }
 serde = { version = "1", optional = true }
 
 [dev_dependencies]

lib.rs

@@ -26,9 +26,6 @@ extern crate alloc;
 #[cfg(not(feature = "std"))]
 use alloc::Vec;
 
-#[cfg(feature="heapsizeof")]
-extern crate heapsize;
-
 #[cfg(feature = "serde")]
 extern crate serde;
 
@@ -48,17 +45,13 @@ use std::ptr;
 use std::slice;
 #[cfg(feature = "std")]
 use std::io;
-#[cfg(feature="heapsizeof")]
-use std::os::raw::c_void;
 #[cfg(feature = "serde")]
 use serde::ser::{Serialize, Serializer, SerializeSeq};
 #[cfg(feature = "serde")]
 use serde::de::{Deserialize, Deserializer, SeqAccess, Visitor};
 #[cfg(feature = "serde")]
 use std::marker::PhantomData;
 
-#[cfg(feature="heapsizeof")]
-use heapsize::{HeapSizeOf, heap_size_of};
 use SmallVecData::{Inline, Heap};
 
 /// Common operations implemented by both `Vec` and `SmallVec`.
@@ -688,20 +681,6 @@ impl<A: Array> SmallVec<A> where A::Item: Copy {
     }
 }
 
-#[cfg(feature="heapsizeof")]
-impl<A: Array> HeapSizeOf for SmallVec<A> where A::Item: HeapSizeOf {
-    fn heap_size_of_children(&self) -> usize {
-        match self.data {
-            Inline { .. } => 0,
-            Heap { ptr, .. } => {
-                self.iter().fold(
-                    unsafe { heap_size_of(ptr as *const c_void) },
-                    |n, elem| n + elem.heap_size_of_children())
-            },
-        }
-    }
-}
-
 impl<A: Array> ops::Deref for SmallVec<A> {
     type Target = [A::Item];
     #[inline]
@@ -1134,11 +1113,6 @@ pub mod tests {
     #[cfg(not(feature = "std"))]
     use alloc::vec::Vec;
 
-    #[cfg(feature="heapsizeof")]
-    use heapsize::HeapSizeOf;
-    #[cfg(feature="heapsizeof")]
-    use std::mem::size_of;
-
     // We heap allocate all these strings so that double frees will show up under valgrind.
 
     #[test]
@@ -1599,30 +1573,6 @@ pub mod tests {
         assert_eq!(&SmallVec::<[u32; 2]>::from_slice(&[1, 2, 3][..])[..], [1, 2, 3]);
     }
 
-    #[cfg(feature="heapsizeof")]
-    #[test]
-    fn test_heap_size_of_children() {
-        let mut vec = SmallVec::<[u32; 2]>::new();
-        assert_eq!(vec.heap_size_of_children(), 0);
-        vec.push(1);
-        vec.push(2);
-        assert_eq!(vec.heap_size_of_children(), 0);
-        vec.push(3);
-        assert_eq!(vec.heap_size_of_children(), 16);
-
-        // Now check with reserved space
-        let mut vec = SmallVec::<[u32; 2]>::new();
-        vec.reserve(10);  // Rounds up to 16
-        assert_eq!(vec.heap_size_of_children(), 64);
-
-        // Check with nested heap structures
-        let mut vec = SmallVec::<[Vec<u32>; 2]>::new();
-        vec.reserve(10);
-        vec.push(vec![2, 3, 4]);
-        assert_eq!(vec.heap_size_of_children(),
-                   vec![2, 3, 4].heap_size_of_children() + 16 * size_of::<Vec<u32>>());
-    }
-
     #[test]
     fn test_exact_size_iterator() {
         let mut vec = SmallVec::<[u32; 2]>::from(&[1, 2, 3][..]);