From 0a48c69061565217a9c6eb373677df297b195b22 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Thu, 3 Nov 2016 10:10:00 +0100 Subject: [PATCH 1/5] Remove use of serde custom derive plugin in net --- components/net/Cargo.toml | 2 ++ components/net/lib.rs | 3 +++ components/servo/Cargo.lock | 2 ++ ports/cef/Cargo.lock | 2 ++ 4 files changed, 9 insertions(+) diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index 6bd755faf0b..b4f1689efe5 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -34,6 +34,8 @@ 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" diff --git a/components/net/lib.rs b/components/net/lib.rs index 4ca85975344..4fc91cc2e7f 100644 --- a/components/net/lib.rs +++ b/components/net/lib.rs @@ -8,6 +8,7 @@ #![feature(fnbox)] #![feature(mpsc_select)] #![feature(plugin)] +#![feature(proc_macro)] #![plugin(plugins)] #![deny(unsafe_code)] @@ -37,6 +38,8 @@ 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"))] diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index a2da0461e02..94a45baed82 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -1439,6 +1439,8 @@ dependencies = [ "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)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index b14fc7f0c41..deb178707da 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -1339,6 +1339,8 @@ dependencies = [ "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)", From c4f27e42b77d23614a36dd694a44313f510950da Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Thu, 3 Nov 2016 10:14:21 +0100 Subject: [PATCH 2/5] Remove #![feature(custom_derive)] --- components/canvas_traits/lib.rs | 1 - components/compositing/lib.rs | 1 - components/constellation/lib.rs | 1 - components/devtools/lib.rs | 1 - components/gfx/lib.rs | 1 - components/gfx_traits/lib.rs | 2 +- components/layout/lib.rs | 1 - components/layout_thread/lib.rs | 1 - components/msg/lib.rs | 2 +- components/net/lib.rs | 1 - components/profile/lib.rs | 1 - components/profile_traits/lib.rs | 2 +- components/script/lib.rs | 1 - components/script_layout_interface/lib.rs | 1 - components/script_traits/lib.rs | 2 +- components/style/lib.rs | 1 - components/style_traits/lib.rs | 1 - components/util/lib.rs | 1 - 18 files changed, 4 insertions(+), 18 deletions(-) diff --git a/components/canvas_traits/lib.rs b/components/canvas_traits/lib.rs index ec30efe03db..d255e562bcc 100644 --- a/components/canvas_traits/lib.rs +++ b/components/canvas_traits/lib.rs @@ -4,7 +4,6 @@ #![crate_name = "canvas_traits"] #![crate_type = "rlib"] -#![feature(custom_derive)] #![feature(plugin)] #![feature(proc_macro)] #![feature(rustc_attrs)] diff --git a/components/compositing/lib.rs b/components/compositing/lib.rs index e976b52f09e..ee67e959157 100644 --- a/components/compositing/lib.rs +++ b/components/compositing/lib.rs @@ -3,7 +3,6 @@ * 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)] diff --git a/components/constellation/lib.rs b/components/constellation/lib.rs index 072d8605712..fe3755ad88f 100644 --- a/components/constellation/lib.rs +++ b/components/constellation/lib.rs @@ -3,7 +3,6 @@ * 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)] diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs index 8e596dbe791..3e638a3ca4a 100644 --- a/components/devtools/lib.rs +++ b/components/devtools/lib.rs @@ -12,7 +12,6 @@ #![feature(box_syntax)] #![feature(custom_attribute)] -#![feature(custom_derive)] #![feature(plugin)] #![feature(proc_macro)] #![plugin(plugins)] diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs index b3228018181..b0aa58f895d 100644 --- a/components/gfx/lib.rs +++ b/components/gfx/lib.rs @@ -8,7 +8,6 @@ #![feature(alloc)] #![feature(box_syntax)] #![feature(custom_attribute)] -#![feature(custom_derive)] #![feature(plugin)] #![feature(proc_macro)] #![feature(range_contains)] diff --git a/components/gfx_traits/lib.rs b/components/gfx_traits/lib.rs index 80b45444e3f..a7723683eca 100644 --- a/components/gfx_traits/lib.rs +++ b/components/gfx_traits/lib.rs @@ -2,7 +2,7 @@ * 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, rustc_attrs, structural_match)] #![plugin(plugins)] #![crate_name = "gfx_traits"] diff --git a/components/layout/lib.rs b/components/layout/lib.rs index 57fd7b3e98e..59c59bed502 100644 --- a/components/layout/lib.rs +++ b/components/layout/lib.rs @@ -5,7 +5,6 @@ #![feature(box_patterns)] #![feature(box_syntax)] #![feature(conservative_impl_trait)] -#![feature(custom_derive)] #![feature(nonzero)] #![feature(plugin)] #![feature(proc_macro)] diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs index f330054441b..788fff29a5c 100644 --- a/components/layout_thread/lib.rs +++ b/components/layout_thread/lib.rs @@ -6,7 +6,6 @@ //! painted. #![feature(box_syntax)] -#![feature(custom_derive)] #![feature(mpsc_select)] #![feature(plugin)] #![feature(proc_macro)] diff --git a/components/msg/lib.rs b/components/msg/lib.rs index 788229acb64..47b6a781cbf 100644 --- a/components/msg/lib.rs +++ b/components/msg/lib.rs @@ -2,7 +2,7 @@ * 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(custom_attribute, plugin, proc_macro, rustc_attrs, structural_match)] #![plugin(plugins)] #![deny(unsafe_code)] diff --git a/components/net/lib.rs b/components/net/lib.rs index 4fc91cc2e7f..2ab6a1b9ff7 100644 --- a/components/net/lib.rs +++ b/components/net/lib.rs @@ -4,7 +4,6 @@ #![feature(box_syntax)] #![feature(custom_attribute)] -#![feature(custom_derive)] #![feature(fnbox)] #![feature(mpsc_select)] #![feature(plugin)] diff --git a/components/profile/lib.rs b/components/profile/lib.rs index 6df11fa1ebd..5e1c4804dc9 100644 --- a/components/profile/lib.rs +++ b/components/profile/lib.rs @@ -4,7 +4,6 @@ #![cfg_attr(not(target_os = "windows"), feature(alloc_jemalloc))] #![feature(box_syntax)] -#![feature(custom_derive)] #![feature(plugin)] #![feature(proc_macro)] #![plugin(plugins)] diff --git a/components/profile_traits/lib.rs b/components/profile_traits/lib.rs index 2149614d4a5..c56196a9e2f 100644 --- a/components/profile_traits/lib.rs +++ b/components/profile_traits/lib.rs @@ -7,7 +7,7 @@ //! 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, rustc_attrs, structural_match)] #![plugin(plugins)] #![deny(unsafe_code)] diff --git a/components/script/lib.rs b/components/script/lib.rs index ed4fcf8b5ee..f1ddb8d82bc 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -7,7 +7,6 @@ #![feature(const_fn)] #![feature(core_intrinsics)] #![feature(custom_attribute)] -#![feature(custom_derive)] #![feature(fnbox)] #![feature(mpsc_select)] #![feature(nonzero)] diff --git a/components/script_layout_interface/lib.rs b/components/script_layout_interface/lib.rs index 70ffcf15524..00d63d79298 100644 --- a/components/script_layout_interface/lib.rs +++ b/components/script_layout_interface/lib.rs @@ -9,7 +9,6 @@ #![deny(unsafe_code)] #![feature(box_syntax)] #![feature(custom_attribute)] -#![feature(custom_derive)] #![feature(nonzero)] #![feature(plugin)] #![feature(proc_macro)] diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index edb9aca62a5..7d7b6824bff 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -6,7 +6,7 @@ //! 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, rustc_attrs, structural_match)] #![plugin(plugins)] #![deny(missing_docs)] #![deny(unsafe_code)] diff --git a/components/style/lib.rs b/components/style/lib.rs index f79d50ead6d..41b9a57c3cf 100644 --- a/components/style/lib.rs +++ b/components/style/lib.rs @@ -24,7 +24,6 @@ //! [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))] diff --git a/components/style_traits/lib.rs b/components/style_traits/lib.rs index c6a1d574a90..1c4aa627bac 100644 --- a/components/style_traits/lib.rs +++ b/components/style_traits/lib.rs @@ -11,7 +11,6 @@ #![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))] diff --git a/components/util/lib.rs b/components/util/lib.rs index 36680583a4b..2b16912c7bf 100644 --- a/components/util/lib.rs +++ b/components/util/lib.rs @@ -2,7 +2,6 @@ * 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))] From a9767333ebdda155a02a8c577f8df659d496cd14 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Thu, 3 Nov 2016 10:18:55 +0100 Subject: [PATCH 3/5] Remove #![feature(custom_attribute)] --- components/devtools/lib.rs | 1 - components/gfx/lib.rs | 1 - components/msg/lib.rs | 2 +- components/net/lib.rs | 1 - components/net_traits/lib.rs | 1 - components/script/lib.rs | 1 - components/script_layout_interface/lib.rs | 1 - components/style/lib.rs | 1 - 8 files changed, 1 insertion(+), 8 deletions(-) diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs index 3e638a3ca4a..815bee12a88 100644 --- a/components/devtools/lib.rs +++ b/components/devtools/lib.rs @@ -11,7 +11,6 @@ #![crate_type = "rlib"] #![feature(box_syntax)] -#![feature(custom_attribute)] #![feature(plugin)] #![feature(proc_macro)] #![plugin(plugins)] diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs index b0aa58f895d..f4a1d1d721b 100644 --- a/components/gfx/lib.rs +++ b/components/gfx/lib.rs @@ -7,7 +7,6 @@ #![feature(alloc)] #![feature(box_syntax)] -#![feature(custom_attribute)] #![feature(plugin)] #![feature(proc_macro)] #![feature(range_contains)] diff --git a/components/msg/lib.rs b/components/msg/lib.rs index 47b6a781cbf..b9db1df25e3 100644 --- a/components/msg/lib.rs +++ b/components/msg/lib.rs @@ -2,7 +2,7 @@ * 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, plugin, proc_macro, rustc_attrs, structural_match)] +#![feature(plugin, proc_macro, rustc_attrs, structural_match)] #![plugin(plugins)] #![deny(unsafe_code)] diff --git a/components/net/lib.rs b/components/net/lib.rs index 2ab6a1b9ff7..f830eb2befa 100644 --- a/components/net/lib.rs +++ b/components/net/lib.rs @@ -3,7 +3,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #![feature(box_syntax)] -#![feature(custom_attribute)] #![feature(fnbox)] #![feature(mpsc_select)] #![feature(plugin)] diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs index ff13b4e9c26..2b519830b83 100644 --- a/components/net_traits/lib.rs +++ b/components/net_traits/lib.rs @@ -3,7 +3,6 @@ * 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)] diff --git a/components/script/lib.rs b/components/script/lib.rs index f1ddb8d82bc..dd6299aa051 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -6,7 +6,6 @@ #![feature(conservative_impl_trait)] #![feature(const_fn)] #![feature(core_intrinsics)] -#![feature(custom_attribute)] #![feature(fnbox)] #![feature(mpsc_select)] #![feature(nonzero)] diff --git a/components/script_layout_interface/lib.rs b/components/script_layout_interface/lib.rs index 00d63d79298..2cad69cdcc8 100644 --- a/components/script_layout_interface/lib.rs +++ b/components/script_layout_interface/lib.rs @@ -8,7 +8,6 @@ #![deny(unsafe_code)] #![feature(box_syntax)] -#![feature(custom_attribute)] #![feature(nonzero)] #![feature(plugin)] #![feature(proc_macro)] diff --git a/components/style/lib.rs b/components/style/lib.rs index 41b9a57c3cf..206607732e4 100644 --- a/components/style/lib.rs +++ b/components/style/lib.rs @@ -23,7 +23,6 @@ //! [cssparser]: ../cssparser/index.html //! [selectors]: ../selectors/index.html -#![cfg_attr(feature = "servo", feature(custom_attribute))] #![cfg_attr(feature = "servo", feature(plugin))] #![cfg_attr(feature = "servo", feature(proc_macro))] #![cfg_attr(feature = "servo", feature(rustc_attrs))] From 3bc26d18190b6d2410f6f804a4bf9c910c1e0c28 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Thu, 3 Nov 2016 10:21:23 +0100 Subject: [PATCH 4/5] Remove #![feature(structural_match)] --- components/devtools_traits/lib.rs | 2 +- components/gfx/lib.rs | 1 - components/gfx_traits/lib.rs | 2 +- components/msg/lib.rs | 2 +- components/net_traits/lib.rs | 1 - components/profile_traits/lib.rs | 2 +- components/script_traits/lib.rs | 2 +- components/style/lib.rs | 1 - components/style_traits/lib.rs | 1 - components/util/lib.rs | 1 - 10 files changed, 5 insertions(+), 10 deletions(-) diff --git a/components/devtools_traits/lib.rs b/components/devtools_traits/lib.rs index 7335371bca4..6fcac6cf4a2 100644 --- a/components/devtools_traits/lib.rs +++ b/components/devtools_traits/lib.rs @@ -12,7 +12,7 @@ #![allow(non_snake_case)] #![deny(unsafe_code)] -#![feature(proc_macro, rustc_attrs, structural_match)] +#![feature(proc_macro, rustc_attrs)] #[allow(unused_extern_crates)] #[macro_use] diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs index f4a1d1d721b..4fa31729495 100644 --- a/components/gfx/lib.rs +++ b/components/gfx/lib.rs @@ -11,7 +11,6 @@ #![feature(proc_macro)] #![feature(range_contains)] #![feature(rustc_attrs)] -#![feature(structural_match)] #![feature(unique)] #![plugin(plugins)] diff --git a/components/gfx_traits/lib.rs b/components/gfx_traits/lib.rs index a7723683eca..c8088a05e93 100644 --- a/components/gfx_traits/lib.rs +++ b/components/gfx_traits/lib.rs @@ -2,7 +2,7 @@ * 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(plugin, proc_macro, rustc_attrs, structural_match)] +#![feature(plugin, proc_macro, rustc_attrs)] #![plugin(plugins)] #![crate_name = "gfx_traits"] diff --git a/components/msg/lib.rs b/components/msg/lib.rs index b9db1df25e3..d7335391553 100644 --- a/components/msg/lib.rs +++ b/components/msg/lib.rs @@ -2,7 +2,7 @@ * 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(plugin, proc_macro, rustc_attrs, structural_match)] +#![feature(plugin, proc_macro, rustc_attrs)] #![plugin(plugins)] #![deny(unsafe_code)] diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs index 2b519830b83..d6e6e72cdf7 100644 --- a/components/net_traits/lib.rs +++ b/components/net_traits/lib.rs @@ -7,7 +7,6 @@ #![feature(rustc_attrs)] #![feature(slice_patterns)] #![feature(step_by)] -#![feature(structural_match)] #![deny(unsafe_code)] diff --git a/components/profile_traits/lib.rs b/components/profile_traits/lib.rs index c56196a9e2f..4a826c1db0d 100644 --- a/components/profile_traits/lib.rs +++ b/components/profile_traits/lib.rs @@ -7,7 +7,7 @@ //! modules won't have to depend on `profile`. #![feature(box_syntax)] -#![feature(plugin, proc_macro, rustc_attrs, structural_match)] +#![feature(plugin, proc_macro)] #![plugin(plugins)] #![deny(unsafe_code)] diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index 7d7b6824bff..f9eca459f1b 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -6,7 +6,7 @@ //! The traits are here instead of in script so that these modules won't have //! to depend on script. -#![feature(plugin, proc_macro, rustc_attrs, structural_match)] +#![feature(plugin, proc_macro, rustc_attrs)] #![plugin(plugins)] #![deny(missing_docs)] #![deny(unsafe_code)] diff --git a/components/style/lib.rs b/components/style/lib.rs index 206607732e4..05c4f49e493 100644 --- a/components/style/lib.rs +++ b/components/style/lib.rs @@ -26,7 +26,6 @@ #![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)] diff --git a/components/style_traits/lib.rs b/components/style_traits/lib.rs index 1c4aa627bac..f0921dbf48a 100644 --- a/components/style_traits/lib.rs +++ b/components/style_traits/lib.rs @@ -14,7 +14,6 @@ #![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] diff --git a/components/util/lib.rs b/components/util/lib.rs index 2b16912c7bf..b8ec37a01fe 100644 --- a/components/util/lib.rs +++ b/components/util/lib.rs @@ -5,7 +5,6 @@ #![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)] From 046a97fa132db36364368a69082efb65b9cb4ee1 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Thu, 3 Nov 2016 10:24:11 +0100 Subject: [PATCH 5/5] Remove #![feature(rustc_attrs)] --- components/canvas_traits/lib.rs | 1 - components/devtools_traits/lib.rs | 2 +- components/gfx/lib.rs | 1 - components/gfx_traits/lib.rs | 2 +- components/msg/lib.rs | 2 +- components/net_traits/lib.rs | 1 - components/range/lib.rs | 1 - components/script_traits/lib.rs | 2 +- components/style/lib.rs | 1 - components/style_traits/lib.rs | 1 - 10 files changed, 4 insertions(+), 10 deletions(-) diff --git a/components/canvas_traits/lib.rs b/components/canvas_traits/lib.rs index d255e562bcc..5a1acc710d5 100644 --- a/components/canvas_traits/lib.rs +++ b/components/canvas_traits/lib.rs @@ -6,7 +6,6 @@ #![crate_type = "rlib"] #![feature(plugin)] #![feature(proc_macro)] -#![feature(rustc_attrs)] #![plugin(plugins)] #![deny(unsafe_code)] diff --git a/components/devtools_traits/lib.rs b/components/devtools_traits/lib.rs index 6fcac6cf4a2..17362ed5558 100644 --- a/components/devtools_traits/lib.rs +++ b/components/devtools_traits/lib.rs @@ -12,7 +12,7 @@ #![allow(non_snake_case)] #![deny(unsafe_code)] -#![feature(proc_macro, rustc_attrs)] +#![feature(proc_macro)] #[allow(unused_extern_crates)] #[macro_use] diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs index 4fa31729495..c6d4e0fc845 100644 --- a/components/gfx/lib.rs +++ b/components/gfx/lib.rs @@ -10,7 +10,6 @@ #![feature(plugin)] #![feature(proc_macro)] #![feature(range_contains)] -#![feature(rustc_attrs)] #![feature(unique)] #![plugin(plugins)] diff --git a/components/gfx_traits/lib.rs b/components/gfx_traits/lib.rs index c8088a05e93..09593189512 100644 --- a/components/gfx_traits/lib.rs +++ b/components/gfx_traits/lib.rs @@ -2,7 +2,7 @@ * 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(plugin, proc_macro, rustc_attrs)] +#![feature(plugin, proc_macro)] #![plugin(plugins)] #![crate_name = "gfx_traits"] diff --git a/components/msg/lib.rs b/components/msg/lib.rs index d7335391553..d32217d0256 100644 --- a/components/msg/lib.rs +++ b/components/msg/lib.rs @@ -2,7 +2,7 @@ * 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(plugin, proc_macro, rustc_attrs)] +#![feature(plugin, proc_macro)] #![plugin(plugins)] #![deny(unsafe_code)] diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs index d6e6e72cdf7..e45e7e481bf 100644 --- a/components/net_traits/lib.rs +++ b/components/net_traits/lib.rs @@ -4,7 +4,6 @@ #![feature(box_syntax)] #![feature(proc_macro)] -#![feature(rustc_attrs)] #![feature(slice_patterns)] #![feature(step_by)] diff --git a/components/range/lib.rs b/components/range/lib.rs index 0451d332643..2b76a070911 100644 --- a/components/range/lib.rs +++ b/components/range/lib.rs @@ -3,7 +3,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #![feature(proc_macro)] -#![feature(rustc_attrs)] #![feature(step_trait)] #![deny(unsafe_code)] diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index f9eca459f1b..2617f745dbd 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -6,7 +6,7 @@ //! The traits are here instead of in script so that these modules won't have //! to depend on script. -#![feature(plugin, proc_macro, rustc_attrs)] +#![feature(plugin, proc_macro)] #![plugin(plugins)] #![deny(missing_docs)] #![deny(unsafe_code)] diff --git a/components/style/lib.rs b/components/style/lib.rs index 05c4f49e493..b185312c9e0 100644 --- a/components/style/lib.rs +++ b/components/style/lib.rs @@ -25,7 +25,6 @@ #![cfg_attr(feature = "servo", feature(plugin))] #![cfg_attr(feature = "servo", feature(proc_macro))] -#![cfg_attr(feature = "servo", feature(rustc_attrs))] #![cfg_attr(feature = "servo", plugin(plugins))] #![deny(warnings)] diff --git a/components/style_traits/lib.rs b/components/style_traits/lib.rs index f0921dbf48a..bd060abf139 100644 --- a/components/style_traits/lib.rs +++ b/components/style_traits/lib.rs @@ -13,7 +13,6 @@ #![cfg_attr(feature = "servo", feature(plugin))] #![cfg_attr(feature = "servo", feature(proc_macro))] -#![cfg_attr(feature = "servo", feature(rustc_attrs))] extern crate app_units; #[macro_use]