servo: Merge #14040 - Remove last use of custom derive plugin (from nox:custom-derive); r=Ms2ger
authorAnthony Ramine <n.oxyde@gmail.com>
Thu, 03 Nov 2016 06:15:25 -0500
changeset 340047 d1e896c7c0a5b5e1af1d1d1d20642914730389b7
parent 340046 bb4f4088aee670ade83ca1303eb460d530b6ccb7
child 340048 e72716e9f46287328c601d5d07331bb623286aae
push id31307
push usergszorc@mozilla.com
push dateSat, 04 Feb 2017 00:59:06 +0000
treeherdermozilla-central@94079d43835f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMs2ger
servo: Merge #14040 - Remove last use of custom derive plugin (from nox:custom-derive); r=Ms2ger Source-Repo: https://github.com/servo/servo Source-Revision: e3493cdd26f6faab0ddf6503ad19f0af169ad880
servo/components/canvas_traits/lib.rs
servo/components/compositing/lib.rs
servo/components/constellation/lib.rs
servo/components/devtools/lib.rs
servo/components/devtools_traits/lib.rs
servo/components/gfx/lib.rs
servo/components/gfx_traits/lib.rs
servo/components/layout/lib.rs
servo/components/layout_thread/lib.rs
servo/components/msg/lib.rs
servo/components/net/Cargo.toml
servo/components/net/lib.rs
servo/components/net_traits/lib.rs
servo/components/profile/lib.rs
servo/components/profile_traits/lib.rs
servo/components/range/lib.rs
servo/components/script/lib.rs
servo/components/script_layout_interface/lib.rs
servo/components/script_traits/lib.rs
servo/components/servo/Cargo.lock
servo/components/style/lib.rs
servo/components/style_traits/lib.rs
servo/components/util/lib.rs
servo/ports/cef/Cargo.lock
--- a/servo/components/canvas_traits/lib.rs
+++ b/servo/components/canvas_traits/lib.rs
@@ -1,18 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #![crate_name = "canvas_traits"]
 #![crate_type = "rlib"]
-#![feature(custom_derive)]
 #![feature(plugin)]
 #![feature(proc_macro)]
-#![feature(rustc_attrs)]
 #![plugin(plugins)]
 
 #![deny(unsafe_code)]
 
 extern crate azure;
 extern crate core;
 extern crate cssparser;
 extern crate euclid;
--- a/servo/components/compositing/lib.rs
+++ b/servo/components/compositing/lib.rs
@@ -1,14 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #![feature(box_syntax)]
-#![feature(custom_derive)]
 #![feature(plugin)]
 #![feature(proc_macro)]
 #![plugin(plugins)]
 
 #![deny(unsafe_code)]
 
 extern crate euclid;
 extern crate gfx_traits;
--- a/servo/components/constellation/lib.rs
+++ b/servo/components/constellation/lib.rs
@@ -1,14 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #![feature(box_syntax)]
-#![feature(custom_derive)]
 #![feature(mpsc_select)]
 #![feature(plugin)]
 #![feature(proc_macro)]
 #![plugin(plugins)]
 
 #![deny(unsafe_code)]
 
 extern crate backtrace;
--- a/servo/components/devtools/lib.rs
+++ b/servo/components/devtools/lib.rs
@@ -6,18 +6,16 @@
 //! nightly Firefox versions at time of writing. Largely based on
 //! reverse-engineering of Firefox chrome devtool logs and reading of
 //! [code](http://mxr.mozilla.org/mozilla-central/source/toolkit/devtools/server/).
 
 #![crate_name = "devtools"]
 #![crate_type = "rlib"]
 
 #![feature(box_syntax)]
-#![feature(custom_attribute)]
-#![feature(custom_derive)]
 #![feature(plugin)]
 #![feature(proc_macro)]
 #![plugin(plugins)]
 
 #![allow(non_snake_case)]
 #![deny(unsafe_code)]
 
 extern crate devtools_traits;
--- a/servo/components/devtools_traits/lib.rs
+++ b/servo/components/devtools_traits/lib.rs
@@ -7,17 +7,17 @@
 //! modified independently of the rest of Servo.
 
 #![crate_name = "devtools_traits"]
 #![crate_type = "rlib"]
 
 #![allow(non_snake_case)]
 #![deny(unsafe_code)]
 
-#![feature(proc_macro, rustc_attrs, structural_match)]
+#![feature(proc_macro)]
 
 #[allow(unused_extern_crates)]
 #[macro_use]
 extern crate bitflags;
 extern crate heapsize;
 #[macro_use] extern crate heapsize_derive;
 extern crate hyper;
 extern crate ipc_channel;
--- a/servo/components/gfx/lib.rs
+++ b/servo/components/gfx/lib.rs
@@ -2,23 +2,19 @@
  * 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/. */
 
 // For simd (currently x86_64/aarch64)
 #![cfg_attr(any(target_os = "linux", target_os = "android", target_os = "windows"), feature(heap_api))]
 
 #![feature(alloc)]
 #![feature(box_syntax)]
-#![feature(custom_attribute)]
-#![feature(custom_derive)]
 #![feature(plugin)]
 #![feature(proc_macro)]
 #![feature(range_contains)]
-#![feature(rustc_attrs)]
-#![feature(structural_match)]
 #![feature(unique)]
 
 #![plugin(plugins)]
 
 #![deny(unsafe_code)]
 
 extern crate alloc;
 extern crate app_units;
--- a/servo/components/gfx_traits/lib.rs
+++ b/servo/components/gfx_traits/lib.rs
@@ -1,13 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#![feature(custom_derive, plugin, proc_macro, rustc_attrs, structural_match)]
+#![feature(plugin, proc_macro)]
 #![plugin(plugins)]
 
 #![crate_name = "gfx_traits"]
 #![crate_type = "rlib"]
 
 #![deny(unsafe_code)]
 
 extern crate heapsize;
--- a/servo/components/layout/lib.rs
+++ b/servo/components/layout/lib.rs
@@ -1,16 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #![feature(box_patterns)]
 #![feature(box_syntax)]
 #![feature(conservative_impl_trait)]
-#![feature(custom_derive)]
 #![feature(nonzero)]
 #![feature(plugin)]
 #![feature(proc_macro)]
 #![feature(raw)]
 #![feature(step_by)]
 
 #![deny(unsafe_code)]
 
--- a/servo/components/layout_thread/lib.rs
+++ b/servo/components/layout_thread/lib.rs
@@ -1,17 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 //! The layout thread. Performs layout on the DOM, builds display lists and sends them to be
 //! painted.
 
 #![feature(box_syntax)]
-#![feature(custom_derive)]
 #![feature(mpsc_select)]
 #![feature(plugin)]
 #![feature(proc_macro)]
 
 #![plugin(plugins)]
 
 extern crate app_units;
 extern crate azure;
--- a/servo/components/msg/lib.rs
+++ b/servo/components/msg/lib.rs
@@ -1,13 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#![feature(custom_attribute, custom_derive, plugin, proc_macro, rustc_attrs, structural_match)]
+#![feature(plugin, proc_macro)]
 #![plugin(plugins)]
 
 #![deny(unsafe_code)]
 
 #[allow(unused_extern_crates)]
 #[macro_use]
 extern crate bitflags;
 extern crate heapsize;
--- a/servo/components/net/Cargo.toml
+++ b/servo/components/net/Cargo.toml
@@ -29,16 +29,18 @@ mime_guess = "1.8.0"
 msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
 openssl = "0.7.6"
 openssl-verify = "0.1"
 plugins = {path = "../plugins"}
 profile_traits = {path = "../profile_traits"}
 rand = "0.3"
 rustc-serialize = "0.3"
+serde = "0.8"
+serde_derive = "0.8"
 threadpool = "1.0"
 time = "0.1.17"
 unicase = "1.4.0"
 url = {version = "1.2", features = ["heap_size", "rustc-serialize"]}
 util = {path = "../util"}
 uuid = {version = "0.3.1", features = ["v4"]}
 websocket = "0.17"
 
--- a/servo/components/net/lib.rs
+++ b/servo/components/net/lib.rs
@@ -1,18 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #![feature(box_syntax)]
-#![feature(custom_attribute)]
-#![feature(custom_derive)]
 #![feature(fnbox)]
 #![feature(mpsc_select)]
 #![feature(plugin)]
+#![feature(proc_macro)]
 #![plugin(plugins)]
 
 #![deny(unsafe_code)]
 
 #[macro_use]
 extern crate bitflags;
 extern crate brotli;
 extern crate content_blocker as content_blocker_parser;
@@ -32,16 +31,18 @@ extern crate mime;
 extern crate mime_guess;
 extern crate msg;
 extern crate net_traits;
 extern crate openssl;
 extern crate openssl_verify;
 extern crate profile_traits;
 extern crate rand;
 extern crate rustc_serialize;
+#[macro_use]
+extern crate serde_derive;
 extern crate threadpool;
 extern crate time;
 #[cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))]
 extern crate tinyfiledialogs;
 extern crate unicase;
 extern crate url;
 extern crate util;
 extern crate uuid;
--- a/servo/components/net_traits/lib.rs
+++ b/servo/components/net_traits/lib.rs
@@ -1,19 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #![feature(box_syntax)]
-#![feature(custom_attribute)]
 #![feature(proc_macro)]
-#![feature(rustc_attrs)]
 #![feature(slice_patterns)]
 #![feature(step_by)]
-#![feature(structural_match)]
 
 #![deny(unsafe_code)]
 
 extern crate cookie as cookie_rs;
 extern crate heapsize;
 #[macro_use] extern crate heapsize_derive;
 extern crate hyper;
 extern crate hyper_serde;
--- a/servo/components/profile/lib.rs
+++ b/servo/components/profile/lib.rs
@@ -1,15 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #![cfg_attr(not(target_os = "windows"), feature(alloc_jemalloc))]
 #![feature(box_syntax)]
-#![feature(custom_derive)]
 #![feature(plugin)]
 #![feature(proc_macro)]
 #![plugin(plugins)]
 
 #![deny(unsafe_code)]
 
 #[allow(unused_extern_crates)]
 #[cfg(not(target_os = "windows"))]
--- a/servo/components/profile_traits/lib.rs
+++ b/servo/components/profile_traits/lib.rs
@@ -2,17 +2,17 @@
  * 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/. */
 
 //! This module contains APIs for the `profile` crate used generically in the
 //! rest of Servo. These APIs are here instead of in `profile` so that these
 //! modules won't have to depend on `profile`.
 
 #![feature(box_syntax)]
-#![feature(custom_derive, plugin, proc_macro, rustc_attrs, structural_match)]
+#![feature(plugin, proc_macro)]
 #![plugin(plugins)]
 
 #![deny(unsafe_code)]
 
 extern crate ipc_channel;
 extern crate serde;
 #[macro_use]
 extern crate serde_derive;
--- a/servo/components/range/lib.rs
+++ b/servo/components/range/lib.rs
@@ -1,14 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #![feature(proc_macro)]
-#![feature(rustc_attrs)]
 #![feature(step_trait)]
 
 #![deny(unsafe_code)]
 
 extern crate heapsize;
 #[macro_use] extern crate heapsize_derive;
 extern crate num_traits;
 extern crate rustc_serialize;
--- a/servo/components/script/lib.rs
+++ b/servo/components/script/lib.rs
@@ -1,18 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #![feature(box_syntax)]
 #![feature(conservative_impl_trait)]
 #![feature(const_fn)]
 #![feature(core_intrinsics)]
-#![feature(custom_attribute)]
-#![feature(custom_derive)]
 #![feature(fnbox)]
 #![feature(mpsc_select)]
 #![feature(nonzero)]
 #![feature(on_unimplemented)]
 #![feature(optin_builtin_traits)]
 #![feature(plugin)]
 #![feature(proc_macro)]
 #![feature(slice_patterns)]
--- a/servo/components/script_layout_interface/lib.rs
+++ b/servo/components/script_layout_interface/lib.rs
@@ -3,18 +3,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 //! This module contains traits in script used generically in the rest of Servo.
 //! The traits are here instead of in script so that these modules won't have
 //! to depend on script.
 
 #![deny(unsafe_code)]
 #![feature(box_syntax)]
-#![feature(custom_attribute)]
-#![feature(custom_derive)]
 #![feature(nonzero)]
 #![feature(plugin)]
 #![feature(proc_macro)]
 #![plugin(plugins)]
 
 extern crate app_units;
 #[allow(unused_extern_crates)]
 #[macro_use]
--- a/servo/components/script_traits/lib.rs
+++ b/servo/components/script_traits/lib.rs
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 //! This module contains traits in script used generically in the rest of Servo.
 //! The traits are here instead of in script so that these modules won't have
 //! to depend on script.
 
-#![feature(custom_derive, plugin, proc_macro, rustc_attrs, structural_match)]
+#![feature(plugin, proc_macro)]
 #![plugin(plugins)]
 #![deny(missing_docs)]
 #![deny(unsafe_code)]
 
 extern crate canvas_traits;
 extern crate cookie as cookie_rs;
 extern crate devtools_traits;
 extern crate euclid;
--- a/servo/components/servo/Cargo.lock
+++ b/servo/components/servo/Cargo.lock
@@ -1434,16 +1434,18 @@ dependencies = [
  "msg 0.0.1",
  "net_traits 0.0.1",
  "openssl 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl-verify 0.1.0 (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)",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "threadpool 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
  "tinyfiledialogs 0.1.0 (git+https://github.com/jdm/tinyfiledialogs)",
  "unicase 1.4.0 (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)",
  "webrender_traits 0.8.0 (git+https://github.com/servo/webrender)",
--- a/servo/components/style/lib.rs
+++ b/servo/components/style/lib.rs
@@ -18,22 +18,18 @@
 //! [recalc_style_at]: traversal/fn.recalc_style_at.html
 //!
 //! Major dependencies are the [cssparser][cssparser] and [selectors][selectors]
 //! crates.
 //!
 //! [cssparser]: ../cssparser/index.html
 //! [selectors]: ../selectors/index.html
 
-#![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(plugins))]
 
 #![deny(warnings)]
 
 // FIXME(bholley): We need to blanket-allow unsafe code in order to make the
 // gecko atom!() macro work. When Rust 1.14 is released [1], we can uncomment
 // the commented-out attributes in regen_atoms.py and go back to denying unsafe
 // code by default.
--- a/servo/components/style_traits/lib.rs
+++ b/servo/components/style_traits/lib.rs
@@ -6,21 +6,18 @@
 //! The traits are here instead of in script so that the devtools crate can be
 //! modified independently of the rest of Servo.
 
 #![crate_name = "style_traits"]
 #![crate_type = "rlib"]
 
 #![deny(unsafe_code)]
 
-#![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))]
 
 extern crate app_units;
 #[macro_use]
 extern crate cssparser;
 extern crate euclid;
 #[cfg(feature = "servo")] extern crate heapsize;
 #[cfg(feature = "servo")] #[macro_use] extern crate heapsize_derive;
 extern crate rustc_serialize;
--- a/servo/components/util/lib.rs
+++ b/servo/components/util/lib.rs
@@ -1,17 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#![cfg_attr(feature = "servo", feature(custom_derive))]
 #![cfg_attr(feature = "servo", feature(nonzero))]
 #![cfg_attr(feature = "servo", feature(plugin))]
 #![cfg_attr(feature = "servo", feature(proc_macro))]
-#![cfg_attr(feature = "servo", feature(structural_match))]
 #![cfg_attr(feature = "servo", plugin(plugins))]
 
 #![deny(unsafe_code)]
 
 extern crate app_units;
 #[allow(unused_extern_crates)] #[macro_use] extern crate bitflags;
 extern crate core;
 #[macro_use] extern crate euclid;
--- a/servo/ports/cef/Cargo.lock
+++ b/servo/ports/cef/Cargo.lock
@@ -1334,16 +1334,18 @@ dependencies = [
  "msg 0.0.1",
  "net_traits 0.0.1",
  "openssl 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl-verify 0.1.0 (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)",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "threadpool 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
  "tinyfiledialogs 0.1.0 (git+https://github.com/jdm/tinyfiledialogs)",
  "unicase 1.4.0 (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)",
  "webrender_traits 0.8.0 (git+https://github.com/servo/webrender)",