Remove dependency on heapsize_plugin (fixes #243)

Author: nox

.travis.yml

@@ -21,7 +21,7 @@ rust:
 
 script:
   - cargo test
-  - ([ $TRAVIS_RUST_VERSION != nightly ] || cargo test --features plugins)
+  - cargo test --features heapsize
 
 notifications:
   webhooks: http://build.servo.org:54856/travis

Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 
 name = "layers"
-version = "0.5.2"
+version = "0.5.3"
 authors = ["The Servo Project Developers"]
 license = "MIT/Apache-2.0"
 
 [features]
 default = []
-plugins = ["heapsize", "heapsize_plugin"]
+plugins = ["heapsize"]
 
 [dependencies]
 libc = "0.2"
@@ -21,10 +21,6 @@ servo-skia = "0.20130412.23"
 version = ">=0.2.2, <0.4"
 optional = true
 
-[dependencies.heapsize_plugin]
-version = "0.1.2"
-optional = true
-
 [target.x86_64-apple-darwin.dependencies]
 core-foundation = "0.2.0"
 cgl = "0.1"

src/color.rs

@@ -8,10 +8,12 @@
 // except according to those terms.
 
 #[derive(Copy, Clone, Debug)]
-#[cfg_attr(feature = "plugins", derive(HeapSizeOf))]
 pub struct Color {
     pub r: f32,
     pub g: f32,
     pub b: f32,
     pub a: f32,
 }
+
+#[cfg(feature = "heapsize")]
+known_heap_size!(0, Color);

src/geometry.rs

@@ -13,15 +13,17 @@
 ///
 /// This unit corresponds to the smallest addressable element of the display hardware.
 #[derive(Copy, Clone, RustcEncodable, Debug)]
-#[cfg_attr(feature = "plugins", derive(HeapSizeOf))]
 pub enum DevicePixel {}
 
+#[cfg(feature = "heapsize")]
+known_heap_size!(0, DevicePixel);
+
 /// One pixel in layer coordinate space.
 ///
 /// This unit corresponds to a "pixel" in layer coordinate space, which after scaling and
 /// transformation becomes a device pixel.
 #[derive(Copy, Clone, RustcEncodable, Debug)]
-#[cfg_attr(feature = "plugins", derive(HeapSizeOf))]
 pub enum LayerPixel {}
 
-
+#[cfg(feature = "heapsize")]
+known_heap_size!(0, LayerPixel);

src/layers.rs

@@ -22,11 +22,13 @@ use std::rc::Rc;
 use util::{project_rect_to_screen, ScreenRect};
 
 #[derive(Clone, Copy, PartialEq, PartialOrd)]
-#[cfg_attr(feature = "plugins", derive(HeapSizeOf))]
 pub struct ContentAge {
     age: usize,
 }
 
+#[cfg(feature = "heapsize")]
+known_heap_size!(0, ContentAge);
+
 impl ContentAge {
     pub fn new() -> ContentAge {
         ContentAge {
@@ -39,7 +41,6 @@ impl ContentAge {
     }
 }
 
-#[cfg_attr(feature = "plugins", derive(HeapSizeOf))]
 pub struct TransformState {
     /// Final, concatenated transform + perspective matrix for this layer
     pub final_transform: Matrix4D<f32>,
@@ -54,6 +55,9 @@ pub struct TransformState {
     pub has_transform: bool,
 }
 
+#[cfg(feature = "heapsize")]
+known_heap_size!(0, TransformState);
+
 impl TransformState {
     fn new() -> TransformState {
         TransformState {

src/lib.rs

@@ -10,15 +10,9 @@
 #![crate_name = "layers"]
 #![crate_type = "rlib"]
 
-#![cfg_attr(feature = "plugins", feature(core_intrinsics))]
-#![cfg_attr(feature = "plugins", feature(custom_attribute))]
-#![cfg_attr(feature = "plugins", feature(custom_derive))]
-#![cfg_attr(feature = "plugins", feature(plugin))]
-
-#![cfg_attr(feature = "plugins", plugin(heapsize_plugin))]
-
 extern crate euclid;
-#[cfg(feature = "plugins")]
+#[cfg(feature = "heapsize")]
+#[macro_use]
 extern crate heapsize;
 extern crate libc;
 #[macro_use]

src/rendergl.rs

@@ -26,12 +26,14 @@ use std::rc::Rc;
 use std::cmp::Ordering;
 
 #[derive(Copy, Clone, Debug)]
-#[cfg_attr(feature = "plugins", derive(HeapSizeOf))]
 pub struct ColorVertex {
     x: f32,
     y: f32,
 }
 
+#[cfg(feature = "heapsize")]
+known_heap_size!(0, ColorVertex);
+
 impl ColorVertex {
     pub fn new(point: Point2D<f32>) -> ColorVertex {
         ColorVertex {
@@ -42,14 +44,16 @@ impl ColorVertex {
 }
 
 #[derive(Copy, Clone, Debug)]
-#[cfg_attr(feature = "plugins", derive(HeapSizeOf))]
 pub struct TextureVertex {
     x: f32,
     y: f32,
     u: f32,
     v: f32,
 }
 
+#[cfg(feature = "heapsize")]
+known_heap_size!(0, TextureVertex);
+
 impl TextureVertex {
     pub fn new(point: Point2D<f32>, texture_coordinates: Point2D<f32>) -> TextureVertex {
         TextureVertex {

src/texturegl.rs

@@ -16,29 +16,35 @@ use gleam::gl;
 use gleam::gl::{GLenum, GLint, GLuint};
 
 #[derive(Copy, Clone)]
-#[cfg_attr(feature = "plugins", derive(HeapSizeOf))]
 pub enum Format {
     ARGB32Format,
     RGB24Format
 }
 
+#[cfg(feature = "heapsize")]
+known_heap_size!(0, Format);
+
 #[derive(Copy, Clone)]
-#[cfg_attr(feature = "plugins", derive(HeapSizeOf))]
 pub enum FilterMode {
     Nearest,
     Linear
 }
 
+#[cfg(feature = "heapsize")]
+known_heap_size!(0, FilterMode);
+
 /// The texture target.
 #[derive(Copy, Clone)]
-#[cfg_attr(feature = "plugins", derive(HeapSizeOf))]
 pub enum TextureTarget {
     /// TEXTURE_2D.
     TextureTarget2D,
     /// TEXTURE_RECTANGLE_ARB, with the size included.
     TextureTargetRectangle,
 }
 
+#[cfg(feature = "heapsize")]
+known_heap_size!(0, TextureTarget);
+
 impl TextureTarget {
 
     #[cfg(not(target_os = "android"))]
@@ -205,10 +211,12 @@ impl Texture {
 
 /// Whether a texture should be flipped.
 #[derive(PartialEq, Copy, Clone)]
-#[cfg_attr(feature = "plugins", derive(HeapSizeOf))]
 pub enum Flip {
     /// The texture should not be flipped.
     NoFlip,
     /// The texture should be flipped vertically.
     VerticalFlip,
 }
+
+#[cfg(feature = "heapsize")]
+known_heap_size!(0, Flip);

src/util.rs

@@ -16,12 +16,14 @@ use std::f32;
 const W_CLIPPING_PLANE: f32 = 0.00001;
 
 #[derive(Debug)]
-#[cfg_attr(feature = "plugins", derive(HeapSizeOf))]
 pub struct ScreenRect {
     pub rect: Rect<f32>,
     pub z_center: f32,
 }
 
+#[cfg(feature = "heapsize")]
+known_heap_size!(0, ScreenRect);
+
 pub fn convert_rgb32_to_rgb24(buffer: &[u8]) -> Vec<u8> {
     let mut i = 0;
     repeat(buffer.len() * 3 / 4).map(|j| {