Auto merge of #6140 - nox:cleanup-rootedvec, r=Manishearth

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6140)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-05-26 08:36:29 -05:00
commit 7d0409b842
6 changed files with 27 additions and 39 deletions

View file

@ -917,12 +917,9 @@ impl<'a> NodeHelpers for JSRef<'a, Node> {
// https://dom.spec.whatwg.org/#dom-parentnode-queryselectorall
#[allow(unsafe_code)]
fn query_selector_all(self, selectors: DOMString) -> Fallible<Temporary<NodeList>> {
let mut nodes = RootedVec::new();
for node in try!(unsafe { self.query_selector_iter(selectors) }) {
nodes.push(JS::from_rooted(node));
}
let window = window_from_node(self).root();
Ok(NodeList::new_simple_list(window.r(), &nodes))
let iter = try!(unsafe { self.query_selector_iter(selectors) });
Ok(NodeList::new_simple_list(window.r(), iter))
}