Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove Temporary::new()

Browse source 
Temporary::from_rooted() now takes an Assignable value.
This commit is contained in:
Anthony Ramine 2015-04-27 18:34:15 +02:00
parent 2770886196
commit 1a30925cad
19 changed files with 45 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/script/dom/node.rs
View file

@ -570,25 +570,25 @@ impl<'a> NodeHelpers for JSRef<'a, Node> {
}
fn parent_node(self) -> Option<Temporary<Node>> {
self.parent_node.get().map(Temporary::new)
self.parent_node.get().map(Temporary::from_rooted)
}
fn first_child(self) -> Option<Temporary<Node>> {
self.first_child.get().map(Temporary::new)
self.first_child.get().map(Temporary::from_rooted)
}
fn last_child(self) -> Option<Temporary<Node>> {
self.last_child.get().map(Temporary::new)
self.last_child.get().map(Temporary::from_rooted)
}
/// Returns the previous sibling of this node. Fails if this node is borrowed mutably.
fn prev_sibling(self) -> Option<Temporary<Node>> {
self.prev_sibling.get().map(Temporary::new)
self.prev_sibling.get().map(Temporary::from_rooted)
}
/// Returns the next sibling of this node. Fails if this node is borrowed mutably.
fn next_sibling(self) -> Option<Temporary<Node>> {
self.next_sibling.get().map(Temporary::new)
self.next_sibling.get().map(Temporary::from_rooted)
}
#[inline]
@ -947,7 +947,7 @@ impl<'a> NodeHelpers for JSRef<'a, Node> {
}
fn owner_doc(self) -> Temporary<Document> {
Temporary::new(self.owner_doc.get().unwrap())
Temporary::from_rooted(self.owner_doc.get().unwrap())
}
fn set_owner_doc(self, document: JSRef<Document>) {
@ -1873,7 +1873,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> {
// https://dom.spec.whatwg.org/#dom-node-parentnode
fn GetParentNode(self) -> Option<Temporary<Node>> {
self.parent_node.get().map(Temporary::new)
self.parent_node.get().map(Temporary::from_rooted)
}
// https://dom.spec.whatwg.org/#dom-node-parentelement
@ -1903,22 +1903,22 @@ impl<'a> NodeMethods for JSRef<'a, Node> {
// https://dom.spec.whatwg.org/#dom-node-firstchild
fn GetFirstChild(self) -> Option<Temporary<Node>> {
self.first_child.get().map(Temporary::new)
self.first_child.get().map(Temporary::from_rooted)
}
// https://dom.spec.whatwg.org/#dom-node-lastchild
fn GetLastChild(self) -> Option<Temporary<Node>> {
self.last_child.get().map(Temporary::new)
self.last_child.get().map(Temporary::from_rooted)
}
// https://dom.spec.whatwg.org/#dom-node-previoussibling
fn GetPreviousSibling(self) -> Option<Temporary<Node>> {
self.prev_sibling.get().map(Temporary::new)
self.prev_sibling.get().map(Temporary::from_rooted)
}
// https://dom.spec.whatwg.org/#dom-node-nextsibling
fn GetNextSibling(self) -> Option<Temporary<Node>> {
self.next_sibling.get().map(Temporary::new)
self.next_sibling.get().map(Temporary::from_rooted)
}
// https://dom.spec.whatwg.org/#dom-node-nodevalue