aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/macros.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-04-26 05:30:28 -0500
committerbors-servo <metajack+bors@gmail.com>2015-04-26 05:30:28 -0500
commit1389be37823fccf4108f4e79d0a3a793f0bbe93e (patch)
tree30b2dc45c0aad707848dab7bfc53a3c11e1bdfe8 /components/script/dom/macros.rs
parentaef48baeb4a67d003c8a88d91d01d3a33ac3620d (diff)
parent9185c3de7984fa46b71a62b2902a707c9d4134c3 (diff)
downloadservo-1389be37823fccf4108f4e79d0a3a793f0bbe93e.tar.gz
servo-1389be37823fccf4108f4e79d0a3a793f0bbe93e.zip
Auto merge of #5847 - Ms2ger:slice, r=SimonSapin
<!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5847) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/macros.rs')
-rw-r--r--components/script/dom/macros.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/macros.rs b/components/script/dom/macros.rs
index 37d0dad7f2a..76157789e71 100644
--- a/components/script/dom/macros.rs
+++ b/components/script/dom/macros.rs
@@ -85,7 +85,7 @@ 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.as_slice() {
+ match &*url {
"" => {
let window = window_from_node(self).root();
window.r().get_url().serialize()
@@ -112,14 +112,14 @@ macro_rules! make_enumerated_getter(
let val = element.get_string_attribute(&Atom::from_slice($htmlname))
.into_ascii_lowercase();
// https://html.spec.whatwg.org/multipage/#attr-fs-method
- match val.as_slice() {
+ match &*val {
$($choices)|+ => val,
_ => $default.to_owned()
}
}
);
($attr:ident, $default:expr, $(($choices: pat))|+) => {
- make_enumerated_getter!($attr, to_lower!(stringify!($attr)).as_slice(), $default, $(($choices))|+);
+ make_enumerated_getter!($attr, &to_lower!(stringify!($attr)), $default, $(($choices))|+);
}
);