diff options
-rw-r--r-- | components/canvas_traits/lib.rs | 2 | ||||
-rw-r--r-- | components/compositing/lib.rs | 1 | ||||
-rw-r--r-- | components/constellation/lib.rs | 1 | ||||
-rw-r--r-- | components/devtools/lib.rs | 2 | ||||
-rw-r--r-- | components/devtools_traits/lib.rs | 2 | ||||
-rw-r--r-- | components/gfx/lib.rs | 4 | ||||
-rw-r--r-- | components/gfx_traits/lib.rs | 2 | ||||
-rw-r--r-- | components/layout/lib.rs | 1 | ||||
-rw-r--r-- | components/layout_thread/lib.rs | 1 | ||||
-rw-r--r-- | components/msg/lib.rs | 2 | ||||
-rw-r--r-- | components/net/Cargo.toml | 2 | ||||
-rw-r--r-- | components/net/lib.rs | 5 | ||||
-rw-r--r-- | components/net_traits/lib.rs | 3 | ||||
-rw-r--r-- | components/profile/lib.rs | 1 | ||||
-rw-r--r-- | components/profile_traits/lib.rs | 2 | ||||
-rw-r--r-- | components/range/lib.rs | 1 | ||||
-rw-r--r-- | components/script/lib.rs | 2 | ||||
-rw-r--r-- | components/script_layout_interface/lib.rs | 2 | ||||
-rw-r--r-- | components/script_traits/lib.rs | 2 | ||||
-rw-r--r-- | components/servo/Cargo.lock | 2 | ||||
-rw-r--r-- | components/style/lib.rs | 4 | ||||
-rw-r--r-- | components/style_traits/lib.rs | 3 | ||||
-rw-r--r-- | components/util/lib.rs | 2 | ||||
-rw-r--r-- | ports/cef/Cargo.lock | 2 |
24 files changed, 14 insertions, 37 deletions
diff --git a/components/canvas_traits/lib.rs b/components/canvas_traits/lib.rs index ec30efe03db..5a1acc710d5 100644 --- a/components/canvas_traits/lib.rs +++ b/components/canvas_traits/lib.rs @@ -4,10 +4,8 @@ #![crate_name = "canvas_traits"] #![crate_type = "rlib"] -#![feature(custom_derive)] #![feature(plugin)] #![feature(proc_macro)] -#![feature(rustc_attrs)] #![plugin(plugins)] #![deny(unsafe_code)] 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..815bee12a88 100644 --- a/components/devtools/lib.rs +++ b/components/devtools/lib.rs @@ -11,8 +11,6 @@ #![crate_type = "rlib"] #![feature(box_syntax)] -#![feature(custom_attribute)] -#![feature(custom_derive)] #![feature(plugin)] #![feature(proc_macro)] #![plugin(plugins)] diff --git a/components/devtools_traits/lib.rs b/components/devtools_traits/lib.rs index 7335371bca4..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, structural_match)] +#![feature(proc_macro)] #[allow(unused_extern_crates)] #[macro_use] diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs index b3228018181..c6d4e0fc845 100644 --- a/components/gfx/lib.rs +++ b/components/gfx/lib.rs @@ -7,13 +7,9 @@ #![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)] diff --git a/components/gfx_traits/lib.rs b/components/gfx_traits/lib.rs index 80b45444e3f..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(custom_derive, plugin, proc_macro, rustc_attrs, structural_match)] +#![feature(plugin, proc_macro)] #![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..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(custom_attribute, custom_derive, plugin, proc_macro, rustc_attrs, structural_match)] +#![feature(plugin, proc_macro)] #![plugin(plugins)] #![deny(unsafe_code)] 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..f830eb2befa 100644 --- a/components/net/lib.rs +++ b/components/net/lib.rs @@ -3,11 +3,10 @@ * 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)] @@ -37,6 +36,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/net_traits/lib.rs b/components/net_traits/lib.rs index ff13b4e9c26..e45e7e481bf 100644 --- a/components/net_traits/lib.rs +++ b/components/net_traits/lib.rs @@ -3,12 +3,9 @@ * 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)] 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..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(custom_derive, plugin, proc_macro, rustc_attrs, structural_match)] +#![feature(plugin, proc_macro)] #![plugin(plugins)] #![deny(unsafe_code)] 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/lib.rs b/components/script/lib.rs index ed4fcf8b5ee..dd6299aa051 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -6,8 +6,6 @@ #![feature(conservative_impl_trait)] #![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..2cad69cdcc8 100644 --- a/components/script_layout_interface/lib.rs +++ b/components/script_layout_interface/lib.rs @@ -8,8 +8,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..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(custom_derive, plugin, proc_macro, rustc_attrs, structural_match)] +#![feature(plugin, proc_macro)] #![plugin(plugins)] #![deny(missing_docs)] #![deny(unsafe_code)] 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/components/style/lib.rs b/components/style/lib.rs index f79d50ead6d..b185312c9e0 100644 --- a/components/style/lib.rs +++ b/components/style/lib.rs @@ -23,12 +23,8 @@ //! [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)] diff --git a/components/style_traits/lib.rs b/components/style_traits/lib.rs index c6a1d574a90..bd060abf139 100644 --- a/components/style_traits/lib.rs +++ b/components/style_traits/lib.rs @@ -11,11 +11,8 @@ #![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] diff --git a/components/util/lib.rs b/components/util/lib.rs index 36680583a4b..b8ec37a01fe 100644 --- a/components/util/lib.rs +++ b/components/util/lib.rs @@ -2,11 +2,9 @@ * 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)] 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)", |