Move script lints to script_plugins

The plugins crate now just allows to hook into clippy from a single crate.

Cargo.lock

@@ -2038,8 +2038,8 @@ version = "0.0.1"
 dependencies = [
  "compiletest_helper 0.0.1",
  "deny_public_fields 0.0.1",
- "plugins 0.0.1",
  "script 0.0.1",
+ "script_plugins 0.0.1",
 ]
 
 [[package]]
@@ -2302,6 +2302,7 @@ dependencies = [
  "regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
  "script_layout_interface 0.0.1",
+ "script_plugins 0.0.1",
  "script_traits 0.0.1",
  "selectors 0.18.0",
  "serde 0.8.20 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2352,6 +2353,10 @@ dependencies = [
  "style 0.0.1",
 ]
 
+[[package]]
+name = "script_plugins"
+version = "0.0.1"
+
 [[package]]
 name = "script_tests"
 version = "0.0.1"

components/plugins/Cargo.toml

@@ -15,5 +15,4 @@ version = "0.0.112"
 optional = true
 
 [features]
-default = []
 clippy = ["clippy_lints"]

components/plugins/lib.rs

@@ -2,58 +2,21 @@
  * 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/. */
 
-//! Servo's compiler plugin/macro crate
+//! Exists only to hook into clippy.
-//!
-//! Attributes this crate provides:
-//!
-//!  - `#[derive(DenyPublicFields)]` : Forces all fields in a struct/enum to be private
-//!  - `#[derive(JSTraceable)]` : Auto-derives an implementation of `JSTraceable` for a struct in the script crate
-//!  - `#[must_root]` : Prevents data of the marked type from being used on the stack.
-//!                     See the lints module for more details
-//!  - `#[dom_struct]` : Implies #[derive(JSTraceable, DenyPublicFields)]`, and `#[must_root]`.
-//!                       Use this for structs that correspond to a DOM type
-
-
-#![feature(box_syntax, plugin, plugin_registrar, quote, rustc_private, slice_patterns)]
 
+#![cfg_attr(feature = "clippy", feature(plugin, plugin_registrar, rustc_private))]
 #![deny(unsafe_code)]
 
 #[cfg(feature = "clippy")]
 extern crate clippy_lints;
-#[macro_use]
+#[cfg(feature = "clippy")]
-extern crate rustc;
 extern crate rustc_plugin;
-extern crate syntax;
-
-use rustc_plugin::Registry;
-use syntax::ext::base::*;
-use syntax::feature_gate::AttributeType::Whitelisted;
-use syntax::symbol::Symbol;
-
-// Public for documentation to show up
-/// Handles the auto-deriving for `#[derive(JSTraceable)]`
-pub mod jstraceable;
-pub mod lints;
-/// Utilities for writing plugins
-mod utils;
-
-#[plugin_registrar]
-pub fn plugin_registrar(reg: &mut Registry) {
-    reg.register_syntax_extension(
-        Symbol::intern("dom_struct"),
-        MultiModifier(box jstraceable::expand_dom_struct));
-
-    reg.register_late_lint_pass(box lints::unrooted_must_root::UnrootedPass::new());
-    reg.register_early_lint_pass(box lints::ban::BanPass);
-    reg.register_attribute("allow_unrooted_interior".to_string(), Whitelisted);
-    reg.register_attribute("must_root".to_string(), Whitelisted);
-    register_clippy(reg);
-}
 
 #[cfg(feature = "clippy")]
-fn register_clippy(reg: &mut Registry) {
+use rustc_plugin::Registry;
+
+#[cfg(feature = "clippy")]
+#[plugin_registrar]
+pub fn plugin_registrar(reg: &mut Registry) {
     ::clippy_lints::register_plugins(reg);
 }
-#[cfg(not(feature = "clippy"))]
-fn register_clippy(_reg: &mut Registry) {
-}

components/plugins/lints/mod.rs

@@ -1,6 +0,0 @@
-/* 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/. */
-
-pub mod ban;
-pub mod unrooted_must_root;

components/script/Cargo.toml

@@ -71,6 +71,7 @@ ref_slice = "1.0"
 regex = "0.2"
 rustc-serialize = "0.3"
 script_layout_interface = {path = "../script_layout_interface"}
+script_plugins = {path = "../script_plugins"}
 script_traits = {path = "../script_traits"}
 selectors = { path = "../selectors" }
 serde = "0.8"

components/script/lib.rs

@@ -23,6 +23,7 @@
 #![doc = "The script crate contains all matters DOM."]
 
 #![plugin(plugins)]
+#![plugin(script_plugins)]
 
 extern crate angle;
 extern crate app_units;

components/script_plugins/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "script_plugins"
+version = "0.0.1"
+authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
+publish = false
+
+[lib]
+path = "lib.rs"
+plugin = true

components/script_plugins/lib.rs

@@ -0,0 +1,48 @@
+/* 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/. */
+
+//! Servo's compiler plugin/macro crate
+//!
+//! Attributes this crate provides:
+//!
+//!  - `#[derive(DenyPublicFields)]` : Forces all fields in a struct/enum to be private
+//!  - `#[derive(JSTraceable)]` : Auto-derives an implementation of `JSTraceable` for a struct in the script crate
+//!  - `#[must_root]` : Prevents data of the marked type from being used on the stack.
+//!                     See the lints module for more details
+//!  - `#[dom_struct]` : Implies #[derive(JSTraceable, DenyPublicFields)]`, and `#[must_root]`.
+//!                       Use this for structs that correspond to a DOM type
+
+
+#![deny(unsafe_code)]
+#![feature(box_syntax, plugin, plugin_registrar, quote, rustc_private, slice_patterns)]
+
+#[macro_use]
+extern crate rustc;
+extern crate rustc_plugin;
+extern crate syntax;
+
+use rustc_plugin::Registry;
+use syntax::ext::base::*;
+use syntax::feature_gate::AttributeType::Whitelisted;
+use syntax::symbol::Symbol;
+
+mod ban;
+// Public for documentation to show up
+/// Handles the auto-deriving for `#[derive(JSTraceable)]`
+pub mod jstraceable;
+mod unrooted_must_root;
+/// Utilities for writing plugins
+mod utils;
+
+#[plugin_registrar]
+pub fn plugin_registrar(reg: &mut Registry) {
+    reg.register_syntax_extension(
+        Symbol::intern("dom_struct"),
+        MultiModifier(box jstraceable::expand_dom_struct));
+
+    reg.register_late_lint_pass(box unrooted_must_root::UnrootedPass::new());
+    reg.register_early_lint_pass(box ban::BanPass);
+    reg.register_attribute("allow_unrooted_interior".to_string(), Whitelisted);
+    reg.register_attribute("must_root".to_string(), Whitelisted);
+}

tests/compiletest/plugin/Cargo.toml

@@ -12,5 +12,5 @@ doctest = false
 [dependencies]
 compiletest_helper = {path = "../helper"}
 deny_public_fields = {path = "../../../components/deny_public_fields"}
-plugins = {path = "../../../components/plugins"}
 script = {path = "../../../components/script"}
+script_plugins = {path = "../../../components/script_plugins"}

tests/compiletest/plugin/compile-fail/ban-domrefcell.rs

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #![feature(plugin)]
-#![plugin(plugins)]
+#![plugin(script_plugins)]
 
 extern crate script;
 

tests/compiletest/plugin/compile-fail/ban.rs

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #![feature(plugin)]
-#![plugin(plugins)]
+#![plugin(script_plugins)]
 
 extern crate js;
 

tests/compiletest/plugin/compile-fail/trustedpromise_mustnot_deriveclone.rs

@@ -2,9 +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/. */
 
-#![feature(plugin)]
-#![plugin(plugins)]
-
 extern crate script;
 
 use script::test::TrustedPromise;

tests/compiletest/plugin/compile-fail/unrooted_must_root.rs

@@ -2,9 +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/. */
 
-#![feature(plugin)]
-#![plugin(plugins)]
 #![allow(dead_code)]
+#![feature(plugin)]
+#![plugin(script_plugins)]
 
 #[must_root]
 struct Foo {