Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove an extra lifetime parameter on PrivateTreeWalkerHelpers
  • Loading branch information
Cameron Zwarich committed Oct 1, 2014
1 parent 7265671 commit 0ef191b
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions components/script/dom/treewalker.rs
Expand Up @@ -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;
Expand All @@ -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."
Expand Down Expand Up @@ -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."
Expand Down

5 comments on commit 0ef191b

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = a840fed

Please sign in to comment.