Remove use of heapsize_plugin

Author: nox

.travis.yml

@@ -8,7 +8,7 @@ script:
   - cargo build --verbose
   - cargo test --verbose
   - cargo doc --verbose
-  - ([ $TRAVIS_RUST_VERSION != nightly ] || cargo test --features heap_size)
+  - cargo test --features heapsize
 
 after_success: |
   [ $TRAVIS_RUST_VERSION = nightly ] &&

Cargo.toml

@@ -19,11 +19,10 @@ tempdir = "0.3"
 [dependencies]
 encoding = "0.2"
 heapsize = {version = ">=0.1.1, <0.4.0", optional = true}
-heapsize_plugin = {version = "0.1.0", optional = true}
 matches = "0.1"
 serde = {version = ">=0.6.6, <0.8", optional = true}
 serde_macros = {version = ">=0.6.5, <0.8", optional = true}
 
 [features]
 serde-serialization = [ "serde", "serde_macros" ]
-heap_size = [ "heapsize", "heapsize_plugin" ]
+heap_size = [ "heapsize" ]

src/color.rs

@@ -10,7 +10,6 @@ use super::{Token, Parser, ToCss};
 /// A color with red, green, blue, and alpha components.
 #[derive(Clone, Copy, PartialEq, Debug)]
 #[cfg_attr(feature = "serde-serialization", derive(Deserialize, Serialize))]
-#[cfg_attr(feature = "heap_size", derive(HeapSizeOf))]
 pub struct RGBA {
     /// The red channel. Nominally in 0.0 ... 1.0.
     pub red: f32,
@@ -22,6 +21,9 @@ pub struct RGBA {
     pub alpha: f32,
 }
 
+#[cfg(feature = "heapsize")]
+known_heap_size!(0, RGBA);
+
 impl ToCss for RGBA {
     fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
         if self.alpha == 1f32 {
@@ -41,14 +43,16 @@ impl ToCss for RGBA {
 
 /// A <color> value.
 #[derive(Clone, Copy, PartialEq, Debug)]
-#[cfg_attr(feature = "heap_size", derive(HeapSizeOf))]
 pub enum Color {
     /// The 'currentColor' keyword
     CurrentColor,
     /// Everything else gets converted to RGBA during parsing
     RGBA(RGBA),
 }
 
+#[cfg(feature = "heapsize")]
+known_heap_size!(0, Color);
+
 impl ToCss for Color {
     fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
         match self {

src/lib.rs

@@ -9,9 +9,6 @@
 #![cfg_attr(feature = "serde-serialization", feature(custom_derive))]
 #![cfg_attr(feature = "serde-serialization", feature(plugin))]
 #![cfg_attr(feature = "serde-serialization", plugin(serde_macros))]
-#![cfg_attr(feature = "heap_size", feature(custom_derive))]
-#![cfg_attr(feature = "heap_size", feature(plugin))]
-#![cfg_attr(feature = "heap_size", plugin(heapsize_plugin))]
 
 /*!
 
@@ -76,7 +73,7 @@ extern crate encoding;
 #[cfg(test)] extern crate tempdir;
 #[cfg(test)] extern crate rustc_serialize;
 #[cfg(feature = "serde-serialization")] extern crate serde;
-#[cfg(feature = "heap_size")] extern crate heapsize;
+#[cfg(feature = "heapsize")] #[macro_use] extern crate heapsize;
 
 pub use tokenizer::{Token, NumericValue, PercentageValue, SourceLocation};
 pub use rules_and_declarations::{parse_important};

src/serializer.rs

@@ -314,9 +314,11 @@ impl_tocss_for_number!(u64);
 
 /// A category of token. See the `needs_separator_when_before` method.
 #[derive(Copy, Clone, Eq, PartialEq, Debug)]
-#[cfg_attr(feature = "heap_size", derive(HeapSizeOf))]
 pub struct TokenSerializationType(TokenSerializationTypeVariants);
 
+#[cfg(feature = "heapsize")]
+known_heap_size!(0, TokenSerializationType);
+
 impl TokenSerializationType {
     /// Return a value that represents the absence of a token, e.g. before the start of the input.
     pub fn nothing() -> TokenSerializationType {
@@ -363,7 +365,6 @@ impl TokenSerializationType {
 }
 
 #[derive(Copy, Clone, Eq, PartialEq, Debug)]
-#[cfg_attr(feature = "heap_size", derive(HeapSizeOf))]
 enum TokenSerializationTypeVariants {
     Nothing,
     WhiteSpace,