From 218f6fd478f7b51ab91dec44ed0887404d97c84f Mon Sep 17 00:00:00 2001
From: Elliott Pardee <me@thevypr.com>
Date: Mon, 20 Mar 2017 20:15:31 -0700
Subject: [PATCH] servo: Merge #16054 - Making a few lines in layout_wrapper.rs
 a bit nicer, fixing #15811 (from vypr:master); r=Wafflespeanut

Source-Repo: https://github.com/servo/servo
Source-Revision: 3b15efd2ba72a69520320da99de9f1a0b4100d53
---
 servo/components/script/layout_wrapper.rs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/servo/components/script/layout_wrapper.rs b/servo/components/script/layout_wrapper.rs
index 36aa7601d0bf..bd21212f23c7 100644
--- a/servo/components/script/layout_wrapper.rs
+++ b/servo/components/script/layout_wrapper.rs
@@ -933,11 +933,12 @@ impl<ConcreteNode> Iterator for ThreadSafeLayoutNodeChildrenIterator<ConcreteNod
                 let mut current_node = self.current_node.clone();
                 loop {
                     let next_node = if let Some(ref node) = current_node {
-                        if node.is_element() &&
-                           node.as_element().unwrap().get_local_name() == &local_name!("summary") &&
-                           node.as_element().unwrap().get_namespace() == &ns!(html) {
-                            self.current_node = None;
-                            return Some(node.clone());
+                        if let Some(element) = node.as_element() {
+                            if element.get_local_name() == &local_name!("summary") &&
+                               element.get_namespace() == &ns!(html) {
+                                self.current_node = None;
+                                return Some(node.clone());
+                            }
                         }
                         unsafe { node.dangerous_next_sibling() }
                     } else {