From 5bb4c6c8846e71c7553cb625464b06ca0fedba08 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Wed, 2 Nov 2016 18:46:15 +0100 Subject: [PATCH] Use heapsize_derive instead of heapsize_plugin --- components/canvas_traits/Cargo.toml | 2 +- components/canvas_traits/lib.rs | 6 +- components/devtools_traits/Cargo.toml | 2 +- components/devtools_traits/lib.rs | 7 +- components/gfx/Cargo.toml | 2 +- components/gfx/lib.rs | 2 +- .../gfx/platform/freetype/font_context.rs | 8 ++- components/gfx_traits/Cargo.toml | 2 +- components/gfx_traits/lib.rs | 3 +- components/layout/Cargo.toml | 2 +- components/layout/lib.rs | 3 +- components/layout_thread/Cargo.toml | 2 +- components/layout_thread/lib.rs | 3 +- components/msg/Cargo.toml | 2 +- components/msg/lib.rs | 3 +- components/net_traits/Cargo.toml | 2 +- components/net_traits/lib.rs | 4 +- components/range/Cargo.toml | 2 +- components/range/lib.rs | 5 +- components/script/Cargo.toml | 2 +- components/script/dom/bindings/js.rs | 6 ++ components/script/dom/bindings/num.rs | 7 ++ components/script/dom/validitystate.rs | 2 +- components/script/lib.rs | 3 +- components/script_layout_interface/Cargo.toml | 2 +- components/script_layout_interface/lib.rs | 3 +- components/script_traits/Cargo.toml | 2 +- components/script_traits/lib.rs | 3 +- components/servo/Cargo.lock | 69 ++++++++++++------- components/style/Cargo.toml | 4 +- components/style/lib.rs | 2 +- components/style_traits/Cargo.toml | 4 +- components/style_traits/lib.rs | 2 +- ports/cef/Cargo.lock | 69 ++++++++++++------- 34 files changed, 152 insertions(+), 90 deletions(-) diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml index bf085994f0b..8c966d3f956 100644 --- a/components/canvas_traits/Cargo.toml +++ b/components/canvas_traits/Cargo.toml @@ -14,7 +14,7 @@ azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]} cssparser = {version = "0.7", features = ["heap_size", "serde-serialization"]} euclid = "0.10.1" heapsize = "0.3.0" -heapsize_plugin = "0.1.2" +heapsize_derive = "0.1" ipc-channel = "0.5" plugins = {path = "../plugins"} serde = {version = "0.8", features = ["unstable"]} diff --git a/components/canvas_traits/lib.rs b/components/canvas_traits/lib.rs index 2024d7e14ce..ec30efe03db 100644 --- a/components/canvas_traits/lib.rs +++ b/components/canvas_traits/lib.rs @@ -8,7 +8,7 @@ #![feature(plugin)] #![feature(proc_macro)] #![feature(rustc_attrs)] -#![plugin(heapsize_plugin, plugins)] +#![plugin(plugins)] #![deny(unsafe_code)] @@ -17,10 +17,10 @@ extern crate core; extern crate cssparser; extern crate euclid; extern crate heapsize; +#[macro_use] extern crate heapsize_derive; extern crate ipc_channel; extern crate serde; -#[macro_use] -extern crate serde_derive; +#[macro_use] extern crate serde_derive; extern crate webrender_traits; use azure::azure::AzFloat; diff --git a/components/devtools_traits/Cargo.toml b/components/devtools_traits/Cargo.toml index efcefc3a119..ef37e153e44 100644 --- a/components/devtools_traits/Cargo.toml +++ b/components/devtools_traits/Cargo.toml @@ -12,7 +12,7 @@ path = "lib.rs" [dependencies] bitflags = "0.7" heapsize = "0.3.0" -heapsize_plugin = "0.1.2" +heapsize_derive = "0.1" hyper = "0.9.9" hyper_serde = "0.1.4" ipc-channel = "0.5" diff --git a/components/devtools_traits/lib.rs b/components/devtools_traits/lib.rs index 4944fd70317..7335371bca4 100644 --- a/components/devtools_traits/lib.rs +++ b/components/devtools_traits/lib.rs @@ -12,19 +12,18 @@ #![allow(non_snake_case)] #![deny(unsafe_code)] -#![feature(custom_derive, plugin, proc_macro, rustc_attrs, structural_match)] -#![plugin(heapsize_plugin)] +#![feature(proc_macro, rustc_attrs, structural_match)] #[allow(unused_extern_crates)] #[macro_use] extern crate bitflags; extern crate heapsize; +#[macro_use] extern crate heapsize_derive; extern crate hyper; extern crate ipc_channel; extern crate msg; extern crate serde; -#[macro_use] -extern crate serde_derive; +#[macro_use] extern crate serde_derive; extern crate time; extern crate url; diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index cc008dc6e87..d4fe885b994 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -20,7 +20,7 @@ fontsan = {git = "https://github.com/servo/fontsan"} gfx_traits = {path = "../gfx_traits"} harfbuzz-sys = "0.1" heapsize = "0.3.0" -heapsize_plugin = "0.1.2" +heapsize_derive = "0.1" ipc-channel = "0.5" lazy_static = "0.2" libc = "0.2" diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs index 01cb4da8689..5e01550a786 100644 --- a/components/gfx/lib.rs +++ b/components/gfx/lib.rs @@ -16,7 +16,6 @@ #![feature(structural_match)] #![feature(unique)] -#![plugin(heapsize_plugin)] #![plugin(plugins)] #![deny(unsafe_code)] @@ -55,6 +54,7 @@ extern crate gfx_traits; extern crate harfbuzz_sys as harfbuzz; extern crate heapsize; +#[macro_use] extern crate heapsize_derive; extern crate ipc_channel; #[allow(unused_extern_crates)] #[macro_use] diff --git a/components/gfx/platform/freetype/font_context.rs b/components/gfx/platform/freetype/font_context.rs index 857e55f12b4..739f1b72d5c 100644 --- a/components/gfx/platform/freetype/font_context.rs +++ b/components/gfx/platform/freetype/font_context.rs @@ -99,7 +99,7 @@ impl HeapSizeOf for FreeTypeLibraryHandle { } } -#[derive(Clone, HeapSizeOf, Debug)] +#[derive(Clone, Debug)] pub struct FontContextHandle { // WARNING: FreeTypeLibraryHandle contains raw pointers, is clonable, and also implements // `Drop`. This field needs to be Rc<> to make sure that the `drop` function is only called @@ -107,6 +107,12 @@ pub struct FontContextHandle { pub ctx: Rc, } +impl HeapSizeOf for FontContextHandle { + fn heap_size_of_children(&self) -> usize { + self.ctx.heap_size_of_children() + } +} + impl FontContextHandle { pub fn new() -> FontContextHandle { let user = Box::into_raw(box User { diff --git a/components/gfx_traits/Cargo.toml b/components/gfx_traits/Cargo.toml index 83a3845d7fc..7c51778fa81 100644 --- a/components/gfx_traits/Cargo.toml +++ b/components/gfx_traits/Cargo.toml @@ -12,7 +12,7 @@ path = "lib.rs" [dependencies] azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]} heapsize = "0.3.0" -heapsize_plugin = "0.1.2" +heapsize_derive = "0.1" plugins = {path = "../plugins"} range = {path = "../range"} rustc-serialize = "0.3" diff --git a/components/gfx_traits/lib.rs b/components/gfx_traits/lib.rs index a198a436dfb..31684954958 100644 --- a/components/gfx_traits/lib.rs +++ b/components/gfx_traits/lib.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #![feature(custom_derive, plugin, proc_macro, rustc_attrs, structural_match)] -#![plugin(heapsize_plugin, plugins)] +#![plugin(plugins)] #![crate_name = "gfx_traits"] #![crate_type = "rlib"] @@ -12,6 +12,7 @@ extern crate azure; extern crate heapsize; +#[macro_use] extern crate heapsize_derive; #[macro_use] extern crate range; extern crate rustc_serialize; diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index 917b6b82e73..338a5cf4075 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -20,7 +20,7 @@ fnv = "1.0" gfx = {path = "../gfx"} gfx_traits = {path = "../gfx_traits"} heapsize = "0.3.0" -heapsize_plugin = "0.1.2" +heapsize_derive = "0.1" ipc-channel = "0.5" libc = "0.2" log = "0.3.5" diff --git a/components/layout/lib.rs b/components/layout/lib.rs index 935a7631e23..57fd7b3e98e 100644 --- a/components/layout/lib.rs +++ b/components/layout/lib.rs @@ -8,12 +8,12 @@ #![feature(custom_derive)] #![feature(nonzero)] #![feature(plugin)] +#![feature(proc_macro)] #![feature(raw)] #![feature(step_by)] #![deny(unsafe_code)] -#![plugin(heapsize_plugin)] #![plugin(plugins)] extern crate app_units; @@ -29,6 +29,7 @@ extern crate fnv; extern crate gfx; extern crate gfx_traits; extern crate heapsize; +#[macro_use] extern crate heapsize_derive; extern crate ipc_channel; extern crate libc; #[macro_use] diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml index 368c6142980..d704b9b18c0 100644 --- a/components/layout_thread/Cargo.toml +++ b/components/layout_thread/Cargo.toml @@ -17,7 +17,7 @@ fnv = "1.0" gfx = {path = "../gfx"} gfx_traits = {path = "../gfx_traits"} heapsize = "0.3.0" -heapsize_plugin = "0.1.2" +heapsize_derive = "0.1" ipc-channel = "0.5" layout = {path = "../layout"} layout_traits = {path = "../layout_traits"} diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs index 32231f1808b..0e6d9708fcf 100644 --- a/components/layout_thread/lib.rs +++ b/components/layout_thread/lib.rs @@ -9,8 +9,8 @@ #![feature(custom_derive)] #![feature(mpsc_select)] #![feature(plugin)] +#![feature(proc_macro)] -#![plugin(heapsize_plugin)] #![plugin(plugins)] extern crate app_units; @@ -21,6 +21,7 @@ extern crate fnv; extern crate gfx; extern crate gfx_traits; extern crate heapsize; +#[macro_use] extern crate heapsize_derive; extern crate ipc_channel; #[macro_use] extern crate layout; diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml index ddc0b3e3f85..8d045a3e91f 100644 --- a/components/msg/Cargo.toml +++ b/components/msg/Cargo.toml @@ -13,7 +13,7 @@ path = "lib.rs" bitflags = "0.7" cssparser = {version = "0.7", features = ["heap_size", "serde-serialization"]} heapsize = "0.3.0" -heapsize_plugin = "0.1.2" +heapsize_derive = "0.1" plugins = {path = "../plugins"} serde = "0.8" serde_derive = "0.8" diff --git a/components/msg/lib.rs b/components/msg/lib.rs index a2cc4bbab71..788229acb64 100644 --- a/components/msg/lib.rs +++ b/components/msg/lib.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #![feature(custom_attribute, custom_derive, plugin, proc_macro, rustc_attrs, structural_match)] -#![plugin(heapsize_plugin, plugins)] +#![plugin(plugins)] #![deny(unsafe_code)] @@ -11,6 +11,7 @@ #[macro_use] extern crate bitflags; extern crate heapsize; +#[macro_use] extern crate heapsize_derive; extern crate serde; #[macro_use] extern crate serde_derive; diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml index 851b115a4c8..cf9b152d815 100644 --- a/components/net_traits/Cargo.toml +++ b/components/net_traits/Cargo.toml @@ -14,7 +14,7 @@ util = {path = "../util"} msg = {path = "../msg"} ipc-channel = "0.5" heapsize = "0.3.0" -heapsize_plugin = "0.1.2" +heapsize_derive = "0.1" hyper = "0.9.9" hyper_serde = "0.1.4" image = "0.10" diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs index aad61971fd7..b042ea94124 100644 --- a/components/net_traits/lib.rs +++ b/components/net_traits/lib.rs @@ -4,19 +4,17 @@ #![feature(box_syntax)] #![feature(custom_attribute)] -#![feature(custom_derive)] -#![feature(plugin)] #![feature(proc_macro)] #![feature(rustc_attrs)] #![feature(slice_patterns)] #![feature(step_by)] #![feature(structural_match)] -#![plugin(heapsize_plugin)] #![deny(unsafe_code)] extern crate cookie as cookie_rs; extern crate heapsize; +#[macro_use] extern crate heapsize_derive; extern crate hyper; extern crate hyper_serde; extern crate image as piston_image; diff --git a/components/range/Cargo.toml b/components/range/Cargo.toml index 9b643dda018..36c35d97fdb 100644 --- a/components/range/Cargo.toml +++ b/components/range/Cargo.toml @@ -12,7 +12,7 @@ path = "lib.rs" [dependencies] heapsize = "0.3.0" -heapsize_plugin = "0.1.2" +heapsize_derive = "0.1" num-traits = "0.1.32" rustc-serialize = "0.3" serde = "0.8" diff --git a/components/range/lib.rs b/components/range/lib.rs index c3b16ccb4e7..0451d332643 100644 --- a/components/range/lib.rs +++ b/components/range/lib.rs @@ -2,17 +2,14 @@ * 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/. */ -#![feature(custom_derive)] -#![feature(plugin)] #![feature(proc_macro)] #![feature(rustc_attrs)] #![feature(step_trait)] -#![plugin(heapsize_plugin)] - #![deny(unsafe_code)] extern crate heapsize; +#[macro_use] extern crate heapsize_derive; extern crate num_traits; extern crate rustc_serialize; extern crate serde; diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index f8f0b8f0d4b..b65b1da3eb4 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -35,7 +35,7 @@ euclid = "0.10.1" fnv = "1.0" gfx_traits = {path = "../gfx_traits"} heapsize = "0.3.6" -heapsize_plugin = "0.1.2" +heapsize_derive = "0.1" html5ever = {version = "0.5.1", features = ["heap_size", "unstable"]} hyper = "0.9.9" hyper_serde = "0.1.4" diff --git a/components/script/dom/bindings/js.rs b/components/script/dom/bindings/js.rs index 779cb62d634..11aed4be9af 100644 --- a/components/script/dom/bindings/js.rs +++ b/components/script/dom/bindings/js.rs @@ -625,6 +625,12 @@ impl Deref for Root { } } +impl HeapSizeOf for Root { + fn heap_size_of_children(&self) -> usize { + (**self).heap_size_of_children() + } +} + impl PartialEq for Root { fn eq(&self, other: &Self) -> bool { self.ptr == other.ptr diff --git a/components/script/dom/bindings/num.rs b/components/script/dom/bindings/num.rs index fde24d08421..03b0c743f9f 100644 --- a/components/script/dom/bindings/num.rs +++ b/components/script/dom/bindings/num.rs @@ -4,6 +4,7 @@ //! The `Finite` struct. +use heapsize::HeapSizeOf; use num_traits::Float; use std::ops::Deref; @@ -38,3 +39,9 @@ impl Deref for Finite { value } } + +impl HeapSizeOf for Finite { + fn heap_size_of_children(&self) -> usize { + (**self).heap_size_of_children() + } +} diff --git a/components/script/dom/validitystate.rs b/components/script/dom/validitystate.rs index 938320b7254..21740b16bfc 100644 --- a/components/script/dom/validitystate.rs +++ b/components/script/dom/validitystate.rs @@ -11,7 +11,7 @@ use dom::window::Window; // https://html.spec.whatwg.org/multipage/#validity-states #[derive_JSTraceable] -#[derive_HeapSizeOf] +#[derive(HeapSizeOf)] pub enum ValidityStatus { ValueMissing, TypeMismatch, diff --git a/components/script/lib.rs b/components/script/lib.rs index f2227fc363a..96e9cb29731 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -14,6 +14,7 @@ #![feature(on_unimplemented)] #![feature(optin_builtin_traits)] #![feature(plugin)] +#![feature(proc_macro)] #![feature(slice_patterns)] #![feature(stmt_expr_attributes)] #![feature(try_from)] @@ -24,7 +25,6 @@ #![doc = "The script crate contains all matters DOM."] -#![plugin(heapsize_plugin)] #![plugin(phf_macros)] #![plugin(plugins)] @@ -46,6 +46,7 @@ extern crate euclid; extern crate fnv; extern crate gfx_traits; extern crate heapsize; +#[macro_use] extern crate heapsize_derive; extern crate html5ever; extern crate hyper; extern crate hyper_serde; diff --git a/components/script_layout_interface/Cargo.toml b/components/script_layout_interface/Cargo.toml index 452972bd3dd..ba5a7bd7449 100644 --- a/components/script_layout_interface/Cargo.toml +++ b/components/script_layout_interface/Cargo.toml @@ -17,7 +17,7 @@ cssparser = {version = "0.7", features = ["heap_size", "serde-serialization"]} euclid = "0.10.1" gfx_traits = {path = "../gfx_traits"} heapsize = "0.3.0" -heapsize_plugin = "0.1.2" +heapsize_derive = "0.1" ipc-channel = "0.5" libc = "0.2" log = "0.3.5" diff --git a/components/script_layout_interface/lib.rs b/components/script_layout_interface/lib.rs index ebef2d20271..70ffcf15524 100644 --- a/components/script_layout_interface/lib.rs +++ b/components/script_layout_interface/lib.rs @@ -12,7 +12,7 @@ #![feature(custom_derive)] #![feature(nonzero)] #![feature(plugin)] -#![plugin(heapsize_plugin)] +#![feature(proc_macro)] #![plugin(plugins)] extern crate app_units; @@ -25,6 +25,7 @@ extern crate cssparser; extern crate euclid; extern crate gfx_traits; extern crate heapsize; +#[macro_use] extern crate heapsize_derive; extern crate ipc_channel; extern crate libc; #[macro_use] diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml index fede5c350dc..2b901f7c73d 100644 --- a/components/script_traits/Cargo.toml +++ b/components/script_traits/Cargo.toml @@ -17,7 +17,7 @@ devtools_traits = {path = "../devtools_traits"} euclid = "0.10.1" gfx_traits = {path = "../gfx_traits"} heapsize = "0.3.0" -heapsize_plugin = "0.1.2" +heapsize_derive = "0.1" hyper = "0.9.9" hyper_serde = "0.1.4" ipc-channel = "0.5" diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index 62b6ef55ec5..e1edae89d65 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -7,7 +7,7 @@ //! to depend on script. #![feature(custom_derive, plugin, proc_macro, rustc_attrs, structural_match)] -#![plugin(heapsize_plugin, plugins)] +#![plugin(plugins)] #![deny(missing_docs)] #![deny(unsafe_code)] @@ -17,6 +17,7 @@ extern crate devtools_traits; extern crate euclid; extern crate gfx_traits; extern crate heapsize; +#[macro_use] extern crate heapsize_derive; extern crate hyper; extern crate hyper_serde; extern crate ipc_channel; diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index ba9d802e5c2..6fb073b242e 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -109,8 +109,8 @@ dependencies = [ [[package]] name = "azure" -version = "0.9.0" -source = "git+https://github.com/servo/rust-azure#4890bf0b438cbeff4cd269441f4db19a413024ca" +version = "0.9.1" +source = "git+https://github.com/servo/rust-azure#d817e7e1b1af6896f778d0cc0693e0a1573f3a48" dependencies = [ "cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -119,7 +119,7 @@ dependencies = [ "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -222,7 +222,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "canvas" version = "0.0.1" dependencies = [ - "azure 0.9.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.1 (git+https://github.com/servo/rust-azure)", "canvas_traits 0.0.1", "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", @@ -239,11 +239,11 @@ dependencies = [ name = "canvas_traits" version = "0.0.1" dependencies = [ - "azure 0.9.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.1 (git+https://github.com/servo/rust-azure)", "cssparser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -521,7 +521,7 @@ version = "0.0.1" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -775,7 +775,7 @@ name = "gfx" version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.9.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.1 (git+https://github.com/servo/rust-azure)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -789,7 +789,7 @@ dependencies = [ "gfx_traits 0.0.1", "harfbuzz-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -831,9 +831,9 @@ dependencies = [ name = "gfx_traits" version = "0.0.1" dependencies = [ - "azure 0.9.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.1 (git+https://github.com/servo/rust-azure)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "range 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -928,6 +928,16 @@ dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "heapsize_derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "quote 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "synstructure 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "heapsize_plugin" version = "0.1.6" @@ -1133,7 +1143,7 @@ name = "layout" version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.9.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.1 (git+https://github.com/servo/rust-azure)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "cssparser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1142,7 +1152,7 @@ dependencies = [ "gfx 0.0.1", "gfx_traits 0.0.1", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1181,13 +1191,13 @@ name = "layout_thread" version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.9.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.1 (git+https://github.com/servo/rust-azure)", "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gfx_traits 0.0.1", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "layout 0.0.1", "layout_traits 0.0.1", @@ -1386,7 +1396,7 @@ dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1472,7 +1482,7 @@ version = "0.0.1" dependencies = [ "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1873,7 +1883,7 @@ name = "range" version = "0.0.1" dependencies = [ "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1954,7 +1964,7 @@ dependencies = [ "fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2008,7 +2018,7 @@ dependencies = [ "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2045,7 +2055,7 @@ dependencies = [ "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2281,7 +2291,7 @@ dependencies = [ "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2336,7 +2346,7 @@ dependencies = [ "cssparser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2351,6 +2361,15 @@ dependencies = [ "unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "synstructure" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "quote 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "target_build_utils" version = "0.1.1" @@ -2805,7 +2824,7 @@ dependencies = [ "checksum app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "636ee56f12e31dbc11dc0a1ac6004f08b04e6e6595963716fc8130e90d4e04cf" "checksum arrayvec 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "80a137392e2e92ce7387c063d98a11f0d47115426c5f8759657af3c7b385c860" "checksum audio-video-metadata 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "03da2550cb89fe3faf218c179261c26cf7891c4234707c15f5d09ebb32ae2400" -"checksum azure 0.9.0 (git+https://github.com/servo/rust-azure)" = "" +"checksum azure 0.9.1 (git+https://github.com/servo/rust-azure)" = "" "checksum backtrace 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "346d7644f0b5f9bc73082d3b2236b69a05fd35cce0cfa3724e184e6a5c9e2a2f" "checksum backtrace-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ff73785ae8e06bb4a7b09e09f06d7434f9748b86d2f67bdf334b603354497e08" "checksum bincode 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9fbba641f73d3e74a5431d4a6d9e42a70bcce76d466d796c852ba1db31ba41bc" @@ -2874,6 +2893,7 @@ dependencies = [ "checksum glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b280007fa9c7442cfd1e0b1addb8d1a59240267110e8705f8f7e2c7bfb7e2f72" "checksum harfbuzz-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6b76113246f5c089dcf272cf89c3f61168a4d77b50ec5b2c1fab8c628c9ea762" "checksum heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8c80e194758495a9109566134dc06e42ea0423987d6ceca016edaa90381b3549" +"checksum heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "35abd70c0f2d6260b973ea908d7e4e3da729fc2acf18def91f034a2a4f824ff8" "checksum heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c9a70a1ef0122b54e0553f1d960b686c40d33a7953bc63029509a7649c8ee2c4" "checksum heartbeats-simple 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "78c0810722eacd0bdd3f1f691524bd9900bf8fed1947f6b883c10ddecd2560b1" "checksum heartbeats-simple-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53c4b67617665d7f4172f381f9843c1bec6a4fccc9a9226529e5b1be40dc1301" @@ -2982,6 +3002,7 @@ dependencies = [ "checksum solicit 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "172382bac9424588d7840732b250faeeef88942e37b6e35317dce98cafdd75b2" "checksum string_cache 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)" = "f585562982abf1301fa97bd2226a3c4c5712b8beb9bcd16ed72b5e96810f8657" "checksum syn 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96fed4e825d615b0ffd74dabb1dc4c5a078ab44e2c8004798f01510edf6cf515" +"checksum synstructure 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c93b5595e44343867746223dd8de40c15e53e89f5fb252e3d20e0187a698647c" "checksum target_build_utils 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a1be18d4d908e4e5697908de04fdd5099505463fc8eaf1ceb8133ae486936aa" "checksum tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "87974a6f5c1dfb344d733055601650059a3363de2a6104819293baff662132d6" "checksum tempfile 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9270837a93bad1b1dac18fe67e786b3c960513af86231f6f4f57fddd594ff0c8" diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index a7807220263..caa79f56d93 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -14,7 +14,7 @@ doctest = false [features] gecko = ["nsstring_vendor"] -servo = ["serde/unstable", "serde", "serde_derive", "heapsize_plugin", +servo = ["serde/unstable", "serde", "serde_derive", "heapsize_derive", "style_traits/servo", "app_units/plugins", "string_cache", "cssparser/heap_size", "cssparser/serde-serialization", "url/heap_size", "plugins", "parking_lot/nightly"] @@ -30,7 +30,7 @@ encoding = "0.2" euclid = "0.10.1" fnv = "1.0" heapsize = "0.3.0" -heapsize_plugin = {version = "0.1.2", optional = true} +heapsize_derive = {version = "0.1", optional = true} lazy_static = "0.2" log = "0.3.5" libc = "0.2" diff --git a/components/style/lib.rs b/components/style/lib.rs index 53d8102b6fa..90a45dbac4d 100644 --- a/components/style/lib.rs +++ b/components/style/lib.rs @@ -29,7 +29,6 @@ #![cfg_attr(feature = "servo", feature(proc_macro))] #![cfg_attr(feature = "servo", feature(rustc_attrs))] #![cfg_attr(feature = "servo", feature(structural_match))] -#![cfg_attr(feature = "servo", plugin(heapsize_plugin))] #![cfg_attr(feature = "servo", plugin(plugins))] #![deny(warnings)] @@ -59,6 +58,7 @@ extern crate encoding; extern crate euclid; extern crate fnv; extern crate heapsize; +#[cfg(feature = "servo")] #[macro_use] extern crate heapsize_derive; #[allow(unused_extern_crates)] #[macro_use] extern crate lazy_static; diff --git a/components/style_traits/Cargo.toml b/components/style_traits/Cargo.toml index 9064faaa457..af4c9314381 100644 --- a/components/style_traits/Cargo.toml +++ b/components/style_traits/Cargo.toml @@ -10,7 +10,7 @@ name = "style_traits" path = "lib.rs" [features] -servo = ["heapsize", "heapsize_plugin", "serde", "serde_derive", +servo = ["heapsize", "heapsize_derive", "serde", "serde_derive", "cssparser/heap_size", "cssparser/serde-serialization"] [dependencies] @@ -18,7 +18,7 @@ app_units = "0.3" cssparser = "0.7" euclid = "0.10.1" heapsize = {version = "0.3.0", optional = true} -heapsize_plugin = {version = "0.1.2", optional = true} +heapsize_derive = {version = "0.1", optional = true} rustc-serialize = "0.3" serde = {version = "0.8", optional = true} serde_derive = {version = "0.8", optional = true} diff --git a/components/style_traits/lib.rs b/components/style_traits/lib.rs index 449aca96ee3..c6a1d574a90 100644 --- a/components/style_traits/lib.rs +++ b/components/style_traits/lib.rs @@ -16,13 +16,13 @@ #![cfg_attr(feature = "servo", feature(proc_macro))] #![cfg_attr(feature = "servo", feature(rustc_attrs))] #![cfg_attr(feature = "servo", feature(structural_match))] -#![cfg_attr(feature = "servo", plugin(heapsize_plugin))] extern crate app_units; #[macro_use] extern crate cssparser; extern crate euclid; #[cfg(feature = "servo")] extern crate heapsize; +#[cfg(feature = "servo")] #[macro_use] extern crate heapsize_derive; extern crate rustc_serialize; #[cfg(feature = "servo")] extern crate serde; #[cfg(feature = "servo")] #[macro_use] extern crate serde_derive; diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 637d8291e7e..9d2dc3a4454 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -82,8 +82,8 @@ dependencies = [ [[package]] name = "azure" -version = "0.9.0" -source = "git+https://github.com/servo/rust-azure#4890bf0b438cbeff4cd269441f4db19a413024ca" +version = "0.9.1" +source = "git+https://github.com/servo/rust-azure#d817e7e1b1af6896f778d0cc0693e0a1573f3a48" dependencies = [ "cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -92,7 +92,7 @@ dependencies = [ "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -195,7 +195,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "canvas" version = "0.0.1" dependencies = [ - "azure 0.9.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.1 (git+https://github.com/servo/rust-azure)", "canvas_traits 0.0.1", "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", @@ -212,11 +212,11 @@ dependencies = [ name = "canvas_traits" version = "0.0.1" dependencies = [ - "azure 0.9.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.1 (git+https://github.com/servo/rust-azure)", "cssparser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -478,7 +478,7 @@ version = "0.0.1" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -691,7 +691,7 @@ name = "gfx" version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.9.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.1 (git+https://github.com/servo/rust-azure)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -705,7 +705,7 @@ dependencies = [ "gfx_traits 0.0.1", "harfbuzz-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -738,9 +738,9 @@ dependencies = [ name = "gfx_traits" version = "0.0.1" dependencies = [ - "azure 0.9.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.1 (git+https://github.com/servo/rust-azure)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "range 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -835,6 +835,16 @@ dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "heapsize_derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "quote 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "synstructure 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "heapsize_plugin" version = "0.1.6" @@ -1040,7 +1050,7 @@ name = "layout" version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.9.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.1 (git+https://github.com/servo/rust-azure)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "cssparser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1049,7 +1059,7 @@ dependencies = [ "gfx 0.0.1", "gfx_traits 0.0.1", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1081,13 +1091,13 @@ name = "layout_thread" version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.9.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.1 (git+https://github.com/servo/rust-azure)", "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gfx_traits 0.0.1", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "layout 0.0.1", "layout_traits 0.0.1", @@ -1286,7 +1296,7 @@ dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1350,7 +1360,7 @@ version = "0.0.1" dependencies = [ "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1724,7 +1734,7 @@ name = "range" version = "0.0.1" dependencies = [ "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1805,7 +1815,7 @@ dependencies = [ "fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1859,7 +1869,7 @@ dependencies = [ "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1886,7 +1896,7 @@ dependencies = [ "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2164,7 +2174,7 @@ dependencies = [ "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2201,7 +2211,7 @@ dependencies = [ "cssparser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2216,6 +2226,15 @@ dependencies = [ "unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "synstructure" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "quote 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "target_build_utils" version = "0.1.1" @@ -2663,7 +2682,7 @@ dependencies = [ "checksum app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "636ee56f12e31dbc11dc0a1ac6004f08b04e6e6595963716fc8130e90d4e04cf" "checksum arrayvec 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "80a137392e2e92ce7387c063d98a11f0d47115426c5f8759657af3c7b385c860" "checksum audio-video-metadata 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "03da2550cb89fe3faf218c179261c26cf7891c4234707c15f5d09ebb32ae2400" -"checksum azure 0.9.0 (git+https://github.com/servo/rust-azure)" = "" +"checksum azure 0.9.1 (git+https://github.com/servo/rust-azure)" = "" "checksum backtrace 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "346d7644f0b5f9bc73082d3b2236b69a05fd35cce0cfa3724e184e6a5c9e2a2f" "checksum backtrace-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ff73785ae8e06bb4a7b09e09f06d7434f9748b86d2f67bdf334b603354497e08" "checksum bincode 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9fbba641f73d3e74a5431d4a6d9e42a70bcce76d466d796c852ba1db31ba41bc" @@ -2726,6 +2745,7 @@ dependencies = [ "checksum glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b280007fa9c7442cfd1e0b1addb8d1a59240267110e8705f8f7e2c7bfb7e2f72" "checksum harfbuzz-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6b76113246f5c089dcf272cf89c3f61168a4d77b50ec5b2c1fab8c628c9ea762" "checksum heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8c80e194758495a9109566134dc06e42ea0423987d6ceca016edaa90381b3549" +"checksum heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "35abd70c0f2d6260b973ea908d7e4e3da729fc2acf18def91f034a2a4f824ff8" "checksum heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c9a70a1ef0122b54e0553f1d960b686c40d33a7953bc63029509a7649c8ee2c4" "checksum heartbeats-simple 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "78c0810722eacd0bdd3f1f691524bd9900bf8fed1947f6b883c10ddecd2560b1" "checksum heartbeats-simple-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53c4b67617665d7f4172f381f9843c1bec6a4fccc9a9226529e5b1be40dc1301" @@ -2834,6 +2854,7 @@ dependencies = [ "checksum solicit 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "172382bac9424588d7840732b250faeeef88942e37b6e35317dce98cafdd75b2" "checksum string_cache 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)" = "f585562982abf1301fa97bd2226a3c4c5712b8beb9bcd16ed72b5e96810f8657" "checksum syn 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96fed4e825d615b0ffd74dabb1dc4c5a078ab44e2c8004798f01510edf6cf515" +"checksum synstructure 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c93b5595e44343867746223dd8de40c15e53e89f5fb252e3d20e0187a698647c" "checksum target_build_utils 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a1be18d4d908e4e5697908de04fdd5099505463fc8eaf1ceb8133ae486936aa" "checksum tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "87974a6f5c1dfb344d733055601650059a3363de2a6104819293baff662132d6" "checksum tempfile 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9270837a93bad1b1dac18fe67e786b3c960513af86231f6f4f57fddd594ff0c8"