Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 15:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #14040 - nox:custom-derive, r=Ms2ger

Browse source 
Remove last use of custom derive plugin

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14040)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-11-03 06:15:25 -05:00 • committed by GitHub
commit e3493cdd26
24 changed files with 14 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/canvas_traits/lib.rs
View file

@ -4,10 +4,8 @@
#![crate_name = "canvas_traits"] #![crate_name = "canvas_traits"]
#![crate_type = "rlib"] #![crate_type = "rlib"]
#![feature(custom_derive)]
#![feature(plugin)] #![feature(plugin)]
#![feature(proc_macro)] #![feature(proc_macro)]
#![feature(rustc_attrs)]
#![plugin(plugins)] #![plugin(plugins)]
#![deny(unsafe_code)] #![deny(unsafe_code)]

1
components/compositing/lib.rs
View file

@ -3,7 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(custom_derive)]
#![feature(plugin)] #![feature(plugin)]
#![feature(proc_macro)] #![feature(proc_macro)]
#![plugin(plugins)] #![plugin(plugins)]

1
components/constellation/lib.rs
View file

@ -3,7 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(custom_derive)]
#![feature(mpsc_select)] #![feature(mpsc_select)]
#![feature(plugin)] #![feature(plugin)]
#![feature(proc_macro)] #![feature(proc_macro)]

2
components/devtools/lib.rs
View file

@ -11,8 +11,6 @@
#![crate_type = "rlib"] #![crate_type = "rlib"]
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(custom_attribute)]
#![feature(custom_derive)]
#![feature(plugin)] #![feature(plugin)]
#![feature(proc_macro)] #![feature(proc_macro)]
#![plugin(plugins)] #![plugin(plugins)]

2
components/devtools_traits/lib.rs
View file

@ -12,7 +12,7 @@
#![allow(non_snake_case)] #![allow(non_snake_case)]
#![deny(unsafe_code)] #![deny(unsafe_code)]
#![feature(proc_macro, rustc_attrs, structural_match)] #![feature(proc_macro)]
#[allow(unused_extern_crates)] #[allow(unused_extern_crates)]
#[macro_use] #[macro_use]

4
components/gfx/lib.rs
View file

@ -7,13 +7,9 @@
#![feature(alloc)] #![feature(alloc)]
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(custom_attribute)]
#![feature(custom_derive)]
#![feature(plugin)] #![feature(plugin)]
#![feature(proc_macro)] #![feature(proc_macro)]
#![feature(range_contains)] #![feature(range_contains)]
#![feature(rustc_attrs)]
#![feature(structural_match)]
#![feature(unique)] #![feature(unique)]
#![plugin(plugins)] #![plugin(plugins)]

2
components/gfx_traits/lib.rs
View file

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * 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)] #![plugin(plugins)]
#![crate_name = "gfx_traits"] #![crate_name = "gfx_traits"]

1
components/layout/lib.rs
View file

@ -5,7 +5,6 @@
#![feature(box_patterns)] #![feature(box_patterns)]
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(conservative_impl_trait)] #![feature(conservative_impl_trait)]
#![feature(custom_derive)]
#![feature(nonzero)] #![feature(nonzero)]
#![feature(plugin)] #![feature(plugin)]
#![feature(proc_macro)] #![feature(proc_macro)]

1
components/layout_thread/lib.rs
View file

@ -6,7 +6,6 @@
//! painted. //! painted.
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(custom_derive)]
#![feature(mpsc_select)] #![feature(mpsc_select)]
#![feature(plugin)] #![feature(plugin)]
#![feature(proc_macro)] #![feature(proc_macro)]

2
components/msg/lib.rs
View file

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * 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)] #![plugin(plugins)]
#![deny(unsafe_code)] #![deny(unsafe_code)]

2
components/net/Cargo.toml
View file

@ -34,6 +34,8 @@ plugins = {path = "../plugins"}
profile_traits = {path = "../profile_traits"} profile_traits = {path = "../profile_traits"}
rand = "0.3" rand = "0.3"
rustc-serialize = "0.3" rustc-serialize = "0.3"
serde = "0.8"
serde_derive = "0.8"
threadpool = "1.0" threadpool = "1.0"
time = "0.1.17" time = "0.1.17"
unicase = "1.4.0" unicase = "1.4.0"

5
components/net/lib.rs
View file

@ -3,11 +3,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(custom_attribute)]
#![feature(custom_derive)]
#![feature(fnbox)] #![feature(fnbox)]
#![feature(mpsc_select)] #![feature(mpsc_select)]
#![feature(plugin)] #![feature(plugin)]
#![feature(proc_macro)]
#![plugin(plugins)] #![plugin(plugins)]
#![deny(unsafe_code)] #![deny(unsafe_code)]
@ -37,6 +36,8 @@ extern crate openssl_verify;
extern crate profile_traits; extern crate profile_traits;
extern crate rand; extern crate rand;
extern crate rustc_serialize; extern crate rustc_serialize;
#[macro_use]
extern crate serde_derive;
extern crate threadpool; extern crate threadpool;
extern crate time; extern crate time;
#[cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))] #[cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))]

3
components/net_traits/lib.rs
View file

@ -3,12 +3,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(custom_attribute)]
#![feature(proc_macro)] #![feature(proc_macro)]
#![feature(rustc_attrs)]
#![feature(slice_patterns)] #![feature(slice_patterns)]
#![feature(step_by)] #![feature(step_by)]
#![feature(structural_match)]
#![deny(unsafe_code)] #![deny(unsafe_code)]

1
components/profile/lib.rs
View file

@ -4,7 +4,6 @@
#![cfg_attr(not(target_os = "windows"), feature(alloc_jemalloc))] #![cfg_attr(not(target_os = "windows"), feature(alloc_jemalloc))]
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(custom_derive)]
#![feature(plugin)] #![feature(plugin)]
#![feature(proc_macro)] #![feature(proc_macro)]
#![plugin(plugins)] #![plugin(plugins)]

2
components/profile_traits/lib.rs
View file

@ -7,7 +7,7 @@
//! modules won't have to depend on `profile`. //! modules won't have to depend on `profile`.
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(custom_derive, plugin, proc_macro, rustc_attrs, structural_match)] #![feature(plugin, proc_macro)]
#![plugin(plugins)] #![plugin(plugins)]
#![deny(unsafe_code)] #![deny(unsafe_code)]

1
components/range/lib.rs
View file

@ -3,7 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#![feature(proc_macro)] #![feature(proc_macro)]
#![feature(rustc_attrs)]
#![feature(step_trait)] #![feature(step_trait)]
#![deny(unsafe_code)] #![deny(unsafe_code)]

2
components/script/lib.rs
View file

@ -6,8 +6,6 @@
#![feature(conservative_impl_trait)] #![feature(conservative_impl_trait)]
#![feature(const_fn)] #![feature(const_fn)]
#![feature(core_intrinsics)] #![feature(core_intrinsics)]
#![feature(custom_attribute)]
#![feature(custom_derive)]
#![feature(fnbox)] #![feature(fnbox)]
#![feature(mpsc_select)] #![feature(mpsc_select)]
#![feature(nonzero)] #![feature(nonzero)]

2
components/script_layout_interface/lib.rs
View file

@ -8,8 +8,6 @@
#![deny(unsafe_code)] #![deny(unsafe_code)]
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(custom_attribute)]
#![feature(custom_derive)]
#![feature(nonzero)] #![feature(nonzero)]
#![feature(plugin)] #![feature(plugin)]
#![feature(proc_macro)] #![feature(proc_macro)]

2
components/script_traits/lib.rs
View file

@ -6,7 +6,7 @@
//! The traits are here instead of in script so that these modules won't have //! The traits are here instead of in script so that these modules won't have
//! to depend on script. //! to depend on script.
#![feature(custom_derive, plugin, proc_macro, rustc_attrs, structural_match)] #![feature(plugin, proc_macro)]
#![plugin(plugins)] #![plugin(plugins)]
#![deny(missing_docs)] #![deny(missing_docs)]
#![deny(unsafe_code)] #![deny(unsafe_code)]

2
components/servo/Cargo.lock generated
View file

@ -1439,6 +1439,8 @@ dependencies = [
"profile_traits 0.0.1", "profile_traits 0.0.1",
"rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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)", "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)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
"tinyfiledialogs 0.1.0 (git+https://github.com/jdm/tinyfiledialogs)", "tinyfiledialogs 0.1.0 (git+https://github.com/jdm/tinyfiledialogs)",

4
components/style/lib.rs
View file

@ -23,12 +23,8 @@
//! [cssparser]: ../cssparser/index.html //! [cssparser]: ../cssparser/index.html
//! [selectors]: ../selectors/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(plugin))]
#![cfg_attr(feature = "servo", feature(proc_macro))] #![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))] #![cfg_attr(feature = "servo", plugin(plugins))]
#![deny(warnings)] #![deny(warnings)]

3
components/style_traits/lib.rs
View file

@ -11,11 +11,8 @@
#![deny(unsafe_code)] #![deny(unsafe_code)]
#![cfg_attr(feature = "servo", feature(custom_derive))]
#![cfg_attr(feature = "servo", feature(plugin))] #![cfg_attr(feature = "servo", feature(plugin))]
#![cfg_attr(feature = "servo", feature(proc_macro))] #![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; extern crate app_units;
#[macro_use] #[macro_use]

2
components/util/lib.rs
View file

@ -2,11 +2,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * 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(nonzero))]
#![cfg_attr(feature = "servo", feature(plugin))] #![cfg_attr(feature = "servo", feature(plugin))]
#![cfg_attr(feature = "servo", feature(proc_macro))] #![cfg_attr(feature = "servo", feature(proc_macro))]
#![cfg_attr(feature = "servo", feature(structural_match))]
#![cfg_attr(feature = "servo", plugin(plugins))] #![cfg_attr(feature = "servo", plugin(plugins))]
#![deny(unsafe_code)] #![deny(unsafe_code)]

2
ports/cef/Cargo.lock generated
View file

@ -1339,6 +1339,8 @@ dependencies = [
"profile_traits 0.0.1", "profile_traits 0.0.1",
"rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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)", "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)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
"tinyfiledialogs 0.1.0 (git+https://github.com/jdm/tinyfiledialogs)", "tinyfiledialogs 0.1.0 (git+https://github.com/jdm/tinyfiledialogs)",