servo: Merge #19098 - Make the unrooted_must_root conditional on a default Cargo feature (from servo:minimal-plugin); r=jdm

Only http://perf.rust-lang.org/ will disable it, in order to be less subject to changes to rustc internal APIs.

Source-Repo: https://github.com/servo/servo
Source-Revision: 7f2ac4c559a2ff99ed7571af646ecee3f33168c3

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 5e7a81c7387f21ed3b09a6740015485f8d813c32
This commit is contained in:
Simon Sapin 2017-11-02 09:28:13 -05:00
parent 55f243558a
commit 39b145c573
4 changed files with 15 additions and 1 deletions

View File

@ -14,6 +14,8 @@ path = "lib.rs"
[features]
debugmozjs = ['js/debugmozjs']
unstable = ["servo_allocator/unstable"]
unrooted_must_root_lint = ["script_plugins/unrooted_must_root_lint"]
default = ["unrooted_must_root_lint"]
[build-dependencies]
cmake = "0.1"
@ -85,7 +87,7 @@ servo_geometry = {path = "../geometry" }
servo_rand = {path = "../rand"}
servo_url = {path = "../url"}
smallvec = "0.4"
style = {path = "../style"}
style = {path = "../style", features = ["servo"]}
style_traits = {path = "../style_traits"}
swapper = "0.1"
time = "0.1.12"

View File

@ -16,6 +16,7 @@
#![doc = "The script crate contains all matters DOM."]
#![plugin(script_plugins)]
#![cfg_attr(not(feature = "unrooted_must_root_lint"), allow(unknown_lints))]
extern crate angle;
extern crate app_units;

View File

@ -8,3 +8,6 @@ publish = false
[lib]
path = "lib.rs"
plugin = true
[features]
unrooted_must_root_lint = []

View File

@ -14,27 +14,35 @@
//! Use this for structs that correspond to a DOM type
#![deny(unsafe_code)]
#![feature(macro_vis_matcher)]
#![feature(plugin)]
#![feature(plugin_registrar)]
#![feature(rustc_private)]
#[cfg(feature = "unrooted_must_root_lint")]
#[macro_use]
extern crate rustc;
extern crate rustc_plugin;
extern crate syntax;
use rustc_plugin::Registry;
use syntax::feature_gate::AttributeType::Whitelisted;
#[cfg(feature = "unrooted_must_root_lint")]
mod unrooted_must_root;
/// Utilities for writing plugins
#[cfg(feature = "unrooted_must_root_lint")]
mod utils;
#[plugin_registrar]
pub fn plugin_registrar(reg: &mut Registry) {
#[cfg(feature = "unrooted_must_root_lint")]
reg.register_late_lint_pass(Box::new(unrooted_must_root::UnrootedPass::new()));
reg.register_attribute("allow_unrooted_interior".to_string(), Whitelisted);
reg.register_attribute("must_root".to_string(), Whitelisted);
}