From 18545666832851bae304d2af19311886dea18308 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Tue, 4 Oct 2016 19:49:57 +0200 Subject: [PATCH] Update to Rust 1.14.0-nightly (19ac57926 2016-10-08) A cargo bump and a switch to serde_derive is needed to do this rustup. --- cargo-nightly-build | 2 +- components/canvas/Cargo.toml | 2 +- components/canvas_traits/Cargo.toml | 4 +- components/canvas_traits/lib.rs | 6 +- components/compositing/Cargo.toml | 6 +- components/compositing/lib.rs | 4 +- components/constellation/Cargo.toml | 4 +- components/constellation/lib.rs | 6 +- components/devtools/Cargo.toml | 2 +- components/devtools/lib.rs | 4 +- components/devtools_traits/Cargo.toml | 2 +- components/devtools_traits/lib.rs | 6 +- components/gfx/Cargo.toml | 4 +- components/gfx/lib.rs | 6 +- components/gfx_traits/Cargo.toml | 2 +- components/gfx_traits/lib.rs | 6 +- components/layout/Cargo.toml | 4 +- components/layout_thread/Cargo.toml | 4 +- components/layout_traits/Cargo.toml | 2 +- components/msg/Cargo.toml | 4 +- components/msg/lib.rs | 6 +- components/net/Cargo.toml | 2 +- components/net_traits/Cargo.toml | 2 +- components/net_traits/lib.rs | 7 +- components/profile/Cargo.toml | 2 +- components/profile/lib.rs | 6 +- components/profile_traits/Cargo.toml | 2 +- components/profile_traits/lib.rs | 6 +- components/range/Cargo.toml | 2 +- components/range/lib.rs | 5 +- components/script/Cargo.toml | 6 +- components/script/dom/bindings/cell.rs | 4 +- components/script/lib.rs | 1 - components/script_traits/Cargo.toml | 2 +- components/script_traits/lib.rs | 6 +- components/servo/Cargo.lock | 316 ++++++++++++------------- components/servo/Cargo.toml | 4 +- components/style/Cargo.toml | 4 +- components/style/lib.rs | 5 +- components/style_traits/Cargo.toml | 4 +- components/style_traits/lib.rs | 5 +- components/util/Cargo.toml | 4 +- components/util/lib.rs | 6 +- ports/cef/Cargo.lock | 242 +++++++++---------- rust-nightly-date | 2 +- 45 files changed, 380 insertions(+), 351 deletions(-) diff --git a/cargo-nightly-build b/cargo-nightly-build index 73b492ece35e..7a8b72d2b7a0 100644 --- a/cargo-nightly-build +++ b/cargo-nightly-build @@ -1 +1 @@ -2016-09-20 +2016-10-09 diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml index e0f076932e2b..d94cdb22818c 100644 --- a/components/canvas/Cargo.toml +++ b/components/canvas/Cargo.toml @@ -25,4 +25,4 @@ util = {path = "../util"} [dependencies.webrender_traits] git = "https://github.com/servo/webrender" default_features = false -features = ["serde_macros"] +features = ["serde_derive"] diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml index 272387f6fdf8..eae4b94e2944 100644 --- a/components/canvas_traits/Cargo.toml +++ b/components/canvas_traits/Cargo.toml @@ -19,9 +19,9 @@ heapsize_plugin = "0.1.2" ipc-channel = "0.5" plugins = {path = "../plugins"} serde = {version = "0.8", features = ["unstable"]} -serde_macros = "0.8" +serde_derive = "0.8" [dependencies.webrender_traits] git = "https://github.com/servo/webrender" default_features = false -features = ["serde_macros"] +features = ["serde_derive"] diff --git a/components/canvas_traits/lib.rs b/components/canvas_traits/lib.rs index d148baf05505..bdd29fd8e971 100644 --- a/components/canvas_traits/lib.rs +++ b/components/canvas_traits/lib.rs @@ -6,7 +6,9 @@ #![crate_type = "rlib"] #![feature(custom_derive)] #![feature(plugin)] -#![plugin(heapsize_plugin, plugins, serde_macros)] +#![feature(proc_macro)] +#![feature(rustc_attrs)] +#![plugin(heapsize_plugin, plugins)] #![deny(unsafe_code)] @@ -18,6 +20,8 @@ extern crate gfx_traits; extern crate heapsize; extern crate ipc_channel; extern crate serde; +#[macro_use] +extern crate serde_derive; extern crate webrender_traits; use azure::azure::{AzColor, AzFloat}; diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml index 5612c58cc1f2..299999abf071 100644 --- a/components/compositing/Cargo.toml +++ b/components/compositing/Cargo.toml @@ -25,7 +25,7 @@ plugins = {path = "../plugins"} profile_traits = {path = "../profile_traits"} script_traits = {path = "../script_traits"} serde = "0.8" -serde_macros = "0.8" +serde_derive = "0.8" style_traits = {path = "../style_traits"} time = "0.1.17" url = {version = "1.2", features = ["heap_size"]} @@ -34,9 +34,9 @@ util = {path = "../util"} [dependencies.webrender] git = "https://github.com/servo/webrender" default-features = false -features = ["serde_macros"] +features = ["serde_derive"] [dependencies.webrender_traits] git = "https://github.com/servo/webrender" default_features = false -features = ["serde_macros"] +features = ["serde_derive"] diff --git a/components/compositing/lib.rs b/components/compositing/lib.rs index 8ce9a6370e60..c51fb23ee3ef 100644 --- a/components/compositing/lib.rs +++ b/components/compositing/lib.rs @@ -5,10 +5,10 @@ #![feature(box_syntax)] #![feature(custom_derive)] #![feature(plugin)] +#![feature(proc_macro)] #![plugin(plugins)] #![deny(unsafe_code)] -#![plugin(serde_macros)] extern crate app_units; @@ -26,6 +26,8 @@ extern crate net_traits; #[macro_use] extern crate profile_traits; extern crate script_traits; +#[macro_use] +extern crate serde_derive; extern crate style_traits; extern crate time; extern crate url; diff --git a/components/constellation/Cargo.toml b/components/constellation/Cargo.toml index d0f443092646..62d76de999a6 100644 --- a/components/constellation/Cargo.toml +++ b/components/constellation/Cargo.toml @@ -30,7 +30,7 @@ profile_traits = {path = "../profile_traits"} rand = "0.3" script_traits = {path = "../script_traits"} serde = "0.8" -serde_macros = "0.8" +serde_derive = "0.8" style_traits = {path = "../style_traits"} url = {version = "1.2", features = ["heap_size"]} util = {path = "../util"} @@ -38,7 +38,7 @@ util = {path = "../util"} [dependencies.webrender_traits] git = "https://github.com/servo/webrender" default_features = false -features = ["serde_macros"] +features = ["serde_derive"] [target.'cfg(not(target_os = "windows"))'.dependencies] gaol = {git = "https://github.com/servo/gaol"} diff --git a/components/constellation/lib.rs b/components/constellation/lib.rs index a7d7fad33ceb..0ac6ecb947db 100644 --- a/components/constellation/lib.rs +++ b/components/constellation/lib.rs @@ -4,12 +4,12 @@ #![feature(box_syntax)] #![feature(custom_derive)] -#![feature(plugin)] #![feature(mpsc_select)] +#![feature(plugin)] +#![feature(proc_macro)] #![plugin(plugins)] #![deny(unsafe_code)] -#![plugin(serde_macros)] extern crate backtrace; extern crate canvas; @@ -34,6 +34,8 @@ extern crate profile_traits; extern crate rand; extern crate script_traits; extern crate serde; +#[macro_use] +extern crate serde_derive; extern crate style_traits; extern crate url; #[macro_use] diff --git a/components/devtools/Cargo.toml b/components/devtools/Cargo.toml index f17488c575db..caa5f1755b3b 100644 --- a/components/devtools/Cargo.toml +++ b/components/devtools/Cargo.toml @@ -20,6 +20,6 @@ msg = {path = "../msg"} plugins = {path = "../plugins"} serde = "0.8" serde_json = "0.8" -serde_macros = "0.8" +serde_derive = "0.8" time = "0.1" util = {path = "../util"} diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs index 9917d15d2d5a..8e596dbe7910 100644 --- a/components/devtools/lib.rs +++ b/components/devtools/lib.rs @@ -14,7 +14,7 @@ #![feature(custom_attribute)] #![feature(custom_derive)] #![feature(plugin)] -#![plugin(serde_macros)] +#![feature(proc_macro)] #![plugin(plugins)] #![allow(non_snake_case)] @@ -28,6 +28,8 @@ extern crate ipc_channel; extern crate log; extern crate msg; extern crate serde; +#[macro_use] +extern crate serde_derive; extern crate serde_json; extern crate time; extern crate util; diff --git a/components/devtools_traits/Cargo.toml b/components/devtools_traits/Cargo.toml index 7e5074d7cf6b..efcefc3a119b 100644 --- a/components/devtools_traits/Cargo.toml +++ b/components/devtools_traits/Cargo.toml @@ -18,6 +18,6 @@ hyper_serde = "0.1.4" ipc-channel = "0.5" msg = {path = "../msg"} serde = "0.8" -serde_macros = "0.8" +serde_derive = "0.8" time = "0.1" url = {version = "1.2", features = ["heap_size"]} diff --git a/components/devtools_traits/lib.rs b/components/devtools_traits/lib.rs index b77118211122..b761c410eb04 100644 --- a/components/devtools_traits/lib.rs +++ b/components/devtools_traits/lib.rs @@ -12,8 +12,8 @@ #![allow(non_snake_case)] #![deny(unsafe_code)] -#![feature(custom_derive, plugin)] -#![plugin(heapsize_plugin, serde_macros)] +#![feature(custom_derive, plugin, proc_macro, rustc_attrs, structural_match)] +#![plugin(heapsize_plugin)] #[allow(unused_extern_crates)] #[macro_use] @@ -23,6 +23,8 @@ extern crate hyper; extern crate ipc_channel; extern crate msg; extern crate serde; +#[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 ba387d19bb0d..4bd27945b3fc 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -36,7 +36,7 @@ rand = "0.3" range = {path = "../range"} rustc-serialize = "0.3" serde = "0.8" -serde_macros = "0.8" +serde_derive = "0.8" smallvec = "0.1" string_cache = {version = "0.2.26", features = ["heap_size"]} style = {path = "../style"} @@ -50,7 +50,7 @@ xi-unicode = "0.0.1" [dependencies.webrender_traits] git = "https://github.com/servo/webrender" default_features = false -features = ["serde_macros"] +features = ["serde_derive"] [target.'cfg(target_os = "macos")'.dependencies] byteorder = "0.5" diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs index 7315c5794169..59045550660f 100644 --- a/components/gfx/lib.rs +++ b/components/gfx/lib.rs @@ -11,12 +11,14 @@ #![feature(custom_derive)] #![feature(mpsc_select)] #![feature(plugin)] +#![feature(proc_macro)] #![feature(range_contains)] +#![feature(rustc_attrs)] +#![feature(structural_match)] #![feature(unique)] #![plugin(heapsize_plugin)] #![plugin(plugins)] -#![plugin(serde_macros)] #![deny(unsafe_code)] @@ -73,6 +75,8 @@ extern crate rand; extern crate range; extern crate rustc_serialize; extern crate serde; +#[macro_use] +extern crate serde_derive; #[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))] extern crate simd; diff --git a/components/gfx_traits/Cargo.toml b/components/gfx_traits/Cargo.toml index 88d9f53811b1..65baa8d3791d 100644 --- a/components/gfx_traits/Cargo.toml +++ b/components/gfx_traits/Cargo.toml @@ -21,4 +21,4 @@ profile_traits = {path = "../profile_traits"} range = {path = "../range"} rustc-serialize = "0.3" serde = "0.8" -serde_macros = "0.8" +serde_derive = "0.8" diff --git a/components/gfx_traits/lib.rs b/components/gfx_traits/lib.rs index 8b34d1b3b785..674eb42c55d7 100644 --- a/components/gfx_traits/lib.rs +++ b/components/gfx_traits/lib.rs @@ -2,8 +2,8 @@ * 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, plugin)] -#![plugin(heapsize_plugin, plugins, serde_macros)] +#![feature(custom_derive, plugin, proc_macro, rustc_attrs, structural_match)] +#![plugin(heapsize_plugin, plugins)] #![crate_name = "gfx_traits"] #![crate_type = "rlib"] @@ -20,6 +20,8 @@ extern crate profile_traits; extern crate range; extern crate rustc_serialize; extern crate serde; +#[macro_use] +extern crate serde_derive; pub mod color; mod paint_listener; diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index b7007219e7d1..f76de8afb600 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -34,7 +34,7 @@ rustc-serialize = "0.3" script_layout_interface = {path = "../script_layout_interface"} script_traits = {path = "../script_traits"} selectors = "0.13" -serde_macros = "0.8" +serde_derive = "0.8" smallvec = "0.1" string_cache = {version = "0.2.26", features = ["heap_size"]} style = {path = "../style"} @@ -47,4 +47,4 @@ util = {path = "../util"} [dependencies.webrender_traits] git = "https://github.com/servo/webrender" default_features = false -features = ["serde_macros"] +features = ["serde_derive"] diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml index 2dcf5ce74556..e41b6d3b0902 100644 --- a/components/layout_thread/Cargo.toml +++ b/components/layout_thread/Cargo.toml @@ -30,8 +30,8 @@ profile_traits = {path = "../profile_traits"} script = {path = "../script"} script_layout_interface = {path = "../script_layout_interface"} script_traits = {path = "../script_traits"} +serde_derive = "0.8" serde_json = "0.8" -serde_macros = "0.8" style = {path = "../style"} url = {version = "1.2", features = ["heap_size"]} util = {path = "../util"} @@ -39,4 +39,4 @@ util = {path = "../util"} [dependencies.webrender_traits] git = "https://github.com/servo/webrender" default_features = false -features = ["serde_macros"] +features = ["serde_derive"] diff --git a/components/layout_traits/Cargo.toml b/components/layout_traits/Cargo.toml index c14cfd5e7f45..dcb58d8a902e 100644 --- a/components/layout_traits/Cargo.toml +++ b/components/layout_traits/Cargo.toml @@ -22,4 +22,4 @@ url = {version = "1.2", features = ["heap_size"]} [dependencies.webrender_traits] git = "https://github.com/servo/webrender" default_features = false -features = ["serde_macros"] +features = ["serde_derive"] diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml index 44bcaf97e8ee..452c4ea17165 100644 --- a/components/msg/Cargo.toml +++ b/components/msg/Cargo.toml @@ -19,10 +19,10 @@ hyper_serde = "0.1.4" ipc-channel = "0.5" plugins = {path = "../plugins"} serde = "0.8" -serde_macros = "0.8" +serde_derive = "0.8" url = {version = "1.2", features = ["heap_size", "serde"]} [dependencies.webrender_traits] git = "https://github.com/servo/webrender" default_features = false -features = ["serde_macros"] +features = ["serde_derive"] diff --git a/components/msg/lib.rs b/components/msg/lib.rs index af96cb541a41..6e0471e97ef9 100644 --- a/components/msg/lib.rs +++ b/components/msg/lib.rs @@ -2,8 +2,8 @@ * 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_attribute, custom_derive, plugin)] -#![plugin(heapsize_plugin, serde_macros, plugins)] +#![feature(custom_attribute, custom_derive, plugin, proc_macro, rustc_attrs, structural_match)] +#![plugin(heapsize_plugin, plugins)] #![deny(unsafe_code)] @@ -15,6 +15,8 @@ extern crate hyper; extern crate hyper_serde; extern crate ipc_channel; extern crate serde; +#[macro_use] +extern crate serde_derive; extern crate url; extern crate webrender_traits; diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index c2e1dee90b92..6bd755faf0b4 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -45,7 +45,7 @@ websocket = "0.17" [dependencies.webrender_traits] git = "https://github.com/servo/webrender" default_features = false -features = ["serde_macros"] +features = ["serde_derive"] [target.'cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))'.dependencies] tinyfiledialogs = {git = "https://github.com/jdm/tinyfiledialogs"} diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml index 23a2989d3301..e3eba97c27dc 100644 --- a/components/net_traits/Cargo.toml +++ b/components/net_traits/Cargo.toml @@ -22,7 +22,7 @@ lazy_static = "0.2" log = "0.3.5" num-traits = "0.1.32" serde = "0.8" -serde_macros = "0.8" +serde_derive = "0.8" url = {version = "1.2", features = ["heap_size"]} websocket = "0.17" uuid = { version = "0.3.1", features = ["v4", "serde"] } diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs index bc920ccd2dde..7459c2afb344 100644 --- a/components/net_traits/lib.rs +++ b/components/net_traits/lib.rs @@ -6,9 +6,12 @@ #![feature(custom_attribute)] #![feature(custom_derive)] #![feature(plugin)] +#![feature(proc_macro)] +#![feature(rustc_attrs)] #![feature(slice_patterns)] #![feature(step_by)] -#![plugin(heapsize_plugin, serde_macros)] +#![feature(structural_match)] +#![plugin(heapsize_plugin)] #![deny(unsafe_code)] @@ -26,6 +29,8 @@ extern crate log; extern crate msg; extern crate num_traits; extern crate serde; +#[macro_use] +extern crate serde_derive; extern crate url; extern crate util; extern crate uuid; diff --git a/components/profile/Cargo.toml b/components/profile/Cargo.toml index 3ecb761474bb..f542c5a3f037 100644 --- a/components/profile/Cargo.toml +++ b/components/profile/Cargo.toml @@ -17,8 +17,8 @@ ipc-channel = "0.5" heartbeats-simple = "0.3" log = "0.3.5" serde = "0.8" +serde_derive = "0.8" serde_json = "0.8" -serde_macros = "0.8" time = "0.1.12" [target.'cfg(target_os = "macos")'.dependencies] diff --git a/components/profile/lib.rs b/components/profile/lib.rs index 61682764de4c..6df11fa1ebde 100644 --- a/components/profile/lib.rs +++ b/components/profile/lib.rs @@ -4,10 +4,10 @@ #![cfg_attr(not(target_os = "windows"), feature(alloc_jemalloc))] #![feature(box_syntax)] +#![feature(custom_derive)] #![feature(plugin)] +#![feature(proc_macro)] #![plugin(plugins)] -#![feature(custom_derive)] -#![plugin(serde_macros)] #![deny(unsafe_code)] @@ -25,6 +25,8 @@ extern crate profile_traits; #[cfg(target_os = "linux")] extern crate regex; extern crate serde; +#[macro_use] +extern crate serde_derive; extern crate serde_json; #[cfg(target_os = "macos")] extern crate task_info; diff --git a/components/profile_traits/Cargo.toml b/components/profile_traits/Cargo.toml index 150760b2ad2a..dd9cd0a087d0 100644 --- a/components/profile_traits/Cargo.toml +++ b/components/profile_traits/Cargo.toml @@ -18,7 +18,7 @@ energymon = {git = "https://github.com/energymon/energymon-rust.git", optional = energy-monitor = {version = "0.2.0", optional = true} plugins = {path = "../plugins"} serde = "0.8" -serde_macros = "0.8" +serde_derive = "0.8" signpost = {git = "https://github.com/pcwalton/signpost.git"} time = "0.1.12" util = {path = "../util"} diff --git a/components/profile_traits/lib.rs b/components/profile_traits/lib.rs index 78fab60a4fa7..2149614d4a57 100644 --- a/components/profile_traits/lib.rs +++ b/components/profile_traits/lib.rs @@ -7,13 +7,15 @@ //! modules won't have to depend on `profile`. #![feature(box_syntax)] -#![feature(custom_derive, plugin)] -#![plugin(plugins, serde_macros)] +#![feature(custom_derive, plugin, proc_macro, rustc_attrs, structural_match)] +#![plugin(plugins)] #![deny(unsafe_code)] extern crate ipc_channel; extern crate serde; +#[macro_use] +extern crate serde_derive; extern crate signpost; extern crate util; diff --git a/components/range/Cargo.toml b/components/range/Cargo.toml index a6a0e061e3ae..9b643dda018d 100644 --- a/components/range/Cargo.toml +++ b/components/range/Cargo.toml @@ -16,4 +16,4 @@ heapsize_plugin = "0.1.2" num-traits = "0.1.32" rustc-serialize = "0.3" serde = "0.8" -serde_macros = "0.8" +serde_derive = "0.8" diff --git a/components/range/lib.rs b/components/range/lib.rs index 467797556a8d..c3b16ccb4e75 100644 --- a/components/range/lib.rs +++ b/components/range/lib.rs @@ -4,10 +4,11 @@ #![feature(custom_derive)] #![feature(plugin)] +#![feature(proc_macro)] +#![feature(rustc_attrs)] #![feature(step_trait)] #![plugin(heapsize_plugin)] -#![plugin(serde_macros)] #![deny(unsafe_code)] @@ -15,6 +16,8 @@ extern crate heapsize; extern crate num_traits; extern crate rustc_serialize; extern crate serde; +#[macro_use] +extern crate serde_derive; use std::cmp::{self, max, min}; use std::fmt; diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 14ea398964aa..9f2ca18af3f6 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -52,8 +52,8 @@ num-traits = "0.1.32" offscreen_gl_context = "0.4" open = "1.1.1" parking_lot = "0.3" -phf = "0.7.16" -phf_macros = "0.7.16" +phf = "0.7.17" +phf_macros = "0.7.17" plugins = {path = "../plugins"} profile_traits = {path = "../profile_traits"} rand = "0.3" @@ -78,4 +78,4 @@ xml5ever = {version = "0.1.2", features = ["unstable"]} [dependencies.webrender_traits] git = "https://github.com/servo/webrender" default_features = false -features = ["nightly", "serde_macros"] +features = ["nightly", "serde_derive"] diff --git a/components/script/dom/bindings/cell.rs b/components/script/dom/bindings/cell.rs index eef98076c0b1..fc26ca013c86 100644 --- a/components/script/dom/bindings/cell.rs +++ b/components/script/dom/bindings/cell.rs @@ -106,7 +106,7 @@ impl DOMRefCell { /// # Panics /// /// Panics if this is called off the script thread. - pub fn try_borrow(&self) -> Result, BorrowError> { + pub fn try_borrow(&self) -> Result, BorrowError> { debug_assert!(thread_state::get().is_script()); self.value.try_borrow() } @@ -121,7 +121,7 @@ impl DOMRefCell { /// # Panics /// /// Panics if this is called off the script thread. - pub fn try_borrow_mut(&self) -> Result, BorrowMutError> { + pub fn try_borrow_mut(&self) -> Result, BorrowMutError> { debug_assert!(thread_state::get().is_script()); self.value.try_borrow_mut() } diff --git a/components/script/lib.rs b/components/script/lib.rs index 7e4c9c78ab1b..c3832c646e27 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -17,7 +17,6 @@ #![feature(question_mark)] #![feature(slice_patterns)] #![feature(stmt_expr_attributes)] -#![feature(try_borrow)] #![feature(try_from)] #![feature(untagged_unions)] diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml index 813c725b6243..8a51d5bd6b76 100644 --- a/components/script_traits/Cargo.toml +++ b/components/script_traits/Cargo.toml @@ -29,7 +29,7 @@ plugins = {path = "../plugins"} profile_traits = {path = "../profile_traits"} rustc-serialize = "0.3.4" serde = "0.8" -serde_macros = "0.8" +serde_derive = "0.8" style_traits = {path = "../style_traits", features = ["servo"]} time = "0.1.12" url = {version = "1.2", features = ["heap_size"]} diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index 006b663268d3..2220a9cf2e11 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -6,8 +6,8 @@ //! The traits are here instead of in script so that these modules won't have //! to depend on script. -#![feature(custom_derive, plugin)] -#![plugin(heapsize_plugin, plugins, serde_macros)] +#![feature(custom_derive, plugin, proc_macro, rustc_attrs, structural_match)] +#![plugin(heapsize_plugin, plugins)] #![deny(missing_docs)] #![deny(unsafe_code)] @@ -28,6 +28,8 @@ extern crate offscreen_gl_context; extern crate profile_traits; extern crate rustc_serialize; extern crate serde; +#[macro_use] +extern crate serde_derive; extern crate style_traits; extern crate time; extern crate url; diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 8d0dd5b5fe91..501779f9fa3b 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -46,8 +46,8 @@ dependencies = [ "util 0.0.1", "util_tests 0.0.1", "webdriver_server 0.0.1", - "webrender 0.5.1 (git+https://github.com/servo/webrender)", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "webrender 0.6.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -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.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -97,11 +97,6 @@ dependencies = [ "odds 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "aster" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "audio-video-metadata" version = "0.1.2" @@ -114,8 +109,8 @@ dependencies = [ [[package]] name = "azure" -version = "0.8.0" -source = "git+https://github.com/servo/rust-azure#9fb666b2fc86b23761f9b0f877a3d42f182263a9" +version = "0.9.0" +source = "git+https://github.com/servo/rust-azure#4a2ca5018c97d356a2d2959a074ca98e1f6adba8" 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)", @@ -126,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.16 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (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)", "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)", @@ -165,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.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -227,7 +222,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "canvas" version = "0.0.1" dependencies = [ - "azure 0.8.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.0 (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)", "gfx_traits 0.0.1", @@ -238,14 +233,14 @@ dependencies = [ "offscreen_gl_context 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "util 0.0.1", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", ] [[package]] name = "canvas_traits" version = "0.0.1" dependencies = [ - "azure 0.8.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.0 (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)", "gfx_traits 0.0.1", @@ -253,9 +248,9 @@ 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.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "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)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -310,12 +305,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "compiletest_helper" version = "0.0.1" dependencies = [ - "compiletest_rs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "compiletest_rs 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "compiletest_rs" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -327,7 +322,7 @@ name = "compositing" version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.8.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.0 (git+https://github.com/servo/rust-azure)", "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "gleam 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", @@ -340,14 +335,14 @@ dependencies = [ "plugins 0.0.1", "profile_traits 0.0.1", "script_traits 0.0.1", - "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (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)", "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)", "util 0.0.1", - "webrender 0.5.1 (git+https://github.com/servo/webrender)", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "webrender 0.6.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -374,12 +369,12 @@ 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.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (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)", "style_traits 0.0.1", "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -427,7 +422,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.16 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -453,7 +448,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.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -519,9 +514,9 @@ 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.8 (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_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (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", ] @@ -537,8 +532,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.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (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)", "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)", ] @@ -689,7 +684,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.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -786,7 +781,7 @@ name = "gfx" version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.8.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.0 (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)", @@ -815,8 +810,8 @@ dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "range 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (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)", "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)", @@ -827,7 +822,7 @@ dependencies = [ "unicode-script 0.1.1 (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", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "xi-unicode 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -845,7 +840,7 @@ dependencies = [ name = "gfx_traits" version = "0.0.1" dependencies = [ - "azure 0.8.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.0 (git+https://github.com/servo/rust-azure)", "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)", @@ -855,8 +850,8 @@ dependencies = [ "profile_traits 0.0.1", "range 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (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)", ] [[package]] @@ -986,8 +981,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.16 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.17 (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)", @@ -1029,7 +1024,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.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1095,7 +1090,7 @@ dependencies = [ "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.16 (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.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1171,7 +1166,7 @@ name = "layout" version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.8.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.0 (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)", @@ -1194,7 +1189,7 @@ dependencies = [ "script_layout_interface 0.0.1", "script_traits 0.0.1", "selectors 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.8.12 (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", @@ -1203,7 +1198,7 @@ dependencies = [ "unicode-script 0.1.1 (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", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1218,7 +1213,7 @@ name = "layout_thread" version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.8.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.0 (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", @@ -1237,12 +1232,12 @@ dependencies = [ "script 0.0.1", "script_layout_interface 0.0.1", "script_traits 0.0.1", + "serde_derive 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (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)", "util 0.0.1", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1257,7 +1252,7 @@ dependencies = [ "script_traits 0.0.1", "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1370,7 +1365,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.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1379,8 +1374,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.16 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1427,10 +1422,10 @@ 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)", "plugins 0.0.1", - "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (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)", "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1468,7 +1463,7 @@ dependencies = [ "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)", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1521,8 +1516,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.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (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)", "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)", @@ -1631,7 +1626,7 @@ dependencies = [ "gleam 0.2.22 (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.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1758,42 +1753,42 @@ dependencies = [ [[package]] name = "phf" -version = "0.7.16" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_shared 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_codegen" -version = "0.7.16" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_generator 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_generator" -version = "0.7.16" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_shared 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.17 (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.16" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_generator 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_shared" -version = "0.7.16" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1847,9 +1842,9 @@ 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.8 (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_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (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)", "util 0.0.1", @@ -1872,34 +1867,13 @@ 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.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (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)", "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", ] -[[package]] -name = "quasi" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "quasi_codegen" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "aster 0.27.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "quasi_macros" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "quasi_codegen 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "quickersort" version = "2.1.0" @@ -1909,6 +1883,11 @@ dependencies = [ "unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "quote" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "rand" version = "0.3.14" @@ -1925,8 +1904,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.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (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)", ] [[package]] @@ -2020,8 +1999,8 @@ dependencies = [ "offscreen_gl_context 0.4.3 (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.16 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_macros 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_macros 0.7.17 (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)", @@ -2032,7 +2011,7 @@ dependencies = [ "script_layout_interface 0.0.1", "script_traits 0.0.1", "selectors 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.11 (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", @@ -2041,7 +2020,7 @@ dependencies = [ "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)", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", "xml5ever 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2106,8 +2085,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.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (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)", "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)", @@ -2133,42 +2112,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde_codegen" -version = "0.8.9" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.27.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi_macros 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_codegen_internals 0.8.9 (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)", ] [[package]] name = "serde_codegen_internals" -version = "0.8.9" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "syn 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] -name = "serde_json" -version = "0.8.1" +name = "serde_derive" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" 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.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_codegen 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "serde_macros" -version = "0.8.9" +name = "serde_json" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde_codegen 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", ] [[package]] @@ -2311,9 +2292,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.16 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2345,8 +2326,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.13.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (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)", "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", @@ -2383,8 +2364,17 @@ 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.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (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)", +] + +[[package]] +name = "syn" +version = "0.9.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)", + "unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2514,6 +2504,11 @@ dependencies = [ "harfbuzz-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "unicode-xid" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "unreachable" version = "0.1.1" @@ -2532,7 +2527,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.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2572,8 +2567,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.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (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)", "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)", ] @@ -2591,7 +2586,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.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2696,8 +2691,8 @@ dependencies = [ [[package]] name = "webrender" -version = "0.5.1" -source = "git+https://github.com/servo/webrender#98e7331d48620ac1c03397ebbbf526b60e62258b" +version = "0.6.0" +source = "git+https://github.com/servo/webrender#b31b4cf76324bfbe82d27a059e1330ef5ae34c35" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2716,13 +2711,13 @@ dependencies = [ "offscreen_gl_context 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", ] [[package]] name = "webrender_traits" -version = "0.5.1" -source = "git+https://github.com/servo/webrender#98e7331d48620ac1c03397ebbbf526b60e62258b" +version = "0.6.0" +source = "git+https://github.com/servo/webrender#b31b4cf76324bfbe82d27a059e1330ef5ae34c35" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2732,8 +2727,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.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (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)", ] [[package]] @@ -2815,8 +2810,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.16 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.17 (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)", @@ -2830,9 +2825,8 @@ dependencies = [ "checksum angle 0.1.2 (git+https://github.com/servo/angle?branch=servo)" = "" "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 aster 0.27.0 (registry+https://github.com/rust-lang/crates.io-index)" = "258989846dd255a1e0eeef92d425d345477c9999433cecc9f0879f4549d5e5c9" "checksum audio-video-metadata 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "03da2550cb89fe3faf218c179261c26cf7891c4234707c15f5d09ebb32ae2400" -"checksum azure 0.8.0 (git+https://github.com/servo/rust-azure)" = "" +"checksum azure 0.9.0 (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" @@ -2851,7 +2845,7 @@ dependencies = [ "checksum cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "dfcf5bcece56ef953b8ea042509e9dcbdfe97820b7e20d86beb53df30ed94978" "checksum cocoa 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d24ed9a15e9c0892cdb20c7acc3e50441501b990ee6dc318c176981829a7941" "checksum color_quant 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a475fc4af42d83d28adf72968d9bcfaf035a1a9381642d8e85d8a04957767b0d" -"checksum compiletest_rs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0bcddebf582c5c035cce855a89596eb686cc40b9e77da1026fba735dcca2fbd3" +"checksum compiletest_rs 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "28d60af0dbee4912f00dda79ac3b06d1ca44b641d69359e6f1d4df7c985521d2" "checksum content-blocker 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1b0d86cb81505503bbfb0d47cf7e12be2e69205a75e70c4da84998e39b96b7f1" "checksum cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0e3d6405328b6edb412158b3b7710e2634e23f3614b9bb1c412df7952489a626" "checksum core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "20a6d0448d3a99d977ae4a2aa5a98d886a923e863e81ad9ff814645b6feb3bbd" @@ -2969,18 +2963,16 @@ dependencies = [ "checksum owning_ref 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88084505837507cbec6a9f39b5d3b985db3c84e9a741c80200b619001283293d" "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.16 (registry+https://github.com/rust-lang/crates.io-index)" = "52c875926de24c01b5b69153eaa258b57920a39b44bbce8ef1f2052a6c5a6a1a" -"checksum phf_codegen 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)" = "0a8912c2cc0ea2e8ae70388ec0af9a445e7ab37b3c9cc61f059c2b34db8ed50b" -"checksum phf_generator 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)" = "04b5ea825e28cb6efd89d9133b129b2003b45a221aeda025509b125b00ecb7c4" -"checksum phf_macros 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)" = "132ea70eed654520d98d0e54e262292a94bd5f150671d98b9c8d0782fafce37e" -"checksum phf_shared 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)" = "2c43b5dbe94d31f1f4ed45c50bb06d70e72fd53f15422b0a915b5c237e130dd6" +"checksum phf 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)" = "f02853ab706e88121d7ad33ed06bedce0a7cdb96136be7c20ff0dce7b4adb9ef" +"checksum phf_codegen 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)" = "563b670811792d49bff142e7bb9787530d9b689fb4c55c6c309822d8d956a242" +"checksum phf_generator 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)" = "21416830a6c83526443b960fd41b5e18f64c4e4f90970499aeed2be592029042" +"checksum phf_macros 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)" = "1ce32ea1f8124c0a5a67611e47d9deb1874d213154213e6659e385d477e65933" +"checksum phf_shared 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)" = "4a65f09191172833c798d31e5317ecd1e4be890a3d5acc6c2f85e1460c8828bd" "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 quasi 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50d83f9f141f12a586aae8eefa4fdb39a273fc1a1f4cfb252a4cb566a9ca8985" -"checksum quasi_codegen 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cfb4a9a5410fdbdacbeda8063ddb8add9838dfd4cf50ac486db98abb762d8bd6" -"checksum quasi_macros 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "adc2b36285ea5e54e4e267f83896267ff8c5aba4f66b2e7d186ed6d968f3715f" "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" "checksum rayon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e501871917624668fe601ad12a730450414f9b0b64722a898b040ce3ae1b0fa" "checksum ref_slice 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "546bb4aa91c85f232732cc5b3c8097ea97ae9a77304f9ab4df8b203ff7672dad" @@ -2992,11 +2984,11 @@ dependencies = [ "checksum scoped_threadpool 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "3ef399c8893e8cb7aa9696e895427fab3a6bf265977bb96e126f24ddd2cda85a" "checksum selectors 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1f844a32e73a0d8e59a76036751fcb5581ca1ded4f2f2f3dc21720a80ba908af" "checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac" -"checksum serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8523fd515099dac5b5abd25b0b9f9709d40eedf03f72ca519903bf138a6577be" -"checksum serde_codegen 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)" = "da68810d845f8e33a80243c28794650397056cbe7aea4c9c7516f55d1061c94e" -"checksum serde_codegen_internals 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1b0115c5c602e81c61b787fb0f0fa76a614f8dbe9100b2b59b7d590155672c80" +"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_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_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0e10f8a9d94b06cf5d3bef66475f04c8ff90950f1be7004c357ff9472ccbaebc" -"checksum serde_macros 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c3cf1c01933271e1e72bb788e0499d1bca8af2c09efcc3ddc0b04ff22d080b83" "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" "checksum servo-fontconfig-sys 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8e597efa2e1e0883fcb5317e0062d2ffdfed9b926ce8a6f90082be774f39e416" @@ -3011,6 +3003,7 @@ dependencies = [ "checksum smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "fcc8d19212aacecf95e4a7a2179b26f7aeb9732a915cf01f05b0d3e044865410" "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 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" @@ -3026,6 +3019,7 @@ dependencies = [ "checksum unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c1f7ceb96afdfeedee42bade65a0d585a6a0106f681b6749c8ff4daa8df30b3f" "checksum unicode-normalization 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "26643a2f83bac55f1976fb716c10234485f9202dcd65cfbdf9da49867b271172" "checksum unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e5430ae21ef212551680d0021fc7dbd936e8b268c5ea8fdae8814e0b2496d80f" +"checksum unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb" "checksum unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1f2ae5ddb18e1c92664717616dd9549dde73f539f01bd7b77c2edb2446bdff91" "checksum url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "afe9ec54bc4db14bc8744b7fed060d785ac756791450959b2248443319d5b119" "checksum user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ef4711d107b21b410a3a974b1204d9accc8b10dad75d8324b5d755de1617d47" @@ -3040,8 +3034,8 @@ dependencies = [ "checksum wayland-sys 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9633f7fe5de56544215f82eaf1b76bf1b584becf7f08b58cbef4c2c7d10e803a" "checksum wayland-window 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "309b69d3a863c9c21422d889fb7d98cf02f8a2ca054960a49243ce5b67ad884c" "checksum webdriver 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee2d66e90672022ced375134329c57be4db228b19b120b97b744a469c381be06" -"checksum webrender 0.5.1 (git+https://github.com/servo/webrender)" = "" -"checksum webrender_traits 0.5.1 (git+https://github.com/servo/webrender)" = "" +"checksum webrender 0.6.0 (git+https://github.com/servo/webrender)" = "" +"checksum webrender_traits 0.6.0 (git+https://github.com/servo/webrender)" = "" "checksum websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a1a6ea5ed0367f32eb3d94dcc58859ef4294b5f75ba983dbf56ac314af45d" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index 33875799061e..cb62e926809f 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -79,12 +79,12 @@ webdriver_server = {path = "../webdriver_server", optional = true} [dependencies.webrender] git = "https://github.com/servo/webrender" default-features = false -features = ["serde_macros"] +features = ["serde_derive"] [dependencies.webrender_traits] git = "https://github.com/servo/webrender" default_features = false -features = ["serde_macros"] +features = ["serde_derive"] [target.'cfg(not(target_os = "android"))'.dependencies] sig = "0.1" diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 2a208f7ff3df..3cadb80a0cbf 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -13,7 +13,7 @@ path = "lib.rs" [features] gecko = [] -servo = ["serde/unstable", "serde", "serde_macros", "heapsize_plugin", +servo = ["serde/unstable", "serde", "serde_derive", "heapsize_plugin", "style_traits/servo", "app_units/plugins", "cssparser/heap_size", "cssparser/serde-serialization", "selectors/unstable", "string_cache", @@ -45,7 +45,7 @@ rand = "0.3" rustc-serialize = "0.3" selectors = "0.13" serde = {version = "0.8", optional = true} -serde_macros = {version = "0.8", optional = true} +serde_derive = {version = "0.8", optional = true} smallvec = "0.1" string_cache = {version = "0.2.26", features = ["heap_size"], optional = true} style_traits = {path = "../style_traits"} diff --git a/components/style/lib.rs b/components/style/lib.rs index c1b8dd874f06..f02e49998c9a 100644 --- a/components/style/lib.rs +++ b/components/style/lib.rs @@ -26,9 +26,11 @@ #![cfg_attr(feature = "servo", feature(custom_attribute))] #![cfg_attr(feature = "servo", feature(custom_derive))] #![cfg_attr(feature = "servo", feature(plugin))] +#![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))] -#![cfg_attr(feature = "servo", plugin(serde_macros))] #![deny(unsafe_code)] @@ -68,6 +70,7 @@ extern crate rustc_serialize; extern crate selectors; #[cfg(feature = "servo")] extern crate serde; +#[cfg(feature = "servo")] #[macro_use] extern crate serde_derive; extern crate smallvec; #[cfg(feature = "servo")] #[macro_use] extern crate string_cache; #[macro_use] diff --git a/components/style_traits/Cargo.toml b/components/style_traits/Cargo.toml index 871cfc69d9be..9064faaa457a 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_macros", +servo = ["heapsize", "heapsize_plugin", "serde", "serde_derive", "cssparser/heap_size", "cssparser/serde-serialization"] [dependencies] @@ -21,4 +21,4 @@ heapsize = {version = "0.3.0", optional = true} heapsize_plugin = {version = "0.1.2", optional = true} rustc-serialize = "0.3" serde = {version = "0.8", optional = true} -serde_macros = {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 6b538461d440..54657108341b 100644 --- a/components/style_traits/lib.rs +++ b/components/style_traits/lib.rs @@ -13,7 +13,9 @@ #![cfg_attr(feature = "servo", feature(custom_derive))] #![cfg_attr(feature = "servo", feature(plugin))] -#![cfg_attr(feature = "servo", plugin(serde_macros))] +#![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; @@ -23,6 +25,7 @@ extern crate euclid; #[cfg(feature = "servo")] extern crate heapsize; extern crate rustc_serialize; #[cfg(feature = "servo")] extern crate serde; +#[cfg(feature = "servo")] #[macro_use] extern crate serde_derive; /// One CSS "px" in the coordinate system of the "initial viewport": /// http://www.w3.org/TR/css-device-adapt/#initial-viewport diff --git a/components/util/Cargo.toml b/components/util/Cargo.toml index b4a9a92ebdca..c024f21e92df 100644 --- a/components/util/Cargo.toml +++ b/components/util/Cargo.toml @@ -11,7 +11,7 @@ path = "lib.rs" [features] # servo as opposed to geckolib -servo = ["serde", "serde_macros", "ipc-channel", "app_units/plugins", +servo = ["serde", "serde_derive", "ipc-channel", "app_units/plugins", "euclid/unstable", "url/heap_size", "url/serde", "plugins"] [dependencies] @@ -26,7 +26,7 @@ log = "0.3.5" num_cpus = "0.2.2" rustc-serialize = "0.3" serde = {version = "0.8", optional = true} -serde_macros = {version = "0.8", optional = true} +serde_derive = {version = "0.8", optional = true} url = "1.2" plugins = {path = "../plugins", optional = true} diff --git a/components/util/lib.rs b/components/util/lib.rs index 11b6afbbc8e7..ee3bb09921e6 100644 --- a/components/util/lib.rs +++ b/components/util/lib.rs @@ -3,10 +3,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #![cfg_attr(feature = "servo", feature(custom_derive))] -#![cfg_attr(feature = "servo", feature(plugin))] #![cfg_attr(feature = "servo", feature(nonzero))] +#![cfg_attr(feature = "servo", feature(plugin))] +#![cfg_attr(feature = "servo", feature(proc_macro))] #![cfg_attr(feature = "servo", feature(reflect_marker))] -#![cfg_attr(feature = "servo", plugin(serde_macros))] +#![cfg_attr(feature = "servo", feature(structural_match))] #![cfg_attr(feature = "servo", plugin(plugins))] #![deny(unsafe_code)] @@ -23,6 +24,7 @@ extern crate getopts; extern crate num_cpus; extern crate rustc_serialize; #[cfg(feature = "servo")] extern crate serde; +#[cfg(feature = "servo")] #[macro_use] extern crate serde_derive; extern crate url; #[cfg(all(unix, not(target_os = "macos"), not(target_os = "ios"), not(target_os = "android")))] extern crate xdg; diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index e5625ca7ce1d..e361965dfa3a 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -70,11 +70,6 @@ dependencies = [ "odds 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "aster" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "audio-video-metadata" version = "0.1.2" @@ -87,8 +82,8 @@ dependencies = [ [[package]] name = "azure" -version = "0.8.0" -source = "git+https://github.com/servo/rust-azure#9fb666b2fc86b23761f9b0f877a3d42f182263a9" +version = "0.9.0" +source = "git+https://github.com/servo/rust-azure#4a2ca5018c97d356a2d2959a074ca98e1f6adba8" 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)", @@ -100,7 +95,7 @@ dependencies = [ "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.8.12 (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)", @@ -200,7 +195,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "canvas" version = "0.0.1" dependencies = [ - "azure 0.8.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.0 (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)", "gfx_traits 0.0.1", @@ -211,14 +206,14 @@ dependencies = [ "offscreen_gl_context 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "util 0.0.1", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", ] [[package]] name = "canvas_traits" version = "0.0.1" dependencies = [ - "azure 0.8.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.0 (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)", "gfx_traits 0.0.1", @@ -227,8 +222,8 @@ dependencies = [ "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "serde_derive 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -284,7 +279,7 @@ name = "compositing" version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.8.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.0 (git+https://github.com/servo/rust-azure)", "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "gleam 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", @@ -298,13 +293,13 @@ dependencies = [ "profile_traits 0.0.1", "script_traits 0.0.1", "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.8.12 (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)", "util 0.0.1", - "webrender 0.5.1 (git+https://github.com/servo/webrender)", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "webrender 0.6.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -332,11 +327,11 @@ dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.8.12 (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", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -477,8 +472,8 @@ dependencies = [ "msg 0.0.1", "plugins 0.0.1", "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (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", ] @@ -495,7 +490,7 @@ dependencies = [ "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.8.12 (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)", ] @@ -702,7 +697,7 @@ name = "gfx" version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.8.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.0 (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)", @@ -732,7 +727,7 @@ dependencies = [ "range 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.8.12 (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)", @@ -743,7 +738,7 @@ dependencies = [ "unicode-script 0.1.1 (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", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "xi-unicode 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -752,7 +747,7 @@ dependencies = [ name = "gfx_traits" version = "0.0.1" dependencies = [ - "azure 0.8.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.0 (git+https://github.com/servo/rust-azure)", "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)", @@ -763,7 +758,7 @@ dependencies = [ "range 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -893,8 +888,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.16 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.17 (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)", @@ -1078,7 +1073,7 @@ name = "layout" version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.8.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.0 (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)", @@ -1101,7 +1096,7 @@ dependencies = [ "script_layout_interface 0.0.1", "script_traits 0.0.1", "selectors 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.8.12 (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", @@ -1110,7 +1105,7 @@ dependencies = [ "unicode-script 0.1.1 (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", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1118,7 +1113,7 @@ name = "layout_thread" version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.8.0 (git+https://github.com/servo/rust-azure)", + "azure 0.9.0 (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", @@ -1137,12 +1132,12 @@ dependencies = [ "script 0.0.1", "script_layout_interface 0.0.1", "script_traits 0.0.1", + "serde_derive 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (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)", "util 0.0.1", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1157,7 +1152,7 @@ dependencies = [ "script_traits 0.0.1", "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1279,8 +1274,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.16 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1328,9 +1323,9 @@ dependencies = [ "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1368,7 +1363,7 @@ dependencies = [ "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)", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1400,7 +1395,7 @@ dependencies = [ "msg 0.0.1", "num-traits 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.8.12 (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)", @@ -1629,42 +1624,42 @@ dependencies = [ [[package]] name = "phf" -version = "0.7.16" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_shared 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_codegen" -version = "0.7.16" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_generator 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_generator" -version = "0.7.16" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_shared 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.17 (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.16" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_generator 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_shared" -version = "0.7.16" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1710,8 +1705,8 @@ dependencies = [ "profile_traits 0.0.1", "regex 0.1.76 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (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)", "util 0.0.1", @@ -1724,33 +1719,12 @@ dependencies = [ "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.8.12 (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", ] -[[package]] -name = "quasi" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "quasi_codegen" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "aster 0.27.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "quasi_macros" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "quasi_codegen 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "quickersort" version = "2.1.0" @@ -1760,6 +1734,11 @@ dependencies = [ "unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "quote" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "rand" version = "0.3.14" @@ -1777,7 +1756,7 @@ dependencies = [ "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.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1871,8 +1850,8 @@ dependencies = [ "offscreen_gl_context 0.4.3 (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.16 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_macros 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_macros 0.7.17 (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)", @@ -1892,7 +1871,7 @@ dependencies = [ "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)", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", "xml5ever 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1948,7 +1927,7 @@ dependencies = [ "profile_traits 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.8.12 (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)", @@ -1979,19 +1958,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde_codegen" -version = "0.8.9" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.27.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi_macros 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_codegen_internals 0.8.9 (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)", ] [[package]] name = "serde_codegen_internals" -version = "0.8.9" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "syn 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "serde_derive" +version = "0.8.12" +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)", +] [[package]] name = "serde_json" @@ -2004,14 +1993,6 @@ dependencies = [ "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "serde_macros" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "serde_codegen 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "servo" version = "0.0.1" @@ -2050,8 +2031,8 @@ dependencies = [ "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webdriver_server 0.0.1", - "webrender 0.5.1 (git+https://github.com/servo/webrender)", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "webrender 0.6.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -2194,8 +2175,8 @@ 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.16 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2229,7 +2210,7 @@ dependencies = [ "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.8.12 (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", @@ -2250,7 +2231,16 @@ dependencies = [ "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.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "syn" +version = "0.9.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)", + "unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2380,6 +2370,11 @@ dependencies = [ "harfbuzz-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "unicode-xid" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "unreachable" version = "0.1.1" @@ -2439,7 +2434,7 @@ dependencies = [ "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.8.12 (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)", ] @@ -2555,8 +2550,8 @@ dependencies = [ [[package]] name = "webrender" -version = "0.5.1" -source = "git+https://github.com/servo/webrender#98e7331d48620ac1c03397ebbbf526b60e62258b" +version = "0.6.0" +source = "git+https://github.com/servo/webrender#b31b4cf76324bfbe82d27a059e1330ef5ae34c35" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2575,13 +2570,13 @@ dependencies = [ "offscreen_gl_context 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", + "webrender_traits 0.6.0 (git+https://github.com/servo/webrender)", ] [[package]] name = "webrender_traits" -version = "0.5.1" -source = "git+https://github.com/servo/webrender#98e7331d48620ac1c03397ebbbf526b60e62258b" +version = "0.6.0" +source = "git+https://github.com/servo/webrender#b31b4cf76324bfbe82d27a059e1330ef5ae34c35" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2592,7 +2587,7 @@ dependencies = [ "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "offscreen_gl_context 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2674,8 +2669,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.16 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.17 (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)", @@ -2689,9 +2684,8 @@ dependencies = [ "checksum angle 0.1.2 (git+https://github.com/servo/angle?branch=servo)" = "" "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 aster 0.27.0 (registry+https://github.com/rust-lang/crates.io-index)" = "258989846dd255a1e0eeef92d425d345477c9999433cecc9f0879f4549d5e5c9" "checksum audio-video-metadata 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "03da2550cb89fe3faf218c179261c26cf7891c4234707c15f5d09ebb32ae2400" -"checksum azure 0.8.0 (git+https://github.com/servo/rust-azure)" = "" +"checksum azure 0.9.0 (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" @@ -2822,18 +2816,16 @@ dependencies = [ "checksum owning_ref 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88084505837507cbec6a9f39b5d3b985db3c84e9a741c80200b619001283293d" "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.16 (registry+https://github.com/rust-lang/crates.io-index)" = "52c875926de24c01b5b69153eaa258b57920a39b44bbce8ef1f2052a6c5a6a1a" -"checksum phf_codegen 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)" = "0a8912c2cc0ea2e8ae70388ec0af9a445e7ab37b3c9cc61f059c2b34db8ed50b" -"checksum phf_generator 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)" = "04b5ea825e28cb6efd89d9133b129b2003b45a221aeda025509b125b00ecb7c4" -"checksum phf_macros 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)" = "132ea70eed654520d98d0e54e262292a94bd5f150671d98b9c8d0782fafce37e" -"checksum phf_shared 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)" = "2c43b5dbe94d31f1f4ed45c50bb06d70e72fd53f15422b0a915b5c237e130dd6" +"checksum phf 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)" = "f02853ab706e88121d7ad33ed06bedce0a7cdb96136be7c20ff0dce7b4adb9ef" +"checksum phf_codegen 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)" = "563b670811792d49bff142e7bb9787530d9b689fb4c55c6c309822d8d956a242" +"checksum phf_generator 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)" = "21416830a6c83526443b960fd41b5e18f64c4e4f90970499aeed2be592029042" +"checksum phf_macros 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)" = "1ce32ea1f8124c0a5a67611e47d9deb1874d213154213e6659e385d477e65933" +"checksum phf_shared 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)" = "4a65f09191172833c798d31e5317ecd1e4be890a3d5acc6c2f85e1460c8828bd" "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 quasi 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50d83f9f141f12a586aae8eefa4fdb39a273fc1a1f4cfb252a4cb566a9ca8985" -"checksum quasi_codegen 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cfb4a9a5410fdbdacbeda8063ddb8add9838dfd4cf50ac486db98abb762d8bd6" -"checksum quasi_macros 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "adc2b36285ea5e54e4e267f83896267ff8c5aba4f66b2e7d186ed6d968f3715f" "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" "checksum rayon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e501871917624668fe601ad12a730450414f9b0b64722a898b040ce3ae1b0fa" "checksum ref_slice 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "546bb4aa91c85f232732cc5b3c8097ea97ae9a77304f9ab4df8b203ff7672dad" @@ -2846,10 +2838,10 @@ dependencies = [ "checksum selectors 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1f844a32e73a0d8e59a76036751fcb5581ca1ded4f2f2f3dc21720a80ba908af" "checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac" "checksum serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8523fd515099dac5b5abd25b0b9f9709d40eedf03f72ca519903bf138a6577be" -"checksum serde_codegen 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)" = "da68810d845f8e33a80243c28794650397056cbe7aea4c9c7516f55d1061c94e" -"checksum serde_codegen_internals 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1b0115c5c602e81c61b787fb0f0fa76a614f8dbe9100b2b59b7d590155672c80" +"checksum serde_codegen 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b64ecfe57712501e861b303982b549cfd56aed0ebf58823b36093d1807d69b" +"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_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0e10f8a9d94b06cf5d3bef66475f04c8ff90950f1be7004c357ff9472ccbaebc" -"checksum serde_macros 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c3cf1c01933271e1e72bb788e0499d1bca8af2c09efcc3ddc0b04ff22d080b83" "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" "checksum servo-fontconfig-sys 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8e597efa2e1e0883fcb5317e0062d2ffdfed9b926ce8a6f90082be774f39e416" @@ -2864,6 +2856,7 @@ dependencies = [ "checksum smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "fcc8d19212aacecf95e4a7a2179b26f7aeb9732a915cf01f05b0d3e044865410" "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 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" @@ -2879,6 +2872,7 @@ dependencies = [ "checksum unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c1f7ceb96afdfeedee42bade65a0d585a6a0106f681b6749c8ff4daa8df30b3f" "checksum unicode-normalization 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "26643a2f83bac55f1976fb716c10234485f9202dcd65cfbdf9da49867b271172" "checksum unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e5430ae21ef212551680d0021fc7dbd936e8b268c5ea8fdae8814e0b2496d80f" +"checksum unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb" "checksum unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1f2ae5ddb18e1c92664717616dd9549dde73f539f01bd7b77c2edb2446bdff91" "checksum url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "afe9ec54bc4db14bc8744b7fed060d785ac756791450959b2248443319d5b119" "checksum user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ef4711d107b21b410a3a974b1204d9accc8b10dad75d8324b5d755de1617d47" @@ -2893,8 +2887,8 @@ dependencies = [ "checksum wayland-sys 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9633f7fe5de56544215f82eaf1b76bf1b584becf7f08b58cbef4c2c7d10e803a" "checksum wayland-window 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "309b69d3a863c9c21422d889fb7d98cf02f8a2ca054960a49243ce5b67ad884c" "checksum webdriver 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee2d66e90672022ced375134329c57be4db228b19b120b97b744a469c381be06" -"checksum webrender 0.5.1 (git+https://github.com/servo/webrender)" = "" -"checksum webrender_traits 0.5.1 (git+https://github.com/servo/webrender)" = "" +"checksum webrender 0.6.0 (git+https://github.com/servo/webrender)" = "" +"checksum webrender_traits 0.6.0 (git+https://github.com/servo/webrender)" = "" "checksum websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a1a6ea5ed0367f32eb3d94dcc58859ef4294b5f75ba983dbf56ac314af45d" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" diff --git a/rust-nightly-date b/rust-nightly-date index 253cff71b29e..7a8b72d2b7a0 100644 --- a/rust-nightly-date +++ b/rust-nightly-date @@ -1 +1 @@ -2016-09-21 +2016-10-09