aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/nodeiterator.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-08-27 09:38:48 -0600
committerbors-servo <metajack+bors@gmail.com>2015-08-27 09:38:48 -0600
commit909429702972d53bf02dfe9a4aa93ea0cb588cf4 (patch)
tree1a64c15ec378b98ae445257c1c7177af65afee6b /components/script/dom/nodeiterator.rs
parent2d704312685249c20fa71d983094fc4e689bc5ff (diff)
parent2a028f66a2e7ab56094cf856ebdc20bc49ab7d4d (diff)
downloadservo-909429702972d53bf02dfe9a4aa93ea0cb588cf4.tar.gz
servo-909429702972d53bf02dfe9a4aa93ea0cb588cf4.zip
Auto merge of #7401 - nox:rm-helpers, r=Manishearth
Remove helper traits Now that `JSRef<T>` is gone, there is no need to have helper traits. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7401) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/nodeiterator.rs')
-rw-r--r--components/script/dom/nodeiterator.rs16
1 files changed, 4 insertions, 12 deletions
diff --git a/components/script/dom/nodeiterator.rs b/components/script/dom/nodeiterator.rs
index ec12b951b23..31b90309c33 100644
--- a/components/script/dom/nodeiterator.rs
+++ b/components/script/dom/nodeiterator.rs
@@ -12,8 +12,8 @@ use dom::bindings::error::Fallible;
use dom::bindings::global::GlobalRef;
use dom::bindings::js::{JS, MutHeap, Root};
use dom::bindings::utils::{Reflector, reflect_dom_object};
-use dom::document::{Document, DocumentHelpers};
-use dom::node::{Node, NodeHelpers};
+use dom::document::Document;
+use dom::node::Node;
use std::cell::Cell;
use std::rc::Rc;
@@ -191,14 +191,10 @@ impl<'a> NodeIteratorMethods for &'a NodeIterator {
}
}
-trait PrivateNodeIteratorHelpers {
- fn accept_node(self, node: &Node) -> Fallible<u16>;
- fn is_root_node(self, node: &Node) -> bool;
-}
-impl<'a> PrivateNodeIteratorHelpers for &'a NodeIterator {
+impl NodeIterator {
// https://dom.spec.whatwg.org/#concept-node-filter
- fn accept_node(self, node: &Node) -> Fallible<u16> {
+ fn accept_node(&self, node: &Node) -> Fallible<u16> {
// Step 1.
let n = node.NodeType() - 1;
// Step 2.
@@ -212,10 +208,6 @@ impl<'a> PrivateNodeIteratorHelpers for &'a NodeIterator {
Filter::Callback(ref callback) => callback.AcceptNode_(self, node, Rethrow)
}
}
-
- fn is_root_node(self, node: &Node) -> bool {
- JS::from_ref(node) == self.root_node
- }
}