Skip to content
Permalink
Browse files

Remove an extra lifetime parameter on PrivateTreeWalkerHelpers

  • Loading branch information
Cameron Zwarich
Cameron Zwarich committed Oct 1, 2014
1 parent 7265671 commit 0ef191b37ad98a3225cb73cbaef11f23d70c0243
Showing with 11 additions and 11 deletions.
  1. +11 −11 components/script/dom/treewalker.rs
@@ -129,16 +129,16 @@ impl Reflectable for TreeWalker {
}
}

type NodeAdvancer<'a, 'b> = |node: JSRef<'a, Node>|: 'b -> Option<Temporary<Node>>;
type NodeAdvancer<'a> = |node: JSRef<'a, Node>|: 'a -> Option<Temporary<Node>>;

trait PrivateTreeWalkerHelpers<'a, 'b> {
trait PrivateTreeWalkerHelpers<'a> {
fn traverse_children(self,
next_child: NodeAdvancer<'a, 'b>,
next_sibling: NodeAdvancer<'a, 'b>)
next_child: NodeAdvancer<'a>,
next_sibling: NodeAdvancer<'a>)
-> Fallible<Option<Temporary<Node>>>;
fn traverse_siblings(self,
next_child: NodeAdvancer<'a, 'b>,
next_sibling: NodeAdvancer<'a, 'b>)
next_child: NodeAdvancer<'a>,
next_sibling: NodeAdvancer<'a>)
-> Fallible<Option<Temporary<Node>>>;
fn is_root_node(self, node: JSRef<'a, Node>) -> bool;
fn is_current_node(self, node: JSRef<'a, Node>) -> bool;
@@ -147,11 +147,11 @@ trait PrivateTreeWalkerHelpers<'a, 'b> {
fn accept_node(self, node: JSRef<'a, Node>) -> Fallible<u16>;
}

impl<'a, 'b> PrivateTreeWalkerHelpers<'a, 'b> for JSRef<'a, TreeWalker> {
impl<'a> PrivateTreeWalkerHelpers<'a> for JSRef<'a, TreeWalker> {
// http://dom.spec.whatwg.org/#concept-traverse-children
fn traverse_children(self,
next_child: NodeAdvancer<'a, 'b>,
next_sibling: NodeAdvancer<'a, 'b>)
next_child: NodeAdvancer<'a>,
next_sibling: NodeAdvancer<'a>)
-> Fallible<Option<Temporary<Node>>> {
// "To **traverse children** of type *type*, run these steps:"
// "1. Let node be the value of the currentNode attribute."
@@ -229,8 +229,8 @@ impl<'a, 'b> PrivateTreeWalkerHelpers<'a, 'b> for JSRef<'a, TreeWalker> {

// http://dom.spec.whatwg.org/#concept-traverse-siblings
fn traverse_siblings(self,
next_child: NodeAdvancer<'a, 'b>,
next_sibling: NodeAdvancer<'a, 'b>)
next_child: NodeAdvancer<'a>,
next_sibling: NodeAdvancer<'a>)
-> Fallible<Option<Temporary<Node>>> {
// "To **traverse siblings** of type *type* run these steps:"
// "1. Let node be the value of the currentNode attribute."

5 comments on commit 0ef191b

@bors-servo

This comment has been minimized.

Copy link
Contributor

@bors-servo bors-servo replied Oct 1, 2014

@bors-servo

This comment has been minimized.

Copy link
Contributor

@bors-servo bors-servo replied Oct 1, 2014

merging zwarich/servo/more-jsref = 0ef191b into auto

@bors-servo

This comment has been minimized.

Copy link
Contributor

@bors-servo bors-servo replied Oct 1, 2014

zwarich/servo/more-jsref = 0ef191b merged ok, testing candidate = a840fed

@bors-servo

This comment has been minimized.

Copy link
Contributor

@bors-servo bors-servo replied Oct 1, 2014

@bors-servo

This comment has been minimized.

Copy link
Contributor

@bors-servo bors-servo replied Oct 1, 2014

fast-forwarding master to auto = a840fed

Please sign in to comment.
You can’t perform that action at this time.