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

@@ -1 +1 @@
-2016-09-20
+2016-10-09

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"]

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"]

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};

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"]

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;

components/constellation/Cargo.toml

@@ -30,15 +30,15 @@ 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"}
 
 [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"}

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]

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"}

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;

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"]}

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;
 

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"

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;

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"

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;

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"]

components/layout_thread/Cargo.toml

@@ -30,13 +30,13 @@ 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"}
 
 [dependencies.webrender_traits]
 git = "https://github.com/servo/webrender"
 default_features = false
-features = ["serde_macros"]
+features = ["serde_derive"]

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"]

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"]

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;
 

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"}

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"] }

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;

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]

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;

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"}