Auto merge of #39 - servo:heapsize, r=nox

Remove heapsize and rustc_serialize support

Author: bors-servo

Cargo.toml

@@ -1,14 +1,12 @@
 [package]
 name = "app_units"
-version = "0.5.6"
+version = "0.6.0"
 authors = ["The Servo Project Developers"]
 description = "Servo app units type (Au)"
 documentation = "http://doc.servo.org/app_units/"
 repository = "https://github.com/servo/app_units"
 license = "MPL-2.0"
 
 [dependencies]
-heapsize = ">=0.3, < 0.5"
 num-traits = "0.1.32"
-rustc-serialize = "0.3"
 serde = "1.0"

src/app_unit.rs

@@ -2,9 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use heapsize::HeapSizeOf;
 use num_traits::Zero;
-use rustc_serialize::{Encodable, Encoder};
 use serde::de::{Deserialize, Deserializer};
 use serde::ser::{Serialize, Serializer};
 use std::default::Default;
@@ -24,10 +22,6 @@ pub const AU_PER_PX: i32 = 60;
 /// panics and overflows.
 pub struct Au(pub i32);
 
-impl HeapSizeOf for Au {
-    fn heap_size_of_children(&self) -> usize { 0 }
-}
-
 impl<'de> Deserialize<'de> for Au {
     fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Au, D::Error> {
         Ok(Au(try!(i32::deserialize(deserializer))).clamp())
@@ -64,12 +58,6 @@ impl Zero for Au {
 pub const MAX_AU: Au = Au((1 << 30) - 1);
 pub const MIN_AU: Au = Au(- ((1 << 30) - 1));
 
-impl Encodable for Au {
-    fn encode<S: Encoder>(&self, e: &mut S) -> Result<(), S::Error> {
-        e.emit_f64(self.to_f64_px())
-    }
-}
-
 impl fmt::Debug for Au {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "{}px", self.to_f64_px())
@@ -379,10 +367,3 @@ fn convert() {
     assert_eq!(Au::from_f64_px(6.12), Au(367));
     assert_eq!(Au::from_f64_px(6.13), Au(368));
 }
-
-#[test]
-fn heapsize() {
-    use heapsize::HeapSizeOf;
-    fn f<T: HeapSizeOf>(_: T) {}
-    f(Au::new(0));
-}

src/lib.rs

@@ -6,9 +6,7 @@
 //! originally proposed in 2002 as a standard unit of measure in Gecko.
 //! See <https://bugzilla.mozilla.org/show_bug.cgi?id=177805> for more info.
 
-extern crate heapsize;
 extern crate num_traits;
-extern crate rustc_serialize;
 extern crate serde;
 
 mod app_unit;