From 832cfac747e1a271f2672b667b55f70a1c4a8137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= Date: Tue, 15 Sep 2015 02:51:59 +0100 Subject: [PATCH] rewrite uses of map as if let closes #7580 --- components/script/dom/document.rs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 74528cac9df..de4f6a8423e 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -798,12 +798,19 @@ impl Document { match key { Key::Space if !prevented && state == KeyState::Released => { let maybe_elem: Option<&Element> = ElementCast::to_ref(target); - maybe_elem.map( - |el| el.as_maybe_activatable().map(|a| a.synthetic_click_activation(ctrl, alt, shift, meta))); + if let Some(el) = maybe_elem { + if let Some(a) = el.as_maybe_activatable() { + a.synthetic_click_activation(ctrl, alt, shift, meta); + } + } } Key::Enter if !prevented && state == KeyState::Released => { let maybe_elem: Option<&Element> = ElementCast::to_ref(target); - maybe_elem.map(|el| el.as_maybe_activatable().map(|a| a.implicit_submission(ctrl, alt, shift, meta))); + if let Some(el) = maybe_elem { + if let Some(a) = el.as_maybe_activatable() { + a.implicit_submission(ctrl, alt, shift, meta); + } + } } _ => () }