diff --git a/Cargo.lock b/Cargo.lock index f7b8ccccbcd..9a2b7905f77 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -282,7 +282,6 @@ dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", "offscreen_gl_context 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "plugins 0.0.1", "servo_config 0.0.1", "webrender_traits 0.16.0 (git+https://github.com/servo/webrender)", ] @@ -296,7 +295,6 @@ dependencies = [ "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "plugins 0.0.1", "serde 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.16.0 (git+https://github.com/servo/webrender)", @@ -360,19 +358,6 @@ dependencies = [ "vec_map 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "clippy_lints" -version = "0.0.112" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "quine-mc_cluskey 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-syntax 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "semver 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-normalization 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "cmake" version = "0.1.20" @@ -426,7 +411,6 @@ dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "plugins 0.0.1", "profile_traits 0.0.1", "script_traits 0.0.1", "servo_config 0.0.1", @@ -459,7 +443,6 @@ dependencies = [ "msg 0.0.1", "net_traits 0.0.1", "offscreen_gl_context 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "plugins 0.0.1", "profile_traits 0.0.1", "script_traits 0.0.1", "serde 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -623,7 +606,6 @@ dependencies = [ "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", - "plugins 0.0.1", "serde 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -685,7 +667,6 @@ dependencies = [ "msg 0.0.1", "net_traits 0.0.1", "objc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "plugins 0.0.1", "script_traits 0.0.1", "servo_config 0.0.1", "servo_geometry 0.0.1", @@ -962,7 +943,6 @@ dependencies = [ "msg 0.0.1", "net_traits 0.0.1", "ordered-float 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "plugins 0.0.1", "range 0.0.1", "serde 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -997,7 +977,6 @@ version = "0.0.1" dependencies = [ "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "plugins 0.0.1", "range 0.0.1", "serde 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1342,7 +1321,6 @@ dependencies = [ "net_traits 0.0.1", "ordered-float 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "plugins 0.0.1", "profile_traits 0.0.1", "range 0.0.1", "rayon 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1388,7 +1366,6 @@ dependencies = [ "msg 0.0.1", "net_traits 0.0.1", "parking_lot 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "plugins 0.0.1", "profile_traits 0.0.1", "rayon 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "script 0.0.1", @@ -1489,7 +1466,6 @@ dependencies = [ "msg 0.0.1", "net 0.0.1", "net_traits 0.0.1", - "plugins 0.0.1", "profile 0.0.1", "profile_traits 0.0.1", "script 0.0.1", @@ -1645,7 +1621,6 @@ dependencies = [ "cssparser 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "plugins 0.0.1", "serde 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.16.0 (git+https://github.com/servo/webrender)", @@ -1673,7 +1648,6 @@ dependencies = [ "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", "rustc-serialize 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", @@ -1714,7 +1688,6 @@ dependencies = [ "msg 0.0.1", "net 0.0.1", "net_traits 0.0.1", - "plugins 0.0.1", "profile_traits 0.0.1", "servo_config 0.0.1", "servo_url 0.0.1", @@ -2014,13 +1987,6 @@ dependencies = [ "script_plugins 0.0.1", ] -[[package]] -name = "plugins" -version = "0.0.1" -dependencies = [ - "clippy_lints 0.0.112 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "pnacl-build-helper" version = "1.4.10" @@ -2048,7 +2014,6 @@ dependencies = [ "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "plugins 0.0.1", "profile_traits 0.0.1", "regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2076,7 +2041,6 @@ dependencies = [ "energymon 0.3.0 (git+https://github.com/energymon/energymon-rust.git)", "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "plugins 0.0.1", "serde 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", @@ -2104,11 +2068,6 @@ dependencies = [ "syntex_syntax 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "quine-mc_cluskey" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "quote" version = "0.3.12" @@ -2266,7 +2225,6 @@ dependencies = [ "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", "phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", - "plugins 0.0.1", "profile_traits 0.0.1", "range 0.0.1", "ref_filter_map 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2316,7 +2274,6 @@ dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "plugins 0.0.1", "profile_traits 0.0.1", "range 0.0.1", "script_traits 0.0.1", @@ -2335,7 +2292,6 @@ version = "0.0.1" dependencies = [ "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", - "plugins 0.0.1", "script 0.0.1", "servo_url 0.0.1", ] @@ -2360,7 +2316,6 @@ dependencies = [ "msg 0.0.1", "net_traits 0.0.1", "offscreen_gl_context 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "plugins 0.0.1", "profile_traits 0.0.1", "rustc-serialize 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2387,14 +2342,6 @@ name = "semver" version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "semver" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "serde" version = "0.9.7" @@ -2587,7 +2534,6 @@ dependencies = [ "lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "plugins 0.0.1", "rustc-serialize 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3025,9 +2971,6 @@ dependencies = [ name = "toml" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rustc-serialize 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "traitobject" @@ -3194,7 +3137,6 @@ dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "plugins 0.0.1", "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_traits 0.0.1", @@ -3402,7 +3344,6 @@ dependencies = [ "checksum cgl 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8bdd78cca65a739cb5475dbf6b6bbb49373e327f4a6f2b499c0f98632df38c10" "checksum clang-sys 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f98f0715ff67f27ca6a2f8f0ffc2a56f8edbc7acd57489c29eadc3a15c4eafe" "checksum clap 2.20.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a60af5cb867dd4ee2378398acde80c73b466b58a963f598061ce7e394800998d" -"checksum clippy_lints 0.0.112 (registry+https://github.com/rust-lang/crates.io-index)" = "51461bf5f0862158b3239e55af263d5fe67620ccbb824f87c9ed0f7cd1ce1184" "checksum cmake 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "a3a6805df695087e7c1bcd9a82e03ad6fb864c8e67ac41b1348229ce5b7f0407" "checksum cocoa 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d55b620aff4da7d4b9d85f2974cc62a097146623b75e3f36734fe68d8cef493e" "checksum color_quant 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a475fc4af42d83d28adf72968d9bcfaf035a1a9381642d8e85d8a04957767b0d" @@ -3534,7 +3475,6 @@ dependencies = [ "checksum png 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3cb773e9a557edb568ce9935cf783e3cdcabe06a9449d41b3e5506d88e582c82" "checksum quasi 0.29.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dcbf815446dc6a0afbc72d88f9a8aa71b608d10b168e09437c80c0fd6fd410c9" "checksum quasi_codegen 0.29.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b06172e92ab0099427609854ffb1512c377be5fc4beaf572ae5d5a01b8359596" -"checksum quine-mc_cluskey 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "07589615d719a60c8dd8a4622e7946465dfef20d1a428f969e3443e7386d5f45" "checksum quote 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)" = "e7b44fd83db28b83c1c58187159934906e5e955c812e211df413b76b03c909a5" "checksum rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "022e0636ec2519ddae48154b028864bdce4eaf7d35226ab8e65c611be97b189d" "checksum rayon 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50c575b58c2b109e2fbc181820cbe177474f35610ff9e357dc75f6bac854ffbf" @@ -3550,7 +3490,6 @@ dependencies = [ "checksum same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7" "checksum scoped_threadpool 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "3ef399c8893e8cb7aa9696e895427fab3a6bf265977bb96e126f24ddd2cda85a" "checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac" -"checksum semver 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2d5b7638a1f03815d94e88cb3b3c08e87f0db4d683ef499d1836aaf70a45623f" "checksum serde 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1e0ed773960f90a78567fcfbe935284adf50c5d7cf119aa2cf43bb0b4afa69bb" "checksum serde_codegen 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1f94de585a73dfc312ca77194209278a587bf90d3edc6c2d0fc479b0ed71d1f0" "checksum serde_codegen_internals 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "afad7924a009f859f380e4a2e3a509a845c2ac66435fcead74a4d983b21ae806" diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml index b3e2eed7270..f4e9ac1bf04 100644 --- a/components/canvas/Cargo.toml +++ b/components/canvas/Cargo.toml @@ -19,7 +19,6 @@ ipc-channel = "0.7" log = "0.3.5" num-traits = "0.1.32" offscreen_gl_context = "0.6" -plugins = {path = "../plugins"} servo_config = {path = "../config"} [dependencies.webrender_traits] diff --git a/components/canvas/lib.rs b/components/canvas/lib.rs index 70143d80a86..b96c07ccba3 100644 --- a/components/canvas/lib.rs +++ b/components/canvas/lib.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)] - #![deny(unsafe_code)] extern crate azure; diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml index 64e0cc1f0d5..3827ea51f86 100644 --- a/components/canvas_traits/Cargo.toml +++ b/components/canvas_traits/Cargo.toml @@ -15,7 +15,6 @@ euclid = "0.11" heapsize = "0.3.0" heapsize_derive = "0.1" ipc-channel = "0.7" -plugins = {path = "../plugins"} serde = {version = "0.9", features = ["unstable"]} serde_derive = "0.9" diff --git a/components/canvas_traits/lib.rs b/components/canvas_traits/lib.rs index e9f73a83adf..3d74b84f475 100644 --- a/components/canvas_traits/lib.rs +++ b/components/canvas_traits/lib.rs @@ -4,8 +4,6 @@ #![crate_name = "canvas_traits"] #![crate_type = "rlib"] -#![feature(plugin)] -#![plugin(plugins)] #![deny(unsafe_code)] diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml index ba89a3d6ab0..aec4550a72f 100644 --- a/components/compositing/Cargo.toml +++ b/components/compositing/Cargo.toml @@ -18,7 +18,6 @@ ipc-channel = "0.7" log = "0.3.5" msg = {path = "../msg"} net_traits = {path = "../net_traits"} -plugins = {path = "../plugins"} profile_traits = {path = "../profile_traits"} script_traits = {path = "../script_traits"} servo_config = {path = "../config", features = ["servo"]} diff --git a/components/compositing/lib.rs b/components/compositing/lib.rs index 8c7d2991959..645cf737877 100644 --- a/components/compositing/lib.rs +++ b/components/compositing/lib.rs @@ -2,11 +2,8 @@ * 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(plugin)] -#![plugin(plugins)] - #![deny(unsafe_code)] +#![feature(box_syntax)] extern crate euclid; extern crate gfx_traits; diff --git a/components/config/Cargo.toml b/components/config/Cargo.toml index 02af22c68fd..e42a2e4e5f2 100644 --- a/components/config/Cargo.toml +++ b/components/config/Cargo.toml @@ -11,7 +11,7 @@ path = "lib.rs" [features] # servo as opposed to geckolib -servo = ["plugins", "serde", "serde_derive", "servo_url/servo"] +servo = ["serde", "serde_derive", "servo_url/servo"] [dependencies] euclid = "0.11" @@ -19,7 +19,6 @@ getopts = "0.2.11" lazy_static = "0.2" log = "0.3.5" num_cpus = "1.1.0" -plugins = {path = "../plugins", optional = true} rustc-serialize = "0.3" serde = {version = "0.9", optional = true} serde_derive = {version = "0.9", optional = true} diff --git a/components/config/lib.rs b/components/config/lib.rs index f7ba7e5f0ca..1a0c5b10186 100644 --- a/components/config/lib.rs +++ b/components/config/lib.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/. */ -#![cfg_attr(feature = "servo", feature(plugin))] -#![cfg_attr(feature = "servo", plugin(plugins))] - #![deny(unsafe_code)] extern crate euclid; diff --git a/components/constellation/Cargo.toml b/components/constellation/Cargo.toml index 4d3524b9d20..568edb9586d 100644 --- a/components/constellation/Cargo.toml +++ b/components/constellation/Cargo.toml @@ -26,7 +26,6 @@ log = "0.3.5" msg = {path = "../msg"} net_traits = {path = "../net_traits"} offscreen_gl_context = "0.6" -plugins = {path = "../plugins"} profile_traits = {path = "../profile_traits"} script_traits = {path = "../script_traits"} serde = "0.9" diff --git a/components/constellation/lib.rs b/components/constellation/lib.rs index 92417412887..22e7a29a9de 100644 --- a/components/constellation/lib.rs +++ b/components/constellation/lib.rs @@ -2,13 +2,10 @@ * 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/. */ +#![deny(unsafe_code)] #![feature(box_syntax)] #![feature(conservative_impl_trait)] #![feature(mpsc_select)] -#![feature(plugin)] -#![plugin(plugins)] - -#![deny(unsafe_code)] extern crate backtrace; extern crate bluetooth_traits; diff --git a/components/devtools/Cargo.toml b/components/devtools/Cargo.toml index 75ecd3263a3..d1d35ddafca 100644 --- a/components/devtools/Cargo.toml +++ b/components/devtools/Cargo.toml @@ -17,7 +17,6 @@ hyper_serde = "0.5" ipc-channel = "0.7" log = "0.3.5" msg = {path = "../msg"} -plugins = {path = "../plugins"} serde = "0.9" serde_derive = "0.9" serde_json = "0.9" diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs index 5f3a1397ac3..380c5c85236 100644 --- a/components/devtools/lib.rs +++ b/components/devtools/lib.rs @@ -10,12 +10,9 @@ #![crate_name = "devtools"] #![crate_type = "rlib"] -#![feature(box_syntax)] -#![feature(plugin)] -#![plugin(plugins)] - #![allow(non_snake_case)] #![deny(unsafe_code)] +#![feature(box_syntax)] extern crate devtools_traits; extern crate encoding; diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index e2f19db0a99..3e496106f21 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -27,7 +27,6 @@ log = "0.3.5" msg = {path = "../msg"} net_traits = {path = "../net_traits"} ordered-float = "0.4" -plugins = {path = "../plugins"} range = {path = "../range"} serde = "0.9" serde_derive = "0.9" diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs index 3ada12238ac..09c1c16951d 100644 --- a/components/gfx/lib.rs +++ b/components/gfx/lib.rs @@ -8,12 +8,9 @@ #![cfg_attr(any(target_os = "linux", target_os = "android"), feature(alloc))] #![feature(box_syntax)] -#![feature(plugin)] #![feature(range_contains)] #![feature(unique)] -#![plugin(plugins)] - #![deny(unsafe_code)] #[cfg(any(target_os = "linux", target_os = "android"))] diff --git a/components/gfx_traits/Cargo.toml b/components/gfx_traits/Cargo.toml index f832ebb3004..c8beb2ad2b7 100644 --- a/components/gfx_traits/Cargo.toml +++ b/components/gfx_traits/Cargo.toml @@ -12,7 +12,6 @@ path = "lib.rs" [dependencies] heapsize = "0.3.0" heapsize_derive = "0.1" -plugins = {path = "../plugins"} range = {path = "../range"} serde = "0.9" serde_derive = "0.9" diff --git a/components/gfx_traits/lib.rs b/components/gfx_traits/lib.rs index a23c8e012bc..0dae3d6fff1 100644 --- a/components/gfx_traits/lib.rs +++ b/components/gfx_traits/lib.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)] - #![crate_name = "gfx_traits"] #![crate_type = "rlib"] diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index 85b7ddb1d38..5fc1218b055 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -28,7 +28,6 @@ msg = {path = "../msg"} net_traits = {path = "../net_traits"} ordered-float = "0.4" parking_lot = "0.3.3" -plugins = {path = "../plugins"} profile_traits = {path = "../profile_traits"} range = {path = "../range"} rayon = "0.6" diff --git a/components/layout/lib.rs b/components/layout/lib.rs index bd71724c790..50ab10f052c 100644 --- a/components/layout/lib.rs +++ b/components/layout/lib.rs @@ -2,18 +2,14 @@ * 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/. */ +#![deny(unsafe_code)] #![feature(box_patterns)] #![feature(box_syntax)] #![feature(conservative_impl_trait)] #![feature(nonzero)] -#![feature(plugin)] #![feature(raw)] #![feature(step_by)] -#![deny(unsafe_code)] - -#![plugin(plugins)] - extern crate app_units; extern crate atomic_refcell; #[macro_use] diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml index 865bfdb68e9..2a46f3a2789 100644 --- a/components/layout_thread/Cargo.toml +++ b/components/layout_thread/Cargo.toml @@ -24,7 +24,6 @@ log = "0.3.5" msg = {path = "../msg"} net_traits = {path = "../net_traits"} parking_lot = {version = "0.3.3", features = ["nightly"]} -plugins = {path = "../plugins"} profile_traits = {path = "../profile_traits"} rayon = "0.6" script = {path = "../script"} diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs index 3721cc48d17..8626385a026 100644 --- a/components/layout_thread/lib.rs +++ b/components/layout_thread/lib.rs @@ -7,9 +7,6 @@ #![feature(box_syntax)] #![feature(mpsc_select)] -#![feature(plugin)] - -#![plugin(plugins)] extern crate app_units; extern crate euclid; diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml index abcd274e79d..18e41acde06 100644 --- a/components/msg/Cargo.toml +++ b/components/msg/Cargo.toml @@ -14,7 +14,6 @@ bitflags = "0.7" cssparser = {version = "0.10", features = ["heapsize", "serde"]} heapsize = "0.3.0" heapsize_derive = "0.1" -plugins = {path = "../plugins"} serde = "0.9" serde_derive = "0.9" diff --git a/components/msg/lib.rs b/components/msg/lib.rs index 6257340c385..8014597a2f4 100644 --- a/components/msg/lib.rs +++ b/components/msg/lib.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)] - #![deny(unsafe_code)] #[macro_use] diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index 612f3e786b3..da1db328a8f 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -28,7 +28,6 @@ msg = {path = "../msg"} net_traits = {path = "../net_traits"} openssl = "0.7.6" openssl-verify = "0.1" -plugins = {path = "../plugins"} profile_traits = {path = "../profile_traits"} rustc-serialize = "0.3" servo_config = {path = "../config"} diff --git a/components/net/lib.rs b/components/net/lib.rs index 082627067a8..d4edd3ec953 100644 --- a/components/net/lib.rs +++ b/components/net/lib.rs @@ -2,12 +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/. */ +#![deny(unsafe_code)] #![feature(box_syntax)] #![feature(mpsc_select)] -#![feature(plugin)] -#![plugin(plugins)] - -#![deny(unsafe_code)] extern crate brotli; extern crate content_blocker as content_blocker_parser; diff --git a/components/plugins/Cargo.toml b/components/plugins/Cargo.toml deleted file mode 100644 index ad40e1b3797..00000000000 --- a/components/plugins/Cargo.toml +++ /dev/null @@ -1,18 +0,0 @@ -[package] -name = "plugins" -version = "0.0.1" -authors = ["The Servo Project Developers"] -license = "MPL-2.0" -publish = false - -[lib] -name = "plugins" -path = "lib.rs" -plugin = true - -[dependencies.clippy_lints] -version = "0.0.112" -optional = true - -[features] -clippy = ["clippy_lints"] diff --git a/components/plugins/lib.rs b/components/plugins/lib.rs deleted file mode 100644 index d3e54a21a4d..00000000000 --- a/components/plugins/lib.rs +++ /dev/null @@ -1,22 +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/. */ - -//! Exists only to hook into clippy. - -#![cfg_attr(feature = "clippy", feature(plugin, plugin_registrar, rustc_private))] -#![deny(unsafe_code)] - -#[cfg(feature = "clippy")] -extern crate clippy_lints; -#[cfg(feature = "clippy")] -extern crate rustc_plugin; - -#[cfg(feature = "clippy")] -use rustc_plugin::Registry; - -#[cfg(feature = "clippy")] -#[plugin_registrar] -pub fn plugin_registrar(reg: &mut Registry) { - ::clippy_lints::register_plugins(reg); -} diff --git a/components/profile/Cargo.toml b/components/profile/Cargo.toml index f85f5264aa0..275b3d92d19 100644 --- a/components/profile/Cargo.toml +++ b/components/profile/Cargo.toml @@ -11,7 +11,6 @@ path = "lib.rs" [dependencies] profile_traits = {path = "../profile_traits"} -plugins = {path = "../plugins"} ipc-channel = "0.7" heartbeats-simple = "0.4" log = "0.3.5" diff --git a/components/profile/lib.rs b/components/profile/lib.rs index a2a4d3da449..6a598ad3764 100644 --- a/components/profile/lib.rs +++ b/components/profile/lib.rs @@ -4,8 +4,6 @@ #![cfg_attr(not(target_os = "windows"), feature(alloc_jemalloc))] #![feature(box_syntax)] -#![feature(plugin)] -#![plugin(plugins)] #![deny(unsafe_code)] diff --git a/components/profile_traits/Cargo.toml b/components/profile_traits/Cargo.toml index 15afbf0dfc9..ab85d396960 100644 --- a/components/profile_traits/Cargo.toml +++ b/components/profile_traits/Cargo.toml @@ -17,7 +17,6 @@ energy-monitor = {version = "0.2.0", optional = true} energymon = {git = "https://github.com/energymon/energymon-rust.git", optional = true} ipc-channel = "0.7" log = "0.3.5" -plugins = {path = "../plugins"} serde = "0.9" serde_derive = "0.9" servo_config = {path = "../config"} diff --git a/components/profile_traits/lib.rs b/components/profile_traits/lib.rs index ed042262f31..5a2d96bae10 100644 --- a/components/profile_traits/lib.rs +++ b/components/profile_traits/lib.rs @@ -6,11 +6,8 @@ //! 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(plugin)] -#![plugin(plugins)] - #![deny(unsafe_code)] +#![feature(box_syntax)] extern crate ipc_channel; #[macro_use] diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 4007e7ae040..eb737dfb2b6 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -63,7 +63,6 @@ offscreen_gl_context = "0.6" open = "1.1.1" parking_lot = "0.3" phf = "0.7.18" -plugins = {path = "../plugins"} profile_traits = {path = "../profile_traits"} range = {path = "../range"} ref_filter_map = "1.0.1" diff --git a/components/script/lib.rs b/components/script/lib.rs index 92be1272d6f..8a2829059c0 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -22,7 +22,6 @@ #![doc = "The script crate contains all matters DOM."] -#![plugin(plugins)] #![plugin(script_plugins)] extern crate angle; diff --git a/components/script_layout_interface/Cargo.toml b/components/script_layout_interface/Cargo.toml index 6476693f758..a938251f533 100644 --- a/components/script_layout_interface/Cargo.toml +++ b/components/script_layout_interface/Cargo.toml @@ -24,7 +24,6 @@ libc = "0.2" log = "0.3.5" msg = {path = "../msg"} net_traits = {path = "../net_traits"} -plugins = {path = "../plugins"} profile_traits = {path = "../profile_traits"} range = {path = "../range"} script_traits = {path = "../script_traits"} diff --git a/components/script_layout_interface/lib.rs b/components/script_layout_interface/lib.rs index d5bebc8b2d3..87b76763d7d 100644 --- a/components/script_layout_interface/lib.rs +++ b/components/script_layout_interface/lib.rs @@ -9,8 +9,6 @@ #![deny(unsafe_code)] #![feature(box_syntax)] #![feature(nonzero)] -#![feature(plugin)] -#![plugin(plugins)] extern crate app_units; extern crate atomic_refcell; diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml index 682eb002f81..4d5991074eb 100644 --- a/components/script_traits/Cargo.toml +++ b/components/script_traits/Cargo.toml @@ -26,7 +26,6 @@ libc = "0.2" msg = {path = "../msg"} net_traits = {path = "../net_traits"} offscreen_gl_context = "0.6" -plugins = {path = "../plugins"} profile_traits = {path = "../profile_traits"} rustc-serialize = "0.3.4" serde = "0.9" diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index 92a2304bda8..7bf54dc841a 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -6,8 +6,6 @@ //! The traits are here instead of in script so that these modules won't have //! to depend on script. -#![feature(plugin)] -#![plugin(plugins)] #![deny(missing_docs)] #![deny(unsafe_code)] diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index 8c66ba323b8..79706205483 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -17,7 +17,6 @@ max_log_level = ["log/release_max_level_info"] webdriver = ["webdriver_server"] energy-profiling = ["profile_traits/energy-profiling"] testing = ["style/testing"] -clippy = ["plugins/clippy"] debugmozjs = ["script/debugmozjs"] [dependencies] @@ -40,7 +39,6 @@ log = "0.3" msg = {path = "../msg"} net = {path = "../net"} net_traits = {path = "../net_traits"} -plugins = {path = "../plugins", optional = true} profile = {path = "../profile"} profile_traits = {path = "../profile_traits"} script = {path = "../script"} diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml index 51ebd48b330..689ddf039a4 100644 --- a/components/webdriver_server/Cargo.toml +++ b/components/webdriver_server/Cargo.toml @@ -18,7 +18,6 @@ ipc-channel = "0.7" log = "0.3.5" msg = {path = "../msg"} net_traits = {path = "../net_traits"} -plugins = {path = "../plugins"} regex = "0.2" rustc-serialize = "0.3.4" script_traits = {path = "../script_traits"} diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs index 6f9243da146..e243bc2b05e 100644 --- a/components/webdriver_server/lib.rs +++ b/components/webdriver_server/lib.rs @@ -5,9 +5,6 @@ #![crate_name = "webdriver_server"] #![crate_type = "rlib"] -#![feature(plugin)] -#![plugin(plugins)] - #![deny(unsafe_code)] extern crate cookie as cookie_rs; diff --git a/ports/cef/Cargo.toml b/ports/cef/Cargo.toml index 6767105ac43..6fb5fad5dcf 100644 --- a/ports/cef/Cargo.toml +++ b/ports/cef/Cargo.toml @@ -28,7 +28,6 @@ libservo = {path = "../../components/servo"} log = {version = "0.3.5", features = ["release_max_level_info"]} msg = {path = "../../components/msg"} net_traits = {path = "../../components/net_traits"} -plugins = {path = "../../components/plugins"} script_traits = {path = "../../components/script_traits"} servo_config = {path = "../../components/config"} servo_geometry = {path = "../../components/geometry"} diff --git a/ports/cef/lib.rs b/ports/cef/lib.rs index f627c85f2b1..f953358e4a9 100644 --- a/ports/cef/lib.rs +++ b/ports/cef/lib.rs @@ -2,14 +2,10 @@ * 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/. */ +#![allow(non_camel_case_types)] #![feature(box_syntax)] #![feature(core_intrinsics)] #![feature(link_args)] -#![feature(plugin)] - -#![allow(non_camel_case_types)] - -#![plugin(plugins)] #[macro_use] extern crate log; diff --git a/ports/servo/Cargo.toml b/ports/servo/Cargo.toml index ea46d7f4f9a..fb0746a9674 100644 --- a/ports/servo/Cargo.toml +++ b/ports/servo/Cargo.toml @@ -32,7 +32,6 @@ max_log_level = ["log/release_max_level_info"] webdriver = ["libservo/webdriver_server"] energy-profiling = ["libservo/energy-profiling"] testing = ["libservo/testing"] -clippy = ["libservo/clippy"] debugmozjs = ["libservo/debugmozjs"] [dependencies] diff --git a/python/servo/devenv_commands.py b/python/servo/devenv_commands.py index e2acab9b979..bb5ed6d2704 100644 --- a/python/servo/devenv_commands.py +++ b/python/servo/devenv_commands.py @@ -10,7 +10,6 @@ from __future__ import print_function, unicode_literals from os import path, getcwd, listdir -import subprocess import sys from mach.decorators import ( @@ -87,26 +86,6 @@ class MachCommands(CommandBase): call(["cargo", "update"] + params, env=self.build_env()) - @Command('clippy', - description='Run Clippy', - category='devenv') - @CommandArgument( - '--package', '-p', default=None, - help='Updates the selected package') - @CommandArgument( - '--json', '-j', action="store_true", - help='Outputs') - def clippy(self, package=None, json=False): - params = ["--features=clippy"] - if package: - params += ["-p", package] - if json: - params += ["--", "-Zunstable-options", "--error-format", "json"] - - with cd(path.join(self.context.topdir, "components", "servo")): - return subprocess.call(["cargo", "rustc", "-v"] + params, - env=self.build_env()) - @Command('rustc', description='Run the Rust compiler', category='devenv') diff --git a/servo-tidy.toml b/servo-tidy.toml index be60a7276ba..4687a58842b 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -31,7 +31,7 @@ num = [] [ignore] # Ignored packages with duplicated versions -packages = ["byteorder", "semver", "serde_codegen_internals", "syn"] +packages = ["byteorder", "serde_codegen_internals", "syn"] # Files that are ignored for all tidy and lint checks. files = [ # Generated and upstream code combined with our own. Could use cleanup diff --git a/tests/unit/net/Cargo.toml b/tests/unit/net/Cargo.toml index ab0dacff885..bbfe3dfc251 100644 --- a/tests/unit/net/Cargo.toml +++ b/tests/unit/net/Cargo.toml @@ -20,7 +20,6 @@ ipc-channel = "0.7" msg = {path = "../../../components/msg"} net = {path = "../../../components/net"} net_traits = {path = "../../../components/net_traits"} -plugins = {path = "../../../components/plugins"} profile_traits = {path = "../../../components/profile_traits"} servo_config = {path = "../../../components/config"} time = "0.1" diff --git a/tests/unit/net/lib.rs b/tests/unit/net/lib.rs index 47f732dc7b8..ce8ad0416c5 100644 --- a/tests/unit/net/lib.rs +++ b/tests/unit/net/lib.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 content_blocker; extern crate cookie as cookie_rs; extern crate devtools_traits; diff --git a/tests/unit/script/Cargo.toml b/tests/unit/script/Cargo.toml index b3410706376..4b1f693d5f6 100644 --- a/tests/unit/script/Cargo.toml +++ b/tests/unit/script/Cargo.toml @@ -12,6 +12,5 @@ doctest = false [dependencies] euclid = "0.11" msg = {path = "../../../components/msg"} -plugins = {path = "../../../components/plugins"} script = {path = "../../../components/script"} servo_url = {path = "../../../components/url"} diff --git a/tests/unit/script/lib.rs b/tests/unit/script/lib.rs index 9b8c1ba6f5e..83131e51dd2 100644 --- a/tests/unit/script/lib.rs +++ b/tests/unit/script/lib.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 euclid; extern crate msg; extern crate script;