Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Exempt Rc<Promise> from unrooted_must_root

Browse source 
fixes #22504
This commit is contained in:
Manish Goregaokar 2019-01-03 16:17:06 -08:00
parent 7a64588efa
commit e28e73c81f
3 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/script/dom/promise.rs
View file

@ -35,6 +35,7 @@ use std::ptr;
use std::rc::Rc;
#[dom_struct]
#[allow_unrooted_in_rc]
pub struct Promise {
reflector: Reflector,
/// Since Promise values are natively reference counted without the knowledge of

1
components/script_plugins/lib.rs
View file

@ -41,5 +41,6 @@ pub fn plugin_registrar(reg: &mut Registry) {
reg.register_late_lint_pass(Box::new(unrooted_must_root::UnrootedPass::new()));
reg.register_attribute("allow_unrooted_interior".to_string(), Whitelisted);
reg.register_attribute("allow_unrooted_in_rc".to_string(), Whitelisted);
reg.register_attribute("must_root".to_string(), Whitelisted);
}

14
components/script_plugins/unrooted_must_root.rs
View file

@ -45,12 +45,24 @@ fn is_unrooted_ty(cx: &LateContext, ty: &ty::TyS, in_new_function: bool) -> bool
let mut ret = false;
ty.maybe_walk(|t| {
match t.sty {
ty::Adt(did, _) => {
ty::Adt(did, substs) => {
if cx.tcx.has_attr(did.did, "must_root") {
ret = true;
false
} else if cx.tcx.has_attr(did.did, "allow_unrooted_interior") {
false
} else if match_def_path(cx, did.did, &["alloc", "rc", "Rc"]) {
// Rc<Promise> is okay
let inner = substs.type_at(0);
if let ty::Adt(did, _) = inner.sty {
if cx.tcx.has_attr(did.did, "allow_unrooted_in_rc") {
false
} else {
true
}
} else {
true
}
} else if match_def_path(cx, did.did, &["core", "cell", "Ref"]) ||
match_def_path(cx, did.did, &["core", "cell", "RefMut"]) ||
match_def_path(cx, did.did, &["core", "slice", "Iter"]) ||