diff options
author | Alan Jeffrey <ajeffrey@mozilla.com> | 2015-11-11 16:26:53 -0600 |
---|---|---|
committer | Alan Jeffrey <ajeffrey@mozilla.com> | 2015-11-12 17:52:59 -0600 |
commit | 84bde75b420e7035cee891781a3805d5c8c4cdeb (patch) | |
tree | 061040f39149d530b059a998be832c7f9b0a8134 /components/script/dom/macros.rs | |
parent | 736323a7796594a5b966ab6ae690e5cc51225a14 (diff) | |
download | servo-84bde75b420e7035cee891781a3805d5c8c4cdeb.tar.gz servo-84bde75b420e7035cee891781a3805d5c8c4cdeb.zip |
Replaced DOMString constructor by conversion functions.
Replaced DOMString(...) by DOMString::from(...).
Replaced ....0 by String::from(...).
Removed any uses of .to_owner() in DOMString::from("...").
Diffstat (limited to 'components/script/dom/macros.rs')
-rw-r--r-- | components/script/dom/macros.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/components/script/dom/macros.rs b/components/script/dom/macros.rs index 370621dfe8d..4cdd6eb277e 100644 --- a/components/script/dom/macros.rs +++ b/components/script/dom/macros.rs @@ -84,7 +84,7 @@ macro_rules! make_url_or_base_getter( let url = element.get_url_attribute(&Atom::from_slice($htmlname)); if url.is_empty() { let window = window_from_node(self); - DOMString(window.get_url().serialize()) + DOMString::from(window.get_url().serialize()) } else { url } @@ -102,7 +102,6 @@ macro_rules! make_enumerated_getter( use dom::bindings::inheritance::Castable; use dom::element::Element; use std::ascii::AsciiExt; - use std::borrow::ToOwned; use string_cache::Atom; let element = self.upcast::<Element>(); let mut val = element.get_string_attribute(&Atom::from_slice($htmlname)); @@ -110,7 +109,7 @@ macro_rules! make_enumerated_getter( // https://html.spec.whatwg.org/multipage/#attr-fs-method match &*val { $($choices)|+ => val, - _ => DOMString($default.to_owned()) + _ => DOMString::from($default) } } ); |