aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/treewalker.rs
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2017-06-18 13:21:32 +0200
committerSimon Sapin <simon.sapin@exyr.org>2017-06-18 13:21:49 +0200
commit7af5a7fd5409ab8db0274eb829136e5953e718ed (patch)
treeee7103d6651e45943609118f93cc8789ebbb4d86 /components/script/dom/treewalker.rs
parenta5bb55790fe34de6e6dc561314d2a9491972585e (diff)
downloadservo-7af5a7fd5409ab8db0274eb829136e5953e718ed.tar.gz
servo-7af5a7fd5409ab8db0274eb829136e5953e718ed.zip
Untry script
Diffstat (limited to 'components/script/dom/treewalker.rs')
-rw-r--r--components/script/dom/treewalker.rs16
1 files changed, 8 insertions, 8 deletions
diff --git a/components/script/dom/treewalker.rs b/components/script/dom/treewalker.rs
index 2409d65af4f..8515d7b6ae7 100644
--- a/components/script/dom/treewalker.rs
+++ b/components/script/dom/treewalker.rs
@@ -104,7 +104,7 @@ impl TreeWalkerMethods for TreeWalker {
node = n;
// "2. If node is not null and filtering node returns FILTER_ACCEPT,
// then set the currentNode attribute to node, return node."
- if NodeFilterConstants::FILTER_ACCEPT == try!(self.accept_node(&node)) {
+ if NodeFilterConstants::FILTER_ACCEPT == self.accept_node(&node)? {
self.current_node.set(&node);
return Ok(Some(node))
}
@@ -163,7 +163,7 @@ impl TreeWalkerMethods for TreeWalker {
// "4. If result is FILTER_ACCEPT, then
// set the currentNode attribute to node and return node."
loop {
- let result = try!(self.accept_node(&node));
+ let result = self.accept_node(&node)?;
match result {
NodeFilterConstants::FILTER_REJECT => break,
_ if node.GetFirstChild().is_some() =>
@@ -192,7 +192,7 @@ impl TreeWalkerMethods for TreeWalker {
}
// "5. Filter node and if the return value is FILTER_ACCEPT, then
// set the currentNode attribute to node and return node."
- if NodeFilterConstants::FILTER_ACCEPT == try!(self.accept_node(&node)) {
+ if NodeFilterConstants::FILTER_ACCEPT == self.accept_node(&node)? {
self.current_node.set(&node);
return Ok(Some(node))
}
@@ -220,7 +220,7 @@ impl TreeWalkerMethods for TreeWalker {
// "1. Set node to its first child."
node = child;
// "2. Filter node and set result to the return value."
- result = try!(self.accept_node(&node));
+ result = self.accept_node(&node)?;
// "3. If result is FILTER_ACCEPT, then
// set the currentNode attribute to node and return node."
if NodeFilterConstants::FILTER_ACCEPT == result {
@@ -238,7 +238,7 @@ impl TreeWalkerMethods for TreeWalker {
Some(n) => {
node = n;
// "3. Filter node and set result to the return value."
- result = try!(self.accept_node(&node));
+ result = self.accept_node(&node)?;
// "4. If result is FILTER_ACCEPT, then
// set the currentNode attribute to node and return node."
if NodeFilterConstants::FILTER_ACCEPT == result {
@@ -275,7 +275,7 @@ impl TreeWalker {
// 4. Main: Repeat these substeps:
'main: loop {
// "1. Filter node and let result be the return value."
- let result = try!(self.accept_node(&node));
+ let result = self.accept_node(&node)?;
match result {
// "2. If result is FILTER_ACCEPT, then set the currentNode
// attribute to node and return node."
@@ -350,7 +350,7 @@ impl TreeWalker {
// "1. Set node to sibling."
node = sibling_op.unwrap();
// "2. Filter node and let result be the return value."
- let result = try!(self.accept_node(&node));
+ let result = self.accept_node(&node)?;
// "3. If result is FILTER_ACCEPT, then set the currentNode
// attribute to node and return node."
if NodeFilterConstants::FILTER_ACCEPT == result {
@@ -378,7 +378,7 @@ impl TreeWalker {
// "5. Filter node and if the return value is FILTER_ACCEPT, then return null."
Some(n) => {
node = n;
- if NodeFilterConstants::FILTER_ACCEPT == try!(self.accept_node(&node)) {
+ if NodeFilterConstants::FILTER_ACCEPT == self.accept_node(&node)? {
return Ok(None)
}
}