From b640a83725a2b2a6c93be44107e49f4e99e7d59f Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Wed, 2 Nov 2016 17:55:34 +0100 Subject: [PATCH 1/4] Update Rust to 1.14.0-nightly (7c69b0d5a 2016-11-01) --- components/servo/Cargo.lock | 182 +++++++++++++++++++----------------- ports/cef/Cargo.lock | 182 +++++++++++++++++++----------------- ports/geckolib/Cargo.lock | 8 +- rust-nightly-date | 2 +- 4 files changed, 199 insertions(+), 175 deletions(-) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 7c63632de1e..ba9d802e5c2 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -85,7 +85,7 @@ dependencies = [ "heapsize 0.3.7 (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.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -121,8 +121,8 @@ 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)", "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-freetype-sys 4.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "servo-skia 0.20130412.24 (registry+https://github.com/rust-lang/crates.io-index)", @@ -160,7 +160,7 @@ dependencies = [ "byteorder 0.5.3 (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.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -246,8 +246,8 @@ dependencies = [ "heapsize_plugin 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)", "plugins 0.0.1", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "webrender_traits 0.8.0 (git+https://github.com/servo/webrender)", ] @@ -330,8 +330,8 @@ dependencies = [ "plugins 0.0.1", "profile_traits 0.0.1", "script_traits 0.0.1", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "style_traits 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -363,8 +363,8 @@ dependencies = [ "profile_traits 0.0.1", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "style_traits 0.0.1", "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -416,7 +416,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation 0.2.2 (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.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -442,7 +442,7 @@ dependencies = [ "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -508,8 +508,8 @@ dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "plugins 0.0.1", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -526,8 +526,8 @@ dependencies = [ "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)", "msg 0.0.1", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -678,7 +678,7 @@ dependencies = [ "log 0.3.6 (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.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -801,8 +801,8 @@ dependencies = [ "plugins 0.0.1", "range 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "servo-fontconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "simd 0.1.1 (git+https://github.com/huonw/simd)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -837,8 +837,8 @@ dependencies = [ "plugins 0.0.1", "range 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", ] [[package]] @@ -969,8 +969,8 @@ dependencies = [ "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1011,7 +1011,7 @@ dependencies = [ "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1077,7 +1077,7 @@ dependencies = [ "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)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1157,7 +1157,7 @@ dependencies = [ "script_layout_interface 0.0.1", "script_traits 0.0.1", "selectors 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", @@ -1202,7 +1202,7 @@ dependencies = [ "script_layout_interface 0.0.1", "script_traits 0.0.1", "selectors 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1334,7 +1334,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1343,8 +1343,8 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "mime 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1388,8 +1388,8 @@ 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)", "plugins 0.0.1", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "webrender_traits 0.8.0 (git+https://github.com/servo/webrender)", ] @@ -1481,8 +1481,8 @@ dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "num-traits 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1595,7 +1595,7 @@ dependencies = [ "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1716,42 +1716,42 @@ dependencies = [ [[package]] name = "phf" -version = "0.7.18" +version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_shared 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_codegen" -version = "0.7.18" +version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_generator 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_generator" -version = "0.7.18" +version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_shared 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_macros" -version = "0.7.18" +version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_generator 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_shared" -version = "0.7.18" +version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1794,6 +1794,15 @@ dependencies = [ "num-iter 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "post-expansion" +version = "0.1.0" +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 = "profile" version = "0.0.1" @@ -1805,8 +1814,8 @@ dependencies = [ "plugins 0.0.1", "profile_traits 0.0.1", "regex 0.1.76 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "task_info 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1830,8 +1839,8 @@ dependencies = [ "energymon 0.2.0 (git+https://github.com/energymon/energymon-rust.git)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "signpost 0.1.0 (git+https://github.com/pcwalton/signpost.git)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1867,8 +1876,8 @@ dependencies = [ "heapsize_plugin 0.1.6 (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.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", ] [[package]] @@ -1962,8 +1971,8 @@ dependencies = [ "offscreen_gl_context 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "open 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_macros 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_macros 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1974,7 +1983,7 @@ dependencies = [ "script_layout_interface 0.0.1", "script_traits 0.0.1", "selectors 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", @@ -2047,8 +2056,8 @@ dependencies = [ "plugins 0.0.1", "profile_traits 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "style_traits 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2072,14 +2081,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "0.8.11" +version = "0.8.17" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde_codegen" -version = "0.8.12" +version = "0.8.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "post-expansion 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_codegen_internals 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2095,10 +2105,11 @@ dependencies = [ [[package]] name = "serde_derive" -version = "0.8.12" +version = "0.8.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde_codegen 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)", + "post-expansion 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_codegen 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2109,7 +2120,7 @@ dependencies = [ "dtoa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 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)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2252,9 +2263,9 @@ dependencies = [ "debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_generator 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2287,8 +2298,8 @@ dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", @@ -2327,8 +2338,8 @@ 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)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", ] [[package]] @@ -2495,7 +2506,7 @@ dependencies = [ "idna 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (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.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2534,8 +2545,8 @@ dependencies = [ "num_cpus 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "xdg 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2553,7 +2564,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2695,8 +2706,8 @@ dependencies = [ "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "offscreen_gl_context 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", ] [[package]] @@ -2778,8 +2789,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2929,14 +2940,15 @@ dependencies = [ "checksum owning_ref 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8d91377085359426407a287ab16884a0111ba473aa6844ff01d4ec20ce3d75e7" "checksum parking_lot 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3562f3de7bdff194212be82366abf5c6565aff8a433b71c53c63d0e7c9913878" "checksum parking_lot_core 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "06f24c980718110494e9cfb7db7438895c3f54505101bb6170329d5e43a53f64" -"checksum phf 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "971dd94df0728890a6fd7cf01b61e3f1fc84acb308175d196a9ceb2aa0e04b90" -"checksum phf_codegen 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "29fa7fa119b1dd493cc17d69052281ad38767c6e5f6f29263bbd57027aee7f71" -"checksum phf_generator 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "e3497bdd90ab6e6f9295d4877ac89b74dd0635304b9c89a6677f17d87bb5ef8d" -"checksum phf_macros 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "8afd16b67d77b27647f1c0e49457d814cc0e48dad567b3808d783cad7c0eecaa" -"checksum phf_shared 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "69668cdb43ef62e348ec04e4acea0ba200f9945230523fb1f1c1f462f27a8e2b" +"checksum phf 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)" = "95cb41511b13e592110b5c8323c1d489513b6db919148f909b8b804be73a74b5" +"checksum phf_codegen 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)" = "8b74506ea0ea5f6adbef815c1e964daa2d395e7c29b7196d390a67a31fa2a020" +"checksum phf_generator 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)" = "d5e1d4b224dfc609b025ea389e6eb9b850ae5814272880d7d75d71acc3d57c88" +"checksum phf_macros 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)" = "4bbc5912dc544d28df8e58ed9a132c13701758f0a96c8bd08ecc1f23eea27358" +"checksum phf_shared 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)" = "9f3d84458c4040eb4b9e626cb551a2dc46d92ea96b1c30331aa9fce9abd2c438" "checksum pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8cee804ecc7eaf201a4a207241472cc870e825206f6c031e3ee2a72fa425f2fa" "checksum pnacl-build-helper 1.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "61c9231d31aea845007443d62fcbb58bb6949ab9c18081ee1e09920e0cf1118b" "checksum png 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "06208e2ee243e3118a55dda9318f821f206d8563fb8d4df258767f8e62bb0997" +"checksum post-expansion 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "31a834a6060acaef74a8d878f6ca37a2b86fefe042bbfe70689ba587e42526f9" "checksum quickersort 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e952ea7699262481636004bc4ab8afaccf2bc13f91b79d1aee6617bd8fc39651" "checksum quote 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a5071e94480b788e482dd13592c7221b75da33717fd0fd74aee76a01c40b35b" "checksum rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "2791d88c6defac799c3f20d74f094ca33b9332612d9aef9078519c82e4fe04a5" @@ -2950,10 +2962,10 @@ dependencies = [ "checksum scoped_threadpool 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "3ef399c8893e8cb7aa9696e895427fab3a6bf265977bb96e126f24ddd2cda85a" "checksum selectors 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f8d3498861f4486e7e1d5c56eabf2b0e461f92bcbf45a3ac30cae0f3d5cdd0" "checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac" -"checksum serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "15db662ce4b837aac5731c52fe732d84a00f909763236289587cb7ca6985f6d8" -"checksum serde_codegen 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b64ecfe57712501e861b303982b549cfd56aed0ebf58823b36093d1807d69b" +"checksum serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)" = "784e249221c84265caeb1e2fe48aeada86f67f5acb151bd3903c4585969e43f6" +"checksum serde_codegen 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c3b932a3bb4d729e39aa04cc5e2f2ac70ba239a5a151d2dc9a1956fd6a2f7c15" "checksum serde_codegen_internals 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "318f7e77aa5187391d74aaf4553d2189f56b0ce25e963414c951b97877ffdcec" -"checksum serde_derive 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)" = "2c7c2b01e85ca1330ba408325f6e85b8b4bf980320b0bd3bc366510e457c443f" +"checksum serde_derive 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c6a73f0e5fc193668afa2a714bf8397063af46e6c8df72686e53fbac15b2e38c" "checksum serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0e10f8a9d94b06cf5d3bef66475f04c8ff90950f1be7004c357ff9472ccbaebc" "checksum servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "21069a884c33fe6ee596975e1f3849ed88c4ec857fbaf11d33672d8ebe051217" "checksum servo-fontconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "93f799b649b4a2bf362398910eca35240704c7e765e780349b2bb1070d892262" diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index b623afc1654..637d8291e7e 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -58,7 +58,7 @@ dependencies = [ "heapsize 0.3.7 (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.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -94,8 +94,8 @@ 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)", "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-freetype-sys 4.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "servo-skia 0.20130412.24 (registry+https://github.com/rust-lang/crates.io-index)", @@ -133,7 +133,7 @@ dependencies = [ "byteorder 0.5.3 (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.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -219,8 +219,8 @@ dependencies = [ "heapsize_plugin 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)", "plugins 0.0.1", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "webrender_traits 0.8.0 (git+https://github.com/servo/webrender)", ] @@ -287,8 +287,8 @@ dependencies = [ "plugins 0.0.1", "profile_traits 0.0.1", "script_traits 0.0.1", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "style_traits 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -320,8 +320,8 @@ dependencies = [ "profile_traits 0.0.1", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "style_traits 0.0.1", "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -373,7 +373,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation 0.2.2 (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.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -399,7 +399,7 @@ dependencies = [ "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -465,8 +465,8 @@ dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "plugins 0.0.1", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -483,8 +483,8 @@ dependencies = [ "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)", "msg 0.0.1", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -594,7 +594,7 @@ dependencies = [ "log 0.3.6 (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.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -717,8 +717,8 @@ dependencies = [ "plugins 0.0.1", "range 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "servo-fontconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "simd 0.1.1 (git+https://github.com/huonw/simd)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -744,8 +744,8 @@ dependencies = [ "plugins 0.0.1", "range 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", ] [[package]] @@ -876,8 +876,8 @@ dependencies = [ "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -918,7 +918,7 @@ dependencies = [ "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -984,7 +984,7 @@ dependencies = [ "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)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1064,7 +1064,7 @@ dependencies = [ "script_layout_interface 0.0.1", "script_traits 0.0.1", "selectors 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", @@ -1102,7 +1102,7 @@ dependencies = [ "script_layout_interface 0.0.1", "script_traits 0.0.1", "selectors 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1234,7 +1234,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1243,8 +1243,8 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "mime 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1288,8 +1288,8 @@ 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)", "plugins 0.0.1", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "webrender_traits 0.8.0 (git+https://github.com/servo/webrender)", ] @@ -1359,8 +1359,8 @@ dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "num-traits 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1466,7 +1466,7 @@ dependencies = [ "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1587,42 +1587,42 @@ dependencies = [ [[package]] name = "phf" -version = "0.7.18" +version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_shared 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_codegen" -version = "0.7.18" +version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_generator 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_generator" -version = "0.7.18" +version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_shared 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_macros" -version = "0.7.18" +version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_generator 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_shared" -version = "0.7.18" +version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1656,6 +1656,15 @@ dependencies = [ "num-iter 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "post-expansion" +version = "0.1.0" +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 = "profile" version = "0.0.1" @@ -1667,8 +1676,8 @@ dependencies = [ "plugins 0.0.1", "profile_traits 0.0.1", "regex 0.1.76 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "task_info 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1681,8 +1690,8 @@ version = "0.0.1" dependencies = [ "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "signpost 0.1.0 (git+https://github.com/pcwalton/signpost.git)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1718,8 +1727,8 @@ dependencies = [ "heapsize_plugin 0.1.6 (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.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", ] [[package]] @@ -1813,8 +1822,8 @@ dependencies = [ "offscreen_gl_context 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "open 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_macros 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_macros 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1825,7 +1834,7 @@ dependencies = [ "script_layout_interface 0.0.1", "script_traits 0.0.1", "selectors 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", @@ -1888,8 +1897,8 @@ dependencies = [ "plugins 0.0.1", "profile_traits 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "style_traits 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1913,14 +1922,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "0.8.11" +version = "0.8.17" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde_codegen" -version = "0.8.12" +version = "0.8.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "post-expansion 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_codegen_internals 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1936,10 +1946,11 @@ dependencies = [ [[package]] name = "serde_derive" -version = "0.8.12" +version = "0.8.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde_codegen 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)", + "post-expansion 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_codegen 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1950,7 +1961,7 @@ dependencies = [ "dtoa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 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)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2135,9 +2146,9 @@ dependencies = [ "debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_generator 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2170,8 +2181,8 @@ dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", @@ -2192,8 +2203,8 @@ 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)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", ] [[package]] @@ -2360,7 +2371,7 @@ dependencies = [ "idna 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (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.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2399,8 +2410,8 @@ dependencies = [ "num_cpus 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "xdg 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2411,7 +2422,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2553,8 +2564,8 @@ dependencies = [ "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "offscreen_gl_context 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.8.12 (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)", ] [[package]] @@ -2636,8 +2647,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2781,14 +2792,15 @@ dependencies = [ "checksum owning_ref 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8d91377085359426407a287ab16884a0111ba473aa6844ff01d4ec20ce3d75e7" "checksum parking_lot 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3562f3de7bdff194212be82366abf5c6565aff8a433b71c53c63d0e7c9913878" "checksum parking_lot_core 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "06f24c980718110494e9cfb7db7438895c3f54505101bb6170329d5e43a53f64" -"checksum phf 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "971dd94df0728890a6fd7cf01b61e3f1fc84acb308175d196a9ceb2aa0e04b90" -"checksum phf_codegen 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "29fa7fa119b1dd493cc17d69052281ad38767c6e5f6f29263bbd57027aee7f71" -"checksum phf_generator 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "e3497bdd90ab6e6f9295d4877ac89b74dd0635304b9c89a6677f17d87bb5ef8d" -"checksum phf_macros 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "8afd16b67d77b27647f1c0e49457d814cc0e48dad567b3808d783cad7c0eecaa" -"checksum phf_shared 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "69668cdb43ef62e348ec04e4acea0ba200f9945230523fb1f1c1f462f27a8e2b" +"checksum phf 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)" = "95cb41511b13e592110b5c8323c1d489513b6db919148f909b8b804be73a74b5" +"checksum phf_codegen 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)" = "8b74506ea0ea5f6adbef815c1e964daa2d395e7c29b7196d390a67a31fa2a020" +"checksum phf_generator 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)" = "d5e1d4b224dfc609b025ea389e6eb9b850ae5814272880d7d75d71acc3d57c88" +"checksum phf_macros 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)" = "4bbc5912dc544d28df8e58ed9a132c13701758f0a96c8bd08ecc1f23eea27358" +"checksum phf_shared 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)" = "9f3d84458c4040eb4b9e626cb551a2dc46d92ea96b1c30331aa9fce9abd2c438" "checksum pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8cee804ecc7eaf201a4a207241472cc870e825206f6c031e3ee2a72fa425f2fa" "checksum pnacl-build-helper 1.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "61c9231d31aea845007443d62fcbb58bb6949ab9c18081ee1e09920e0cf1118b" "checksum png 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "06208e2ee243e3118a55dda9318f821f206d8563fb8d4df258767f8e62bb0997" +"checksum post-expansion 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "31a834a6060acaef74a8d878f6ca37a2b86fefe042bbfe70689ba587e42526f9" "checksum quickersort 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e952ea7699262481636004bc4ab8afaccf2bc13f91b79d1aee6617bd8fc39651" "checksum quote 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a5071e94480b788e482dd13592c7221b75da33717fd0fd74aee76a01c40b35b" "checksum rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "2791d88c6defac799c3f20d74f094ca33b9332612d9aef9078519c82e4fe04a5" @@ -2802,10 +2814,10 @@ dependencies = [ "checksum scoped_threadpool 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "3ef399c8893e8cb7aa9696e895427fab3a6bf265977bb96e126f24ddd2cda85a" "checksum selectors 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f8d3498861f4486e7e1d5c56eabf2b0e461f92bcbf45a3ac30cae0f3d5cdd0" "checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac" -"checksum serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "15db662ce4b837aac5731c52fe732d84a00f909763236289587cb7ca6985f6d8" -"checksum serde_codegen 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b64ecfe57712501e861b303982b549cfd56aed0ebf58823b36093d1807d69b" +"checksum serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)" = "784e249221c84265caeb1e2fe48aeada86f67f5acb151bd3903c4585969e43f6" +"checksum serde_codegen 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c3b932a3bb4d729e39aa04cc5e2f2ac70ba239a5a151d2dc9a1956fd6a2f7c15" "checksum serde_codegen_internals 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "318f7e77aa5187391d74aaf4553d2189f56b0ce25e963414c951b97877ffdcec" -"checksum serde_derive 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)" = "2c7c2b01e85ca1330ba408325f6e85b8b4bf980320b0bd3bc366510e457c443f" +"checksum serde_derive 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c6a73f0e5fc193668afa2a714bf8397063af46e6c8df72686e53fbac15b2e38c" "checksum serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0e10f8a9d94b06cf5d3bef66475f04c8ff90950f1be7004c357ff9472ccbaebc" "checksum servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "21069a884c33fe6ee596975e1f3849ed88c4ec857fbaf11d33672d8ebe051217" "checksum servo-fontconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "93f799b649b4a2bf362398910eca35240704c7e765e780349b2bb1070d892262" diff --git a/ports/geckolib/Cargo.lock b/ports/geckolib/Cargo.lock index 330d42ca439..b2a72c41748 100644 --- a/ports/geckolib/Cargo.lock +++ b/ports/geckolib/Cargo.lock @@ -34,7 +34,7 @@ dependencies = [ "heapsize 0.3.7 (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.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -139,7 +139,7 @@ dependencies = [ "log 0.3.6 (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.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -319,7 +319,7 @@ dependencies = [ [[package]] name = "serde" -version = "0.8.11" +version = "0.8.17" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -547,7 +547,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum regex-syntax 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "279401017ae31cf4e15344aa3f085d0e2e5c1e70067289ef906906fdbe92c8fd" "checksum rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)" = "6159e4e6e559c81bd706afe9c8fd68f547d3e851ce12e76b1de7914bab61691b" "checksum selectors 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f8d3498861f4486e7e1d5c56eabf2b0e461f92bcbf45a3ac30cae0f3d5cdd0" -"checksum serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "15db662ce4b837aac5731c52fe732d84a00f909763236289587cb7ca6985f6d8" +"checksum serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)" = "784e249221c84265caeb1e2fe48aeada86f67f5acb151bd3903c4585969e43f6" "checksum smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "fcc8d19212aacecf95e4a7a2179b26f7aeb9732a915cf01f05b0d3e044865410" "checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03" "checksum thread_local 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "55dd963dbaeadc08aa7266bf7f91c3154a7805e32bb94b820b769d2ef3b4744d" diff --git a/rust-nightly-date b/rust-nightly-date index 759d0344f7b..bf4dabf5836 100644 --- a/rust-nightly-date +++ b/rust-nightly-date @@ -1 +1 @@ -2016-10-27 +2016-11-02 From 5bb4c6c8846e71c7553cb625464b06ca0fedba08 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Wed, 2 Nov 2016 18:46:15 +0100 Subject: [PATCH 2/4] 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" From b0cac458b6b64e7d85a8dcaef3b74f18950fe8a5 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Wed, 2 Nov 2016 22:44:42 +0100 Subject: [PATCH 3/4] Remove unused dependency --- components/gfx_traits/Cargo.toml | 1 - components/gfx_traits/lib.rs | 1 - components/servo/Cargo.lock | 1 - ports/cef/Cargo.lock | 1 - 4 files changed, 4 deletions(-) diff --git a/components/gfx_traits/Cargo.toml b/components/gfx_traits/Cargo.toml index 7c51778fa81..d0d913c1e5a 100644 --- a/components/gfx_traits/Cargo.toml +++ b/components/gfx_traits/Cargo.toml @@ -10,7 +10,6 @@ name = "gfx_traits" path = "lib.rs" [dependencies] -azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]} heapsize = "0.3.0" heapsize_derive = "0.1" plugins = {path = "../plugins"} diff --git a/components/gfx_traits/lib.rs b/components/gfx_traits/lib.rs index 31684954958..80b45444e3f 100644 --- a/components/gfx_traits/lib.rs +++ b/components/gfx_traits/lib.rs @@ -10,7 +10,6 @@ #![deny(unsafe_code)] -extern crate azure; extern crate heapsize; #[macro_use] extern crate heapsize_derive; #[macro_use] diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 6fb073b242e..282d6152888 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -831,7 +831,6 @@ dependencies = [ name = "gfx_traits" version = "0.0.1" dependencies = [ - "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_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 9d2dc3a4454..959bf30a134 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -738,7 +738,6 @@ dependencies = [ name = "gfx_traits" version = "0.0.1" dependencies = [ - "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_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", From 391296278db4e815daaa72e62bacd88dbde9f7b1 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Wed, 2 Nov 2016 22:43:37 +0100 Subject: [PATCH 4/4] Make #[derive(JSTraceable)] a procedural macro --- components/jstraceable_derive/Cargo.toml | 15 ++++++ components/jstraceable_derive/lib.rs | 58 +++++++++++++++++++++ components/plugins/jstraceable.rs | 65 +----------------------- components/plugins/lib.rs | 3 -- components/script/Cargo.toml | 1 + components/script/dom/validitystate.rs | 2 +- components/script/lib.rs | 2 + components/servo/Cargo.lock | 10 ++++ ports/cef/Cargo.lock | 10 ++++ 9 files changed, 98 insertions(+), 68 deletions(-) create mode 100644 components/jstraceable_derive/Cargo.toml create mode 100644 components/jstraceable_derive/lib.rs diff --git a/components/jstraceable_derive/Cargo.toml b/components/jstraceable_derive/Cargo.toml new file mode 100644 index 00000000000..765678c0341 --- /dev/null +++ b/components/jstraceable_derive/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "jstraceable_derive" +version = "0.0.1" +authors = ["The Servo Project Developers"] +license = "MPL-2.0" +publish = false + +[lib] +path = "lib.rs" +proc-macro = true + +[dependencies] +syn = "0.9" +quote = "0.3" +synstructure = "0.2" diff --git a/components/jstraceable_derive/lib.rs b/components/jstraceable_derive/lib.rs new file mode 100644 index 00000000000..9b4899306f9 --- /dev/null +++ b/components/jstraceable_derive/lib.rs @@ -0,0 +1,58 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * 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(proc_macro, proc_macro_lib)] + +extern crate proc_macro; +#[macro_use] extern crate quote; +extern crate syn; +extern crate synstructure; + +#[cfg(not(test))] +#[proc_macro_derive(JSTraceable)] +pub fn expand_token_stream(input: proc_macro::TokenStream) -> proc_macro::TokenStream { + expand_string(&input.to_string()).parse().unwrap() +} + +fn expand_string(input: &str) -> String { + let mut type_ = syn::parse_macro_input(input).unwrap(); + + let style = synstructure::BindStyle::Ref.into(); + let match_body = synstructure::each_field(&mut type_, &style, |binding| { + Some(quote! { #binding.trace(tracer); }) + }); + + let name = &type_.ident; + let (impl_generics, ty_generics, mut where_clause) = type_.generics.split_for_impl(); + for param in &type_.generics.ty_params { + where_clause.predicates.push(syn::WherePredicate::BoundPredicate(syn::WhereBoundPredicate { + bound_lifetimes: Vec::new(), + bounded_ty: syn::Ty::Path(None, param.ident.clone().into()), + bounds: vec![syn::TyParamBound::Trait( + syn::PolyTraitRef { + bound_lifetimes: Vec::new(), + trait_ref: syn::parse_path("::dom::bindings::trace::JSTraceable").unwrap(), + }, + syn::TraitBoundModifier::None + )], + })) + } + + let tokens = quote! { + #type_ + + impl #impl_generics ::dom::bindings::trace::JSTraceable for #name #ty_generics #where_clause { + #[inline] + #[allow(unused_variables, unused_imports)] + fn trace(&self, tracer: *mut ::js::jsapi::JSTracer) { + use ::dom::bindings::trace::JSTraceable; + match *self { + #match_body + } + } + } + }; + + tokens.to_string() +} diff --git a/components/plugins/jstraceable.rs b/components/plugins/jstraceable.rs index e41d56765ce..f1e0ed496b6 100644 --- a/components/plugins/jstraceable.rs +++ b/components/plugins/jstraceable.rs @@ -2,13 +2,10 @@ * 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 syntax::ast::{Expr, MetaItem, Mutability}; +use syntax::ast::MetaItem; use syntax::codemap::Span; use syntax::ext::base::{Annotatable, ExtCtxt}; -use syntax::ext::build::AstBuilder; use syntax::ptr::P; -use syntax_ext::deriving::generic::{Struct, Substructure, TraitDef, ty}; -use syntax_ext::deriving::generic::{combine_substructure, EnumMatching, FieldInfo, MethodDef}; pub fn expand_dom_struct(cx: &mut ExtCtxt, sp: Span, _: &MetaItem, anno: Annotatable) -> Annotatable { if let Annotatable::Item(item) = anno { @@ -29,63 +26,3 @@ pub fn expand_dom_struct(cx: &mut ExtCtxt, sp: Span, _: &MetaItem, anno: Annotat anno } } - -/// Provides the hook to expand `#[derive(JSTraceable)]` into an implementation of `JSTraceable` -/// -/// The expansion basically calls `trace()` on all of the fields of the struct/enum, erroring if they do not -/// implement the method. -pub fn expand_jstraceable(cx: &mut ExtCtxt, span: Span, mitem: &MetaItem, item: &Annotatable, - push: &mut FnMut(Annotatable)) { - let trait_def = TraitDef { - is_unsafe: false, - span: span, - attributes: Vec::new(), - path: ty::Path::new(vec!("dom", "bindings", "trace", "JSTraceable")), - additional_bounds: Vec::new(), - generics: ty::LifetimeBounds::empty(), - supports_unions: true, - methods: vec![ - MethodDef { - name: "trace", - generics: ty::LifetimeBounds::empty(), - explicit_self: ty::borrowed_explicit_self(), - args: vec!(ty::Ptr(box ty::Literal(ty::Path::new(vec!("js", "jsapi", "JSTracer"))), - ty::Raw(Mutability::Mutable))), - ret_ty: ty::nil_ty(), - attributes: vec![quote_attr!(cx, #[inline])], - is_unsafe: false, - combine_substructure: combine_substructure(box jstraceable_substructure), - unify_fieldless_variants: true, - } - ], - associated_types: vec![], - }; - trait_def.expand(cx, mitem, item, push) -} - -// Mostly copied from syntax::ext::deriving::hash -/// Defines how the implementation for `trace()` is to be generated -fn jstraceable_substructure(cx: &mut ExtCtxt, trait_span: Span, substr: &Substructure) -> P { - let state_expr = if substr.nonself_args.len() == 1 { - &substr.nonself_args[0] - } else { - cx.span_bug(trait_span, "incorrect number of arguments in `jstraceable`") - }; - let trace_ident = substr.method_ident; - let call_trace = |span, thing_expr| { - let expr = cx.expr_method_call(span, thing_expr, trace_ident, vec!(state_expr.clone())); - cx.stmt_expr(expr) - }; - let mut stmts = Vec::new(); - - let fields = match *substr.fields { - Struct(_, ref fs) | EnumMatching(_, _, ref fs) => fs, - _ => cx.span_bug(trait_span, "impossible substructure in `jstraceable`") - }; - - for &FieldInfo { ref self_, span, .. } in fields { - stmts.push(call_trace(span, self_.clone())); - } - - cx.expr_block(cx.block(trait_span, stmts)) -} diff --git a/components/plugins/lib.rs b/components/plugins/lib.rs index e62243e8024..5ebb54aba31 100644 --- a/components/plugins/lib.rs +++ b/components/plugins/lib.rs @@ -25,7 +25,6 @@ extern crate rustc; extern crate rustc_plugin; #[macro_use] extern crate syntax; -extern crate syntax_ext; use rustc_plugin::Registry; use syntax::ext::base::*; @@ -44,8 +43,6 @@ mod utils; #[plugin_registrar] pub fn plugin_registrar(reg: &mut Registry) { reg.register_syntax_extension(intern("dom_struct"), MultiModifier(box jstraceable::expand_dom_struct)); - reg.register_syntax_extension(intern("derive_JSTraceable"), - MultiDecorator(box jstraceable::expand_jstraceable)); reg.register_syntax_extension(intern("_generate_reflector"), MultiDecorator(box reflector::expand_reflector)); reg.register_late_lint_pass(box lints::unrooted_must_root::UnrootedPass::new()); diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index b65b1da3eb4..610ee51278c 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -42,6 +42,7 @@ hyper_serde = "0.1.4" image = "0.10" ipc-channel = "0.5" js = {git = "https://github.com/servo/rust-mozjs", features = ["promises"]} +jstraceable_derive = {path = "../jstraceable_derive"} libc = "0.2" log = "0.3.5" mime = "0.2.1" diff --git a/components/script/dom/validitystate.rs b/components/script/dom/validitystate.rs index 21740b16bfc..c6bb0761f3c 100644 --- a/components/script/dom/validitystate.rs +++ b/components/script/dom/validitystate.rs @@ -10,7 +10,7 @@ use dom::element::Element; use dom::window::Window; // https://html.spec.whatwg.org/multipage/#validity-states -#[derive_JSTraceable] +#[derive(JSTraceable)] #[derive(HeapSizeOf)] pub enum ValidityStatus { ValueMissing, diff --git a/components/script/lib.rs b/components/script/lib.rs index 96e9cb29731..78e28f24fb0 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -54,6 +54,8 @@ extern crate image; extern crate ipc_channel; #[macro_use] extern crate js; +#[macro_use] +extern crate jstraceable_derive; extern crate libc; #[macro_use] extern crate log; diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 282d6152888..fb702d1be31 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -1118,6 +1118,15 @@ dependencies = [ "num-traits 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "jstraceable_derive" +version = "0.0.1" +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 = "kernel32-sys" version = "0.2.2" @@ -1970,6 +1979,7 @@ dependencies = [ "image 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "js 0.1.3 (git+https://github.com/servo/rust-mozjs)", + "jstraceable_derive 0.0.1", "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)", "mime 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 959bf30a134..e4479c8417e 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -1025,6 +1025,15 @@ dependencies = [ "num-traits 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "jstraceable_derive" +version = "0.0.1" +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 = "kernel32-sys" version = "0.2.2" @@ -1821,6 +1830,7 @@ dependencies = [ "image 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "js 0.1.3 (git+https://github.com/servo/rust-mozjs)", + "jstraceable_derive 0.0.1", "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)", "mime 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",