Don't allow unrooted values in function arguments.

This commit is contained in:
Eli Friedman 2015-10-20 11:05:27 -07:00
parent 81ecf7824c
commit a9ef40c716
4 changed files with 17 additions and 10 deletions

View file

@ -129,17 +129,18 @@ impl LateLintPass for UnrootedPass {
visit::FnKind::Closure => return,
};
if !in_new_function {
for arg in &decl.inputs {
cx.tcx.ast_ty_to_ty_cache.borrow().get(&arg.ty.id).map(|t| {
if is_unrooted_ty(cx, t, false) {
if in_derive_expn(cx, span) {
return;
}
cx.span_lint(UNROOTED_MUST_ROOT, arg.ty.span, "Type must be rooted")
for arg in &decl.inputs {
cx.tcx.ast_ty_to_ty_cache.borrow().get(&arg.ty.id).map(|t| {
if is_unrooted_ty(cx, t, false) {
if in_derive_expn(cx, span) {
return;
}
});
}
cx.span_lint(UNROOTED_MUST_ROOT, arg.ty.span, "Type must be rooted")
}
});
}
if !in_new_function {
if let hir::Return(ref ty) = decl.output {
cx.tcx.ast_ty_to_ty_cache.borrow().get(&ty.id).map(|t| {
if is_unrooted_ty(cx, t, false) {

View file

@ -18,6 +18,7 @@ pub struct FileList {
}
impl FileList {
#[allow(unrooted_must_root)]
fn new_inherited(files: Vec<JS<File>>) -> FileList {
FileList {
reflector_: Reflector::new(),
@ -25,6 +26,7 @@ impl FileList {
}
}
#[allow(unrooted_must_root)]
pub fn new(window: &Window, files: Vec<JS<File>>) -> Root<FileList> {
reflect_dom_object(box FileList::new_inherited(files), GlobalRef::Window(window), FileListBinding::Wrap)
}

View file

@ -32,6 +32,7 @@ pub struct HTMLCollection {
}
impl HTMLCollection {
#[allow(unrooted_must_root)]
fn new_inherited(collection: Collection) -> HTMLCollection {
HTMLCollection {
reflector_: Reflector::new(),
@ -39,6 +40,7 @@ impl HTMLCollection {
}
}
#[allow(unrooted_must_root)]
pub fn new(window: &Window, collection: Collection) -> Root<HTMLCollection> {
reflect_dom_object(box HTMLCollection::new_inherited(collection),
GlobalRef::Window(window), HTMLCollectionBinding::Wrap)

View file

@ -27,6 +27,7 @@ pub struct NodeList {
}
impl NodeList {
#[allow(unrooted_must_root)]
fn new_inherited(list_type: NodeListType) -> NodeList {
NodeList {
reflector_: Reflector::new(),
@ -34,6 +35,7 @@ impl NodeList {
}
}
#[allow(unrooted_must_root)]
pub fn new(window: &Window,
list_type: NodeListType) -> Root<NodeList> {
reflect_dom_object(box NodeList::new_inherited(list_type),