aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/node.rs
diff options
context:
space:
mode:
authorMs2ger <ms2ger@gmail.com>2014-12-05 15:03:32 +0100
committerMs2ger <ms2ger@gmail.com>2014-12-08 12:09:58 +0100
commit91c43ac18d6085998e6b35e241f0ccc35ffbc281 (patch)
tree200a78144a64632ee6616583493466c35e244cdd /components/script/dom/node.rs
parent1611b8d0a808968d32d1f30556fecdbeb1d137b7 (diff)
downloadservo-91c43ac18d6085998e6b35e241f0ccc35ffbc281.tar.gz
servo-91c43ac18d6085998e6b35e241f0ccc35ffbc281.zip
Cleanup Node::clone.
Diffstat (limited to 'components/script/dom/node.rs')
-rw-r--r--components/script/dom/node.rs12
1 files changed, 5 insertions, 7 deletions
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index ad8624718ab..55ca2050e44 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -1561,13 +1561,11 @@ impl Node {
}.root();
// Step 3.
- let document = if copy.is_document() {
- let doc: JSRef<Document> = DocumentCast::to_ref(*copy).unwrap();
- JS::from_rooted(doc).root()
- } else {
- JS::from_rooted(*document).root()
+ let document = match DocumentCast::to_ref(*copy) {
+ Some(doc) => doc,
+ None => *document,
};
- assert!(&*copy.owner_doc().root() == &*document);
+ assert!(*copy.owner_doc().root() == document);
// Step 4 (some data already copied in step 2).
match node.type_id() {
@@ -1600,7 +1598,7 @@ impl Node {
// Step 6.
if clone_children == CloneChildren {
for child in node.children() {
- let child_copy = Node::clone(child, Some(*document), clone_children).root();
+ let child_copy = Node::clone(child, Some(document), clone_children).root();
let _inserted_node = Node::pre_insert(*child_copy, *copy, None);
}
}