diff options
Diffstat (limited to 'components/script/dom/htmlscriptelement.rs')
-rw-r--r-- | components/script/dom/htmlscriptelement.rs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index c2af3ae9f6a..f9f52d3f7c9 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -31,6 +31,7 @@ use encoding::all::UTF_8; use encoding::types::{Encoding, DecoderTrap}; use servo_net::resource_task::load_whole_resource; use servo_util::str::{DOMString, HTML_SPACE_CHARACTERS, StaticStringVec}; +use std::borrow::ToOwned; use std::cell::Cell; use string_cache::Atom; use url::UrlParser; @@ -239,7 +240,7 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> { let window = window_from_node(self).root(); let window = window.r(); let event = Event::new(GlobalRef::Window(window), - "load".into_string(), + "load".to_owned(), EventBubbles::DoesNotBubble, EventCancelable::NotCancelable).root(); event.r().set_trusted(true); @@ -257,7 +258,7 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> { }, Some(ref s) => { debug!("script type={}", *s); - SCRIPT_JS_MIMES.contains(&s.to_ascii_lower().as_slice().trim_chars(HTML_SPACE_CHARACTERS)) + SCRIPT_JS_MIMES.contains(&s.to_ascii_lowercase().as_slice().trim_matches(HTML_SPACE_CHARACTERS)) }, None => { debug!("no script type"); @@ -270,7 +271,7 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> { }, Some(ref s) => { debug!("script language={}", *s); - SCRIPT_JS_MIMES.contains(&format!("text/{}", s).to_ascii_lower().as_slice()) + SCRIPT_JS_MIMES.contains(&format!("text/{}", s).to_ascii_lowercase().as_slice()) }, None => { debug!("no script type or language, inferring js"); @@ -287,7 +288,7 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> { } impl<'a> VirtualMethods for JSRef<'a, HTMLScriptElement> { - fn super_type<'a>(&'a self) -> Option<&'a VirtualMethods> { + fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> { let htmlelement: &JSRef<HTMLElement> = HTMLElementCast::from_borrowed_ref(self); Some(htmlelement as &VirtualMethods) } @@ -341,9 +342,9 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLScriptElement> { } impl<'a> HTMLScriptElementMethods for JSRef<'a, HTMLScriptElement> { - make_url_getter!(Src) + make_url_getter!(Src); - make_setter!(SetSrc, "src") + make_setter!(SetSrc, "src"); // http://www.whatwg.org/html/#dom-script-text fn Text(self) -> DOMString { |