From 57f575b5ca62fab1bce80eea7061f59fdd5586da Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 5 Jun 2015 12:06:24 +0200 Subject: [PATCH] Use if let in HTMLTableElement::SetCaption. --- components/script/dom/htmltableelement.rs | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/components/script/dom/htmltableelement.rs b/components/script/dom/htmltableelement.rs index a32c3e7e452..0f254f07ad6 100644 --- a/components/script/dom/htmltableelement.rs +++ b/components/script/dom/htmltableelement.rs @@ -8,7 +8,7 @@ use dom::bindings::codegen::Bindings::HTMLTableElementBinding; use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; use dom::bindings::codegen::InheritTypes::{HTMLElementCast, HTMLTableCaptionElementCast}; use dom::bindings::codegen::InheritTypes::{HTMLTableElementDerived, NodeCast}; -use dom::bindings::js::{JSRef, Rootable, Temporary}; +use dom::bindings::js::{JSRef, Rootable, Temporary, OptionalRootable, RootedReference}; use dom::document::Document; use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; @@ -79,21 +79,14 @@ impl<'a> HTMLTableElementMethods for JSRef<'a, HTMLTableElement> { // https://www.whatwg.org/html/#dom-table-caption fn SetCaption(self, new_caption: Option>) { let node: JSRef = NodeCast::from_ref(self); - let old_caption = self.GetCaption(); - match old_caption { - Some(htmlelem) => { - let htmlelem_root = htmlelem.root(); - let old_caption_node: JSRef = NodeCast::from_ref(htmlelem_root.r()); - assert!(node.RemoveChild(old_caption_node).is_ok()); - } - None => () + if let Some(ref caption) = self.GetCaption().root() { + assert!(node.RemoveChild(NodeCast::from_ref(caption.r())).is_ok()); } - new_caption.map(|caption| { - let new_caption_node: JSRef = NodeCast::from_ref(caption); - assert!(node.AppendChild(new_caption_node).is_ok()); - }); + if let Some(caption) = new_caption { + assert!(node.AppendChild(NodeCast::from_ref(caption)).is_ok()); + } } }