Simplify HTMLCollection predicates

1 files changed, 5 insertions, 18 deletions

diff --git a/src/components/script/dom/htmldocument.rs b/src/components/script/dom/htmldocument.rs
index 50f2a7a0556..5cbb02b4b9b 100644
--- a/src/components/script/dom/htmldocument.rs
+++ b/src/components/script/dom/htmldocument.rs
@@ -80,15 +80,9 @@ impl HTMLDocument {
     }
 
     pub fn Links(&self) -> @mut HTMLCollection {
-        self.createHTMLCollection(|elem| {
-            if eq_slice(elem.tag_name, "a") || eq_slice(elem.tag_name, "area") {
-                match elem.get_attr("href") {
-                    Some(_val) => true,
-                    None() => false
-                }
-            }
-            else { false }
-        })
+        self.createHTMLCollection(|elem|
+            (eq_slice(elem.tag_name, "a") || eq_slice(elem.tag_name, "area"))
+            && elem.get_attr("href").is_some())
     }
 
     pub fn Forms(&self) -> @mut HTMLCollection {
@@ -169,15 +163,8 @@ impl HTMLDocument {
     }
 
     pub fn Anchors(&self) -> @mut HTMLCollection {
-        self.createHTMLCollection(|elem| {
-            if eq_slice(elem.tag_name, "a") {
-                match elem.get_attr("name") {
-                    Some(_val) => true,
-                    None() => false
-                }
-            }
-            else { false }
-        })
+        self.createHTMLCollection(|elem|
+            eq_slice(elem.tag_name, "a") && elem.get_attr("name").is_some())
     }
 
     pub fn Applets(&self) -> @mut HTMLCollection {