From afd3030af3c2416d91b14094c65e62a6081fdbdb Mon Sep 17 00:00:00 2001
From: crypto-universe <ykp@protonmail.ch>
Date: Fri, 3 Mar 2017 21:48:32 +0100
Subject: [PATCH] Use more idiomatic construction

or_else in more idiomatic rust construction than
match, where Some(x) => Some(x)
---
 components/script/layout_wrapper.rs | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/components/script/layout_wrapper.rs b/components/script/layout_wrapper.rs
index 071868a683f..66a77e892e1 100644
--- a/components/script/layout_wrapper.rs
+++ b/components/script/layout_wrapper.rs
@@ -953,19 +953,12 @@ impl<ConcreteNode> Iterator for ThreadSafeLayoutNodeChildrenIterator<ConcreteNod
                 if let Some(ref node) = node {
                     self.current_node = match node.get_pseudo_element_type() {
                         PseudoElementType::Before(_) => {
-                            let first = self.parent_node.get_details_summary_pseudo().or_else(|| unsafe {
-                                self.parent_node.dangerous_first_child()
-                            });
-                            match first {
-                                Some(first) => Some(first),
-                                None => self.parent_node.get_after_pseudo(),
-                            }
+                            self.parent_node.get_details_summary_pseudo()
+                                .or_else(|| unsafe { self.parent_node.dangerous_first_child() })
+                                .or_else(|| self.parent_node.get_after_pseudo())
                         },
                         PseudoElementType::Normal => {
-                            match unsafe { node.dangerous_next_sibling() } {
-                                Some(next) => Some(next),
-                                None => self.parent_node.get_after_pseudo(),
-                            }
+                            unsafe { node.dangerous_next_sibling() }.or_else(|| self.parent_node.get_after_pseudo())
                         },
                         PseudoElementType::DetailsSummary(_) => self.parent_node.get_details_content_pseudo(),
                         PseudoElementType::DetailsContent(_) => self.parent_node.get_after_pseudo(),