From 0ef191b37ad98a3225cb73cbaef11f23d70c0243 Mon Sep 17 00:00:00 2001 From: Cameron Zwarich Date: Wed, 1 Oct 2014 02:07:08 -0700 Subject: [PATCH] Remove an extra lifetime parameter on PrivateTreeWalkerHelpers --- components/script/dom/treewalker.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/components/script/dom/treewalker.rs b/components/script/dom/treewalker.rs index ba667c222e8..26124170289 100644 --- a/components/script/dom/treewalker.rs +++ b/components/script/dom/treewalker.rs @@ -129,16 +129,16 @@ impl Reflectable for TreeWalker { } } -type NodeAdvancer<'a, 'b> = |node: JSRef<'a, Node>|: 'b -> Option>; +type NodeAdvancer<'a> = |node: JSRef<'a, Node>|: 'a -> Option>; -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>>; fn traverse_siblings(self, - next_child: NodeAdvancer<'a, 'b>, - next_sibling: NodeAdvancer<'a, 'b>) + next_child: NodeAdvancer<'a>, + next_sibling: NodeAdvancer<'a>) -> Fallible>>; 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; } -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>> { // "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>> { // "To **traverse siblings** of type *type* run these steps:" // "1. Let node be the value of the currentNode attribute."