From a07a0cf39f1417754327247f7f9aa6c4daf72070 Mon Sep 17 00:00:00 2001 From: Keith Yeung Date: Tue, 3 Mar 2015 11:39:37 +0800 Subject: Added type parameter to PartialEq on JSRef (fixes #5112, #3960) --- components/script/dom/node.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'components/script/dom/node.rs') diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index a7b5e5484d6..f04420728e8 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -409,7 +409,7 @@ pub trait NodeHelpers<'a> { fn child_elements(self) -> ChildElementIterator<'a>; fn following_siblings(self) -> NodeChildrenIterator<'a>; fn is_in_doc(self) -> bool; - fn is_inclusive_ancestor_of(self, parent: JSRef<'a, Node>) -> bool; // FIXME: See #3960 + fn is_inclusive_ancestor_of(self, parent: JSRef) -> bool; fn is_parent_of(self, child: JSRef) -> bool; fn type_id(self) -> NodeTypeId; @@ -715,7 +715,7 @@ impl<'a> NodeHelpers<'a> for JSRef<'a, Node> { } } - fn is_inclusive_ancestor_of(self, parent: JSRef<'a, Node>) -> bool { + fn is_inclusive_ancestor_of(self, parent: JSRef) -> bool { self == parent || parent.ancestors().any(|ancestor| ancestor == self) } @@ -1376,7 +1376,7 @@ impl Node { // Step 7-8. let reference_child = match child { - Some(child) if child.clone() == node => node.next_sibling().map(|node| node.root().get_unsound_ref_forever()), + Some(child) if child == node => node.next_sibling().map(|node| node.root().get_unsound_ref_forever()), _ => child }; @@ -1946,7 +1946,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> { } // Ok if not caught by previous error checks. - if node.clone() == child { + if node == child { return Ok(Temporary::from_rooted(child)); } @@ -2106,7 +2106,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> { // http://dom.spec.whatwg.org/#dom-node-comparedocumentposition fn CompareDocumentPosition(self, other: JSRef) -> u16 { - if self.clone() == other { // FIXME: See issue #3960 + if self == other { // step 2. 0 } else { -- cgit v1.2.3