From 2d45e9d2da571e70deef137f9022de87cc1126f3 Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@limpet.net>
Date: Fri, 20 Oct 2017 08:25:35 -0700
Subject: Use try syntax for Option where appropriate

---
 components/script/dom/node.rs | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

(limited to 'components/script/dom/node.rs')

diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index 2e05eb30971..8f29298a496 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -1206,11 +1206,7 @@ pub struct FollowingNodeIterator {
 impl FollowingNodeIterator {
     /// Skips iterating the children of the current node
     pub fn next_skipping_children(&mut self) -> Option<DomRoot<Node>> {
-        let current = match self.current.take() {
-            None => return None,
-            Some(current) => current,
-        };
-
+        let current = self.current.take()?;
         self.next_skipping_children_impl(current)
     }
 
@@ -1244,10 +1240,7 @@ impl Iterator for FollowingNodeIterator {
 
     // https://dom.spec.whatwg.org/#concept-tree-following
     fn next(&mut self) -> Option<DomRoot<Node>> {
-        let current = match self.current.take() {
-            None => return None,
-            Some(current) => current,
-        };
+        let current = self.current.take()?;
 
         if let Some(first_child) = current.GetFirstChild() {
             self.current = Some(first_child);
@@ -1268,10 +1261,7 @@ impl Iterator for PrecedingNodeIterator {
 
     // https://dom.spec.whatwg.org/#concept-tree-preceding
     fn next(&mut self) -> Option<DomRoot<Node>> {
-        let current = match self.current.take() {
-            None => return None,
-            Some(current) => current,
-        };
+        let current = self.current.take()?;
 
         self.current = if self.root == current {
             None
@@ -1323,10 +1313,7 @@ impl TreeIterator {
     }
 
     pub fn next_skipping_children(&mut self) -> Option<DomRoot<Node>> {
-        let current = match self.current.take() {
-            None => return None,
-            Some(current) => current,
-        };
+        let current = self.current.take()?;
 
         self.next_skipping_children_impl(current)
     }
@@ -1353,10 +1340,7 @@ impl Iterator for TreeIterator {
 
     // https://dom.spec.whatwg.org/#concept-tree-order
     fn next(&mut self) -> Option<DomRoot<Node>> {
-        let current = match self.current.take() {
-            None => return None,
-            Some(current) => current,
-        };
+        let current = self.current.take()?;
         if let Some(first_child) = current.GetFirstChild() {
             self.current = Some(first_child);
             self.depth += 1;
-- 
cgit v1.2.3