Auto merge of #5916 - servo:prepare-rustup, r=jdm

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5916)
<!-- Reviewable:end -->

1 files changed, 5 insertions, 6 deletions

diff --git a/components/script/dom/macros.rs b/components/script/dom/macros.rs
index 76157789e71..b3dda8730e0 100644
--- a/components/script/dom/macros.rs
+++ b/components/script/dom/macros.rs
@@ -85,12 +85,11 @@ macro_rules! make_url_or_base_getter(
             use std::ascii::AsciiExt;
             let element: JSRef<Element> = ElementCast::from_ref(self);
             let url = element.get_url_attribute(&Atom::from_slice($htmlname));
-            match &*url {
-                "" => {
-                    let window = window_from_node(self).root();
-                    window.r().get_url().serialize()
-                },
-                _ => url
+            if url.is_empty() {
+                let window = window_from_node(self).root();
+                window.r().get_url().serialize()
+            } else {
+                url
             }
         }
     );