diff options
Diffstat (limited to 'src')
96 files changed, 177 insertions, 131 deletions
diff --git a/src/components/script/dom/attr.rs b/src/components/script/dom/attr.rs index 9ecf068774e..6ae8009bb5a 100644 --- a/src/components/script/dom/attr.rs +++ b/src/components/script/dom/attr.rs @@ -3,10 +3,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::AttrBinding; -use dom::bindings::utils::{Reflectable, Reflector, DOMString}; -use dom::bindings::utils::reflect_dom_object; +use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::window::Window; use servo_util::namespace::{Namespace, Null}; +use servo_util::str::DOMString; use std::util; diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index b1ba6b9dac4..cb367a585f6 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -5162,6 +5162,7 @@ class CGBindingRoot(CGThing): 'dom::node::AbstractNode', 'dom::eventtarget::AbstractEventTarget', 'dom::event::AbstractEvent', + 'servo_util::str::DOMString', 'servo_util::vec::zip_copies', 'std::cast', 'std::libc', diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs index 37da1c7b9dd..2c0d4943e6c 100644 --- a/src/components/script/dom/bindings/utils.rs +++ b/src/components/script/dom/bindings/utils.rs @@ -5,6 +5,7 @@ use dom::bindings::codegen::PrototypeList; use dom::bindings::codegen::PrototypeList::MAX_PROTO_CHAIN_LENGTH; use dom::window; +use servo_util::str::DOMString; use std::libc::c_uint; use std::cast; @@ -114,31 +115,6 @@ extern fn InterfaceObjectToString(cx: *JSContext, _argc: c_uint, vp: *mut JSVal) } } -pub type DOMString = ~str; - -pub fn null_str_as_empty(s: &Option<DOMString>) -> ~str { - // We don't use map_default because it would allocate ~"" even for Some. - match *s { - Some(ref s) => s.clone(), - None => ~"" - } -} - -pub fn null_str_as_empty_ref<'a>(s: &'a Option<DOMString>) -> &'a str { - match *s { - Some(ref s) => s.as_slice(), - None => &'a "" - } -} - -pub fn null_str_as_word_null(s: &Option<DOMString>) -> ~str { - // We don't use map_default because it would allocate ~"null" even for Some. - match *s { - Some(ref s) => s.clone(), - None => ~"null" - } -} - fn is_dom_class(clasp: *JSClass) -> bool { unsafe { ((*clasp).flags & js::JSCLASS_IS_DOMJSCLASS) != 0 diff --git a/src/components/script/dom/blob.rs b/src/components/script/dom/blob.rs index 581d9f4535c..2bf0d0b7510 100644 --- a/src/components/script/dom/blob.rs +++ b/src/components/script/dom/blob.rs @@ -2,10 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::utils::{DOMString, Reflectable, Reflector, reflect_dom_object}; +use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::bindings::utils::Fallible; use dom::bindings::codegen::BlobBinding; use dom::window::Window; +use servo_util::str::DOMString; pub struct Blob { reflector_: Reflector, diff --git a/src/components/script/dom/characterdata.rs b/src/components/script/dom/characterdata.rs index 778e2fa7c6c..0ad5f35bc78 100644 --- a/src/components/script/dom/characterdata.rs +++ b/src/components/script/dom/characterdata.rs @@ -4,10 +4,11 @@ //! DOM bindings for `CharacterData`. -use dom::bindings::utils::{DOMString, ErrorResult, Fallible}; +use dom::bindings::utils::{Fallible, ErrorResult}; use dom::bindings::utils::{Reflectable, Reflector}; use dom::document::AbstractDocument; use dom::node::{Node, NodeTypeId}; +use servo_util::str::DOMString; pub struct CharacterData { node: Node, diff --git a/src/components/script/dom/comment.rs b/src/components/script/dom/comment.rs index b8d85e1c110..06cd4192a56 100644 --- a/src/components/script/dom/comment.rs +++ b/src/components/script/dom/comment.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::CommentBinding; -use dom::bindings::utils::{DOMString, Fallible}; +use dom::bindings::utils::Fallible; use dom::characterdata::CharacterData; use dom::document::AbstractDocument; use dom::node::{AbstractNode, CommentNodeTypeId, Node}; use dom::window::Window; +use servo_util::str::DOMString; /// An HTML comment. pub struct Comment { diff --git a/src/components/script/dom/console.rs b/src/components/script/dom/console.rs index 6dc9395f16a..98d12a17389 100644 --- a/src/components/script/dom/console.rs +++ b/src/components/script/dom/console.rs @@ -3,9 +3,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; -use dom::bindings::utils::{DOMString}; use dom::bindings::codegen::ConsoleBinding; use dom::window::Window; +use servo_util::str::DOMString; pub struct Console { reflector_: Reflector diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs index 81527995030..2d31c80c645 100644 --- a/src/components/script/dom/document.rs +++ b/src/components/script/dom/document.rs @@ -6,7 +6,6 @@ use dom::comment::Comment; use dom::bindings::codegen::DocumentBinding; use dom::bindings::utils::{Reflectable, Reflector, Traceable, reflect_dom_object}; use dom::bindings::utils::{ErrorResult, Fallible, NotSupported, InvalidCharacter, HierarchyRequest}; -use dom::bindings::utils::DOMString; use dom::bindings::utils::{xml_name_type, InvalidXMLName}; use dom::documentfragment::DocumentFragment; use dom::domimplementation::DOMImplementation; @@ -26,6 +25,7 @@ use html::hubbub_html_parser::build_element_from_tag; use hubbub::hubbub::{QuirksMode, NoQuirks, LimitedQuirks, FullQuirks}; use layout_interface::{DocumentDamageLevel, ContentChangedDocumentDamage}; use servo_util::namespace::Null; +use servo_util::str::DOMString; use extra::url::{Url, from_str}; use js::jsapi::{JSObject, JSContext, JSTracer}; diff --git a/src/components/script/dom/documenttype.rs b/src/components/script/dom/documenttype.rs index 0fceb16083c..ee2e18ea969 100644 --- a/src/components/script/dom/documenttype.rs +++ b/src/components/script/dom/documenttype.rs @@ -3,9 +3,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::DocumentTypeBinding; -use dom::bindings::utils::DOMString; use dom::document::AbstractDocument; use dom::node::{AbstractNode, Node, DoctypeNodeTypeId}; +use servo_util::str::DOMString; /// The `DOCTYPE` tag. pub struct DocumentType { diff --git a/src/components/script/dom/domexception.rs b/src/components/script/dom/domexception.rs index ba38943a6ed..f0801fee40f 100644 --- a/src/components/script/dom/domexception.rs +++ b/src/components/script/dom/domexception.rs @@ -3,9 +3,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::DOMExceptionBinding; -use dom::bindings::utils::DOMString; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::window::Window; +use servo_util::str::DOMString; #[repr(uint)] #[deriving(ToStr)] diff --git a/src/components/script/dom/domimplementation.rs b/src/components/script/dom/domimplementation.rs index adadb20b64b..8595d54c065 100644 --- a/src/components/script/dom/domimplementation.rs +++ b/src/components/script/dom/domimplementation.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::DOMImplementationBinding; -use dom::bindings::utils::{DOMString, Reflector, Reflectable, reflect_dom_object}; +use dom::bindings::utils::{Reflector, Reflectable, reflect_dom_object}; use dom::bindings::utils::{Fallible, InvalidCharacter, NamespaceError}; use dom::bindings::utils::{QName, Name, InvalidXMLName, xml_name_type}; use dom::document::{AbstractDocument, HTML, HTMLDocumentTypeId}; @@ -16,6 +16,7 @@ use dom::htmltitleelement::HTMLTitleElement; use dom::node::{AbstractNode, DocumentNodeTypeId}; use dom::text::Text; use dom::window::Window; +use servo_util::str::DOMString; pub struct DOMImplementation { owner: @mut Window, diff --git a/src/components/script/dom/domparser.rs b/src/components/script/dom/domparser.rs index 00033983490..1dec0025e8a 100644 --- a/src/components/script/dom/domparser.rs +++ b/src/components/script/dom/domparser.rs @@ -4,11 +4,13 @@ use dom::bindings::codegen::DOMParserBinding; use dom::bindings::codegen::DOMParserBinding::SupportedTypeValues::{Text_html, Text_xml}; -use dom::bindings::utils::{DOMString, Fallible, Reflector, Reflectable, reflect_dom_object}; +use dom::bindings::utils::{Reflector, Reflectable, reflect_dom_object}; +use dom::bindings::utils::Fallible; use dom::bindings::utils::FailureUnknown; use dom::document::{AbstractDocument, Document}; use dom::htmldocument::HTMLDocument; use dom::window::Window; +use servo_util::str::DOMString; pub struct DOMParser { owner: @mut Window, //XXXjdm Document instead? diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs index a834cb8e9c1..1404a4f0347 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -6,9 +6,9 @@ use dom::attr::Attr; use dom::attrlist::AttrList; -use dom::bindings::utils::{Reflectable, DOMString, ErrorResult, Fallible, Reflector}; -use dom::bindings::utils::{null_str_as_empty_ref, NamespaceError}; -use dom::bindings::utils::{InvalidCharacter, QName, Name, InvalidXMLName, xml_name_type}; +use dom::bindings::utils::{Reflectable, Reflector}; +use dom::bindings::utils::{ErrorResult, Fallible, NamespaceError, InvalidCharacter}; +use dom::bindings::utils::{QName, Name, InvalidXMLName, xml_name_type}; use dom::htmlcollection::HTMLCollection; use dom::clientrect::ClientRect; use dom::clientrectlist::ClientRectList; @@ -22,6 +22,7 @@ use layout_interface::{MatchSelectorsDocumentDamage}; use style; use servo_util::namespace; use servo_util::namespace::{Namespace, Null}; +use servo_util::str::{DOMString, null_str_as_empty_ref}; use std::ascii::StrAsciiExt; use std::cast; diff --git a/src/components/script/dom/event.rs b/src/components/script/dom/event.rs index 0b436fe3254..aef1b4270cd 100644 --- a/src/components/script/dom/event.rs +++ b/src/components/script/dom/event.rs @@ -6,9 +6,10 @@ use dom::eventtarget::AbstractEventTarget; use dom::window::Window; use dom::bindings::codegen::EventBinding; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; -use dom::bindings::utils::{DOMString, ErrorResult, Fallible}; +use dom::bindings::utils::{Fallible, ErrorResult}; use dom::mouseevent::MouseEvent; use dom::uievent::UIEvent; +use servo_util::str::DOMString; use geom::point::Point2D; diff --git a/src/components/script/dom/eventtarget.rs b/src/components/script/dom/eventtarget.rs index 9d04d716f74..dbc435ac012 100644 --- a/src/components/script/dom/eventtarget.rs +++ b/src/components/script/dom/eventtarget.rs @@ -2,14 +2,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::utils::{Reflectable, Reflector, DOMString, Fallible}; -use dom::bindings::utils::{InvalidState}; +use dom::bindings::utils::{Reflectable, Reflector}; +use dom::bindings::utils::{Fallible, InvalidState}; use dom::bindings::codegen::EventListenerBinding::EventListener; use dom::document::AbstractDocument; use dom::event::AbstractEvent; use dom::eventdispatcher::dispatch_event; use dom::node::AbstractNode; use dom::window::Window; +use servo_util::str::DOMString; use std::cast; use std::hashmap::HashMap; diff --git a/src/components/script/dom/formdata.rs b/src/components/script/dom/formdata.rs index 3e24f9e4dbb..b446c44a7d7 100644 --- a/src/components/script/dom/formdata.rs +++ b/src/components/script/dom/formdata.rs @@ -3,11 +3,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::utils::{Fallible, Reflectable, Reflector, reflect_dom_object}; -use dom::bindings::utils::DOMString; use dom::bindings::codegen::FormDataBinding; use dom::blob::Blob; use dom::node::AbstractNode; use dom::window::Window; +use servo_util::str::DOMString; use std::hashmap::HashMap; diff --git a/src/components/script/dom/htmlanchorelement.rs b/src/components/script/dom/htmlanchorelement.rs index c2146a142c3..d398a8cbe03 100644 --- a/src/components/script/dom/htmlanchorelement.rs +++ b/src/components/script/dom/htmlanchorelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLAnchorElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLAnchorElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLAnchorElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlappletelement.rs b/src/components/script/dom/htmlappletelement.rs index b290af51d08..babaeaaf1f0 100644 --- a/src/components/script/dom/htmlappletelement.rs +++ b/src/components/script/dom/htmlappletelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLAppletElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLAppletElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLAppletElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlareaelement.rs b/src/components/script/dom/htmlareaelement.rs index bc916e7c9e0..3d80090d2c4 100644 --- a/src/components/script/dom/htmlareaelement.rs +++ b/src/components/script/dom/htmlareaelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLAreaElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLAreaElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLAreaElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlaudioelement.rs b/src/components/script/dom/htmlaudioelement.rs index b1013a2342e..6e753318cb7 100644 --- a/src/components/script/dom/htmlaudioelement.rs +++ b/src/components/script/dom/htmlaudioelement.rs @@ -3,11 +3,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLAudioElementBinding; -use dom::bindings::utils::DOMString; use dom::document::AbstractDocument; use dom::element::HTMLAudioElementTypeId; use dom::htmlmediaelement::HTMLMediaElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLAudioElement { htmlmediaelement: HTMLMediaElement diff --git a/src/components/script/dom/htmlbaseelement.rs b/src/components/script/dom/htmlbaseelement.rs index 8812a1d733a..cf71f76dfbd 100644 --- a/src/components/script/dom/htmlbaseelement.rs +++ b/src/components/script/dom/htmlbaseelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLBaseElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLBaseElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLBaseElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlbodyelement.rs b/src/components/script/dom/htmlbodyelement.rs index 6d8565cd3e7..32d133f6760 100644 --- a/src/components/script/dom/htmlbodyelement.rs +++ b/src/components/script/dom/htmlbodyelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLBodyElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLBodyElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLBodyElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlbrelement.rs b/src/components/script/dom/htmlbrelement.rs index 2ecfbe1036e..67462d28abb 100644 --- a/src/components/script/dom/htmlbrelement.rs +++ b/src/components/script/dom/htmlbrelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLBRElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLBRElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLBRElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmlbuttonelement.rs b/src/components/script/dom/htmlbuttonelement.rs index 943f2432d99..4847ce12394 100644 --- a/src/components/script/dom/htmlbuttonelement.rs +++ b/src/components/script/dom/htmlbuttonelement.rs @@ -3,12 +3,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLButtonElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLButtonElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; use dom::validitystate::ValidityState; +use servo_util::str::DOMString; pub struct HTMLButtonElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlcanvaselement.rs b/src/components/script/dom/htmlcanvaselement.rs index bda496c1dbb..dcc75ea73f1 100644 --- a/src/components/script/dom/htmlcanvaselement.rs +++ b/src/components/script/dom/htmlcanvaselement.rs @@ -3,12 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLCanvasElementBinding; -use dom::bindings::utils::DOMString; use dom::bindings::utils::{ErrorResult}; use dom::document::AbstractDocument; use dom::element::HTMLCanvasElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLCanvasElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmlcollection.rs b/src/components/script/dom/htmlcollection.rs index f374d5bd70e..32cdd52280c 100644 --- a/src/components/script/dom/htmlcollection.rs +++ b/src/components/script/dom/htmlcollection.rs @@ -4,9 +4,10 @@ use dom::bindings::codegen::HTMLCollectionBinding; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; -use dom::bindings::utils::{DOMString, Fallible}; +use dom::bindings::utils::Fallible; use dom::node::AbstractNode; use dom::window::Window; +use servo_util::str::DOMString; use js::jsapi::{JSObject, JSContext}; diff --git a/src/components/script/dom/htmldataelement.rs b/src/components/script/dom/htmldataelement.rs index bc802107450..cd8a99bd282 100644 --- a/src/components/script/dom/htmldataelement.rs +++ b/src/components/script/dom/htmldataelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLDataElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLDataElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLDataElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmldatalistelement.rs b/src/components/script/dom/htmldatalistelement.rs index 2d6ab1f1a95..41665545a48 100644 --- a/src/components/script/dom/htmldatalistelement.rs +++ b/src/components/script/dom/htmldatalistelement.rs @@ -3,12 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLDataListElementBinding; -use dom::bindings::utils::DOMString; use dom::document::AbstractDocument; use dom::element::HTMLDataListElementTypeId; use dom::htmlcollection::HTMLCollection; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLDataListElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmldirectoryelement.rs b/src/components/script/dom/htmldirectoryelement.rs index 878191682a4..137aaffd1a2 100644 --- a/src/components/script/dom/htmldirectoryelement.rs +++ b/src/components/script/dom/htmldirectoryelement.rs @@ -3,12 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLDirectoryElementBinding; -use dom::bindings::utils::DOMString; use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLDirectoryElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLDirectoryElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmldivelement.rs b/src/components/script/dom/htmldivelement.rs index a1effa5351b..3e09183e5bd 100644 --- a/src/components/script/dom/htmldivelement.rs +++ b/src/components/script/dom/htmldivelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLDivElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLDivElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLDivElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmldlistelement.rs b/src/components/script/dom/htmldlistelement.rs index 64e813f6cbc..da9576fcb07 100644 --- a/src/components/script/dom/htmldlistelement.rs +++ b/src/components/script/dom/htmldlistelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLDListElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLDListElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLDListElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlelement.rs b/src/components/script/dom/htmlelement.rs index 495acc89459..06ab085f945 100644 --- a/src/components/script/dom/htmlelement.rs +++ b/src/components/script/dom/htmlelement.rs @@ -3,13 +3,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult, Fallible}; +use dom::bindings::utils::{Fallible, ErrorResult}; use dom::document::AbstractDocument; use dom::element::{Element, ElementTypeId, HTMLElementTypeId}; use dom::node::{AbstractNode, Node}; use js::jsapi::{JSContext, JSVal}; use js::JSVAL_NULL; use servo_util::namespace; +use servo_util::str::DOMString; pub struct HTMLElement { element: Element diff --git a/src/components/script/dom/htmlembedelement.rs b/src/components/script/dom/htmlembedelement.rs index 870466d60ee..a7b5609bfd2 100644 --- a/src/components/script/dom/htmlembedelement.rs +++ b/src/components/script/dom/htmlembedelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLEmbedElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLEmbedElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLEmbedElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlfieldsetelement.rs b/src/components/script/dom/htmlfieldsetelement.rs index 194dae232da..a9939b4c4c9 100644 --- a/src/components/script/dom/htmlfieldsetelement.rs +++ b/src/components/script/dom/htmlfieldsetelement.rs @@ -3,13 +3,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLFieldSetElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLFieldSetElementTypeId; use dom::htmlcollection::HTMLCollection; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; use dom::validitystate::ValidityState; +use servo_util::str::DOMString; pub struct HTMLFieldSetElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlfontelement.rs b/src/components/script/dom/htmlfontelement.rs index 0f23d6f464c..b3ccf1a6f14 100644 --- a/src/components/script/dom/htmlfontelement.rs +++ b/src/components/script/dom/htmlfontelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLFontElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLFontElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLFontElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlformelement.rs b/src/components/script/dom/htmlformelement.rs index e8236ea7e5b..554cabd6090 100644 --- a/src/components/script/dom/htmlformelement.rs +++ b/src/components/script/dom/htmlformelement.rs @@ -3,12 +3,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLFormElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLFormElementTypeId; use dom::htmlcollection::HTMLCollection; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLFormElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlframeelement.rs b/src/components/script/dom/htmlframeelement.rs index dd04a15d342..25e6feae0b6 100644 --- a/src/components/script/dom/htmlframeelement.rs +++ b/src/components/script/dom/htmlframeelement.rs @@ -3,12 +3,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLFrameElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLFrameElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; use dom::windowproxy::WindowProxy; +use servo_util::str::DOMString; pub struct HTMLFrameElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlframesetelement.rs b/src/components/script/dom/htmlframesetelement.rs index 4f41cf9e7fa..5b40a4b5fe1 100644 --- a/src/components/script/dom/htmlframesetelement.rs +++ b/src/components/script/dom/htmlframesetelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLFrameSetElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLFrameSetElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLFrameSetElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlheadelement.rs b/src/components/script/dom/htmlheadelement.rs index 0bd735c125c..f7459d0ac4f 100644 --- a/src/components/script/dom/htmlheadelement.rs +++ b/src/components/script/dom/htmlheadelement.rs @@ -3,11 +3,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLHeadElementBinding; -use dom::bindings::utils::DOMString; use dom::document::AbstractDocument; use dom::element::HTMLHeadElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLHeadElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlheadingelement.rs b/src/components/script/dom/htmlheadingelement.rs index 4b46223894b..f15075f30cd 100644 --- a/src/components/script/dom/htmlheadingelement.rs +++ b/src/components/script/dom/htmlheadingelement.rs @@ -3,11 +3,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLHeadingElementBinding; -use dom::bindings::utils::DOMString; use dom::document::AbstractDocument; use dom::element::HTMLHeadingElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub enum HeadingLevel { Heading1, diff --git a/src/components/script/dom/htmlhrelement.rs b/src/components/script/dom/htmlhrelement.rs index 07e58f0f15b..1a239a30049 100644 --- a/src/components/script/dom/htmlhrelement.rs +++ b/src/components/script/dom/htmlhrelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLHRElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLHRElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLHRElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmlhtmlelement.rs b/src/components/script/dom/htmlhtmlelement.rs index 82b568d74ef..2da7b45f40b 100644 --- a/src/components/script/dom/htmlhtmlelement.rs +++ b/src/components/script/dom/htmlhtmlelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLHtmlElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLHtmlElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLHtmlElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmliframeelement.rs b/src/components/script/dom/htmliframeelement.rs index 3e8ff7d76ce..ca38c069d14 100644 --- a/src/components/script/dom/htmliframeelement.rs +++ b/src/components/script/dom/htmliframeelement.rs @@ -3,12 +3,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLIFrameElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLIframeElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; use dom::windowproxy::WindowProxy; +use servo_util::str::DOMString; use extra::url::Url; use servo_msg::constellation_msg::{PipelineId, SubpageId}; diff --git a/src/components/script/dom/htmlimageelement.rs b/src/components/script/dom/htmlimageelement.rs index 157d9ab3fb9..5e041572537 100644 --- a/src/components/script/dom/htmlimageelement.rs +++ b/src/components/script/dom/htmlimageelement.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLImageElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLImageElementTypeId; use dom::htmlelement::HTMLElement; @@ -15,6 +15,7 @@ use servo_net::image_cache_task; use servo_net::image_cache_task::ImageCacheTask; use servo_util::url::parse_url; use servo_util::namespace::Null; +use servo_util::str::DOMString; pub struct HTMLImageElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmlinputelement.rs b/src/components/script/dom/htmlinputelement.rs index ee9b994a5fd..d2f2acd0249 100644 --- a/src/components/script/dom/htmlinputelement.rs +++ b/src/components/script/dom/htmlinputelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLInputElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult, Fallible}; +use dom::bindings::utils::{Fallible, ErrorResult}; use dom::document::AbstractDocument; use dom::element::HTMLInputElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLInputElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmllabelelement.rs b/src/components/script/dom/htmllabelelement.rs index 1a1d88df9f3..89cf6215ca9 100644 --- a/src/components/script/dom/htmllabelelement.rs +++ b/src/components/script/dom/htmllabelelement.rs @@ -3,11 +3,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLLabelElementBinding; -use dom::bindings::utils::DOMString; use dom::document::AbstractDocument; use dom::element::HTMLLabelElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLLabelElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmllegendelement.rs b/src/components/script/dom/htmllegendelement.rs index 875d02ab553..43949db6e82 100644 --- a/src/components/script/dom/htmllegendelement.rs +++ b/src/components/script/dom/htmllegendelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLLegendElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLLegendElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLLegendElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmllielement.rs b/src/components/script/dom/htmllielement.rs index 4d7b0c9f027..2079df20568 100644 --- a/src/components/script/dom/htmllielement.rs +++ b/src/components/script/dom/htmllielement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLLIElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLLIElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLLIElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmllinkelement.rs b/src/components/script/dom/htmllinkelement.rs index df2e4d3bf20..d5fce888632 100644 --- a/src/components/script/dom/htmllinkelement.rs +++ b/src/components/script/dom/htmllinkelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLLinkElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLLinkElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLLinkElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmlmainelement.rs b/src/components/script/dom/htmlmainelement.rs index 6f7ccb6621b..550e0470efb 100644 --- a/src/components/script/dom/htmlmainelement.rs +++ b/src/components/script/dom/htmlmainelement.rs @@ -3,11 +3,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLMainElementBinding; -use dom::bindings::utils::DOMString; use dom::document::AbstractDocument; use dom::element::HTMLMainElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLMainElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlmapelement.rs b/src/components/script/dom/htmlmapelement.rs index 43124ae26cc..d61278ce070 100644 --- a/src/components/script/dom/htmlmapelement.rs +++ b/src/components/script/dom/htmlmapelement.rs @@ -3,12 +3,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLMapElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::htmlcollection::HTMLCollection; use dom::document::AbstractDocument; use dom::element::HTMLMapElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLMapElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlmediaelement.rs b/src/components/script/dom/htmlmediaelement.rs index 67ce9078e21..371374c4859 100644 --- a/src/components/script/dom/htmlmediaelement.rs +++ b/src/components/script/dom/htmlmediaelement.rs @@ -2,10 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::ElementTypeId; use dom::htmlelement::HTMLElement; +use servo_util::str::DOMString; pub struct HTMLMediaElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmlmetaelement.rs b/src/components/script/dom/htmlmetaelement.rs index ae2d6eab2ae..254fe4c94f4 100644 --- a/src/components/script/dom/htmlmetaelement.rs +++ b/src/components/script/dom/htmlmetaelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLMetaElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLMetaElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLMetaElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmlmeterelement.rs b/src/components/script/dom/htmlmeterelement.rs index 8b8a89dca75..3e179fa1743 100644 --- a/src/components/script/dom/htmlmeterelement.rs +++ b/src/components/script/dom/htmlmeterelement.rs @@ -3,12 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLMeterElementBinding; -use dom::bindings::utils::DOMString; use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLMeterElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLMeterElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlmodelement.rs b/src/components/script/dom/htmlmodelement.rs index fb8fc1114e5..eb765ed0120 100644 --- a/src/components/script/dom/htmlmodelement.rs +++ b/src/components/script/dom/htmlmodelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLModElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLModElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLModElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlobjectelement.rs b/src/components/script/dom/htmlobjectelement.rs index 6bfceea009e..aeb6ad754e9 100644 --- a/src/components/script/dom/htmlobjectelement.rs +++ b/src/components/script/dom/htmlobjectelement.rs @@ -3,13 +3,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLObjectElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLObjectElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; use dom::validitystate::ValidityState; use dom::windowproxy::WindowProxy; +use servo_util::str::DOMString; pub struct HTMLObjectElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlolistelement.rs b/src/components/script/dom/htmlolistelement.rs index 2b8229ef059..6a762b31147 100644 --- a/src/components/script/dom/htmlolistelement.rs +++ b/src/components/script/dom/htmlolistelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLOListElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLOListElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLOListElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmloptgroupelement.rs b/src/components/script/dom/htmloptgroupelement.rs index 76661bd5a61..020dd3a2471 100644 --- a/src/components/script/dom/htmloptgroupelement.rs +++ b/src/components/script/dom/htmloptgroupelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLOptGroupElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLOptGroupElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLOptGroupElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmloptionelement.rs b/src/components/script/dom/htmloptionelement.rs index 35af2ad0aff..d1761ecdd1a 100644 --- a/src/components/script/dom/htmloptionelement.rs +++ b/src/components/script/dom/htmloptionelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLOptionElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLOptionElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLOptionElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmloutputelement.rs b/src/components/script/dom/htmloutputelement.rs index b83c007fbb8..174e9258ecf 100644 --- a/src/components/script/dom/htmloutputelement.rs +++ b/src/components/script/dom/htmloutputelement.rs @@ -3,12 +3,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLOutputElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLOutputElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; use dom::validitystate::ValidityState; +use servo_util::str::DOMString; pub struct HTMLOutputElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlparagraphelement.rs b/src/components/script/dom/htmlparagraphelement.rs index e48d69cba52..1132a496f26 100644 --- a/src/components/script/dom/htmlparagraphelement.rs +++ b/src/components/script/dom/htmlparagraphelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLParagraphElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLParagraphElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLParagraphElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlparamelement.rs b/src/components/script/dom/htmlparamelement.rs index de3bc7873a1..3cd242e0016 100644 --- a/src/components/script/dom/htmlparamelement.rs +++ b/src/components/script/dom/htmlparamelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLParamElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLParamElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLParamElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlpreelement.rs b/src/components/script/dom/htmlpreelement.rs index 271bd2a42c0..c2bf04464f3 100644 --- a/src/components/script/dom/htmlpreelement.rs +++ b/src/components/script/dom/htmlpreelement.rs @@ -3,12 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLPreElementBinding; -use dom::bindings::utils::DOMString; use dom::bindings::utils::{ErrorResult}; use dom::document::AbstractDocument; use dom::element::HTMLPreElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLPreElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmlprogresselement.rs b/src/components/script/dom/htmlprogresselement.rs index ed4fc3650e3..dca693fa9d3 100644 --- a/src/components/script/dom/htmlprogresselement.rs +++ b/src/components/script/dom/htmlprogresselement.rs @@ -3,12 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLProgressElementBinding; -use dom::bindings::utils::DOMString; use dom::bindings::utils::{ErrorResult, Fallible}; use dom::document::AbstractDocument; use dom::element::HTMLProgressElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLProgressElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmlquoteelement.rs b/src/components/script/dom/htmlquoteelement.rs index 02ce3881200..3ad246f16c2 100644 --- a/src/components/script/dom/htmlquoteelement.rs +++ b/src/components/script/dom/htmlquoteelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLQuoteElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLQuoteElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLQuoteElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmlscriptelement.rs b/src/components/script/dom/htmlscriptelement.rs index c5e74d90c66..80513d5f649 100644 --- a/src/components/script/dom/htmlscriptelement.rs +++ b/src/components/script/dom/htmlscriptelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLScriptElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLScriptElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLScriptElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmlselectelement.rs b/src/components/script/dom/htmlselectelement.rs index 8e35109fb03..61fb132dfe2 100644 --- a/src/components/script/dom/htmlselectelement.rs +++ b/src/components/script/dom/htmlselectelement.rs @@ -3,12 +3,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLSelectElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLSelectElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; use dom::validitystate::ValidityState; +use servo_util::str::DOMString; pub struct HTMLSelectElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlsourceelement.rs b/src/components/script/dom/htmlsourceelement.rs index 25ba0239ad9..212ddd77850 100644 --- a/src/components/script/dom/htmlsourceelement.rs +++ b/src/components/script/dom/htmlsourceelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLSourceElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLSourceElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLSourceElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlspanelement.rs b/src/components/script/dom/htmlspanelement.rs index d76faa79057..47a47f3a17e 100644 --- a/src/components/script/dom/htmlspanelement.rs +++ b/src/components/script/dom/htmlspanelement.rs @@ -3,11 +3,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLSpanElementBinding; -use dom::bindings::utils::DOMString; use dom::document::AbstractDocument; use dom::element::HTMLSpanElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLSpanElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlstyleelement.rs b/src/components/script/dom/htmlstyleelement.rs index 0588d372168..4a39f6bcf39 100644 --- a/src/components/script/dom/htmlstyleelement.rs +++ b/src/components/script/dom/htmlstyleelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLStyleElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLStyleElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLStyleElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmltablecaptionelement.rs b/src/components/script/dom/htmltablecaptionelement.rs index 47deb6cf5be..94d5faf5ffc 100644 --- a/src/components/script/dom/htmltablecaptionelement.rs +++ b/src/components/script/dom/htmltablecaptionelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLTableCaptionElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLTableCaptionElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLTableCaptionElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmltablecellelement.rs b/src/components/script/dom/htmltablecellelement.rs index 206f0ed4cef..ddca4692373 100644 --- a/src/components/script/dom/htmltablecellelement.rs +++ b/src/components/script/dom/htmltablecellelement.rs @@ -2,10 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::ElementTypeId; use dom::htmlelement::HTMLElement; +use servo_util::str::DOMString; pub struct HTMLTableCellElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmltablecolelement.rs b/src/components/script/dom/htmltablecolelement.rs index 80462070d28..577718f5535 100644 --- a/src/components/script/dom/htmltablecolelement.rs +++ b/src/components/script/dom/htmltablecolelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLTableColElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLTableColElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLTableColElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmltabledatacellelement.rs b/src/components/script/dom/htmltabledatacellelement.rs index d14b2279ce6..edcfaae6053 100644 --- a/src/components/script/dom/htmltabledatacellelement.rs +++ b/src/components/script/dom/htmltabledatacellelement.rs @@ -3,11 +3,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLTableDataCellElementBinding; -use dom::bindings::utils::DOMString; use dom::document::AbstractDocument; use dom::element::HTMLTableDataCellElementTypeId; use dom::htmltablecellelement::HTMLTableCellElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLTableDataCellElement { htmltablecellelement: HTMLTableCellElement, diff --git a/src/components/script/dom/htmltableelement.rs b/src/components/script/dom/htmltableelement.rs index 26b6f89819a..bf46faa3bcc 100644 --- a/src/components/script/dom/htmltableelement.rs +++ b/src/components/script/dom/htmltableelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLTableElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLTableElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLTableElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmltableheadercellelement.rs b/src/components/script/dom/htmltableheadercellelement.rs index 49f75d33ff4..ed9475f3683 100644 --- a/src/components/script/dom/htmltableheadercellelement.rs +++ b/src/components/script/dom/htmltableheadercellelement.rs @@ -3,11 +3,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLTableHeaderCellElementBinding; -use dom::bindings::utils::DOMString; use dom::document::AbstractDocument; use dom::element::HTMLTableHeaderCellElementTypeId; use dom::htmltablecellelement::HTMLTableCellElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLTableHeaderCellElement { htmltablecellelement: HTMLTableCellElement, diff --git a/src/components/script/dom/htmltablerowelement.rs b/src/components/script/dom/htmltablerowelement.rs index 8454cea09c4..53c5eaaa0b3 100644 --- a/src/components/script/dom/htmltablerowelement.rs +++ b/src/components/script/dom/htmltablerowelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLTableRowElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLTableRowElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLTableRowElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmltablesectionelement.rs b/src/components/script/dom/htmltablesectionelement.rs index 6f80dc04e9a..7a3270197cb 100644 --- a/src/components/script/dom/htmltablesectionelement.rs +++ b/src/components/script/dom/htmltablesectionelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLTableSectionElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLTableSectionElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLTableSectionElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmltemplateelement.rs b/src/components/script/dom/htmltemplateelement.rs index 6dd6434455a..1bfe4f0b236 100644 --- a/src/components/script/dom/htmltemplateelement.rs +++ b/src/components/script/dom/htmltemplateelement.rs @@ -3,11 +3,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLTemplateElementBinding; -use dom::bindings::utils::DOMString; use dom::document::AbstractDocument; use dom::element::HTMLTemplateElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLTemplateElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmltextareaelement.rs b/src/components/script/dom/htmltextareaelement.rs index 52e31d94029..43da53af73b 100644 --- a/src/components/script/dom/htmltextareaelement.rs +++ b/src/components/script/dom/htmltextareaelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLTextAreaElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult, Fallible}; +use dom::bindings::utils::{Fallible, ErrorResult}; use dom::document::AbstractDocument; use dom::element::HTMLTextAreaElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLTextAreaElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmltimeelement.rs b/src/components/script/dom/htmltimeelement.rs index 3924ccde4ed..23c48c71f70 100644 --- a/src/components/script/dom/htmltimeelement.rs +++ b/src/components/script/dom/htmltimeelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLTimeElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLTimeElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLTimeElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmltitleelement.rs b/src/components/script/dom/htmltitleelement.rs index 583d28db9cd..b6466637181 100644 --- a/src/components/script/dom/htmltitleelement.rs +++ b/src/components/script/dom/htmltitleelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLTitleElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLTitleElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLTitleElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmltrackelement.rs b/src/components/script/dom/htmltrackelement.rs index 9d435930e50..bf081d44918 100644 --- a/src/components/script/dom/htmltrackelement.rs +++ b/src/components/script/dom/htmltrackelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLTrackElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLTrackElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLTrackElement { htmlelement: HTMLElement, diff --git a/src/components/script/dom/htmlulistelement.rs b/src/components/script/dom/htmlulistelement.rs index d45d56a6d5c..812144edf57 100644 --- a/src/components/script/dom/htmlulistelement.rs +++ b/src/components/script/dom/htmlulistelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLUListElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLUListElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLUListElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlunknownelement.rs b/src/components/script/dom/htmlunknownelement.rs index 5988c14bf78..67aa56bc47c 100644 --- a/src/components/script/dom/htmlunknownelement.rs +++ b/src/components/script/dom/htmlunknownelement.rs @@ -3,11 +3,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLUnknownElementBinding; -use dom::bindings::utils::DOMString; use dom::document::AbstractDocument; use dom::element::HTMLUnknownElementTypeId; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLUnknownElement { htmlelement: HTMLElement diff --git a/src/components/script/dom/htmlvideoelement.rs b/src/components/script/dom/htmlvideoelement.rs index abb991ec3dd..c3c1ac9a9b4 100644 --- a/src/components/script/dom/htmlvideoelement.rs +++ b/src/components/script/dom/htmlvideoelement.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLVideoElementBinding; -use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::bindings::utils::ErrorResult; use dom::document::AbstractDocument; use dom::element::HTMLVideoElementTypeId; use dom::htmlmediaelement::HTMLMediaElement; use dom::node::{AbstractNode, Node}; +use servo_util::str::DOMString; pub struct HTMLVideoElement { htmlmediaelement: HTMLMediaElement diff --git a/src/components/script/dom/location.rs b/src/components/script/dom/location.rs index 2c773c77b8d..b59248346e5 100644 --- a/src/components/script/dom/location.rs +++ b/src/components/script/dom/location.rs @@ -3,9 +3,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; -use dom::bindings::utils::{DOMString, Fallible}; +use dom::bindings::utils::Fallible; use dom::bindings::codegen::LocationBinding; use dom::window::Window; +use servo_util::str::DOMString; use script_task::{Page}; diff --git a/src/components/script/dom/mouseevent.rs b/src/components/script/dom/mouseevent.rs index adb5a90d1b0..c61c5c1aee0 100644 --- a/src/components/script/dom/mouseevent.rs +++ b/src/components/script/dom/mouseevent.rs @@ -3,13 +3,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::MouseEventBinding; -use dom::bindings::utils::{ErrorResult, Fallible, DOMString}; +use dom::bindings::utils::{ErrorResult, Fallible}; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::event::{AbstractEvent, Event, MouseEventTypeId}; use dom::eventtarget::AbstractEventTarget; use dom::uievent::UIEvent; use dom::window::Window; use dom::windowproxy::WindowProxy; +use servo_util::str::DOMString; pub struct MouseEvent { parent: UIEvent, diff --git a/src/components/script/dom/navigator.rs b/src/components/script/dom/navigator.rs index 1d9c404545a..0c011f9bd58 100644 --- a/src/components/script/dom/navigator.rs +++ b/src/components/script/dom/navigator.rs @@ -3,9 +3,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; -use dom::bindings::utils::{DOMString, Fallible}; +use dom::bindings::utils::Fallible; use dom::bindings::codegen::NavigatorBinding; use dom::window::Window; +use servo_util::str::DOMString; pub struct Navigator { reflector_: Reflector //XXXjdm cycle: window->navigator->window diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs index c295b5e28cd..fc57050a3b5 100644 --- a/src/components/script/dom/node.rs +++ b/src/components/script/dom/node.rs @@ -5,7 +5,6 @@ //! The core DOM types. Defines the basic DOM hierarchy as well as all the HTML elements. use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; -use dom::bindings::utils::{DOMString, null_str_as_empty}; use dom::bindings::utils::{ErrorResult, Fallible, NotFound, HierarchyRequest}; use dom::bindings::utils; use dom::characterdata::CharacterData; @@ -20,6 +19,7 @@ use dom::nodelist::{NodeList}; use dom::text::Text; use dom::processinginstruction::ProcessingInstruction; use layout_interface::{LayoutChan, ReapLayoutDataMsg, UntrustedNodeAddress}; +use servo_util::str::{DOMString, null_str_as_empty}; use js::jsapi::{JSContext, JSObject, JSRuntime}; use js::jsfriendapi; diff --git a/src/components/script/dom/processinginstruction.rs b/src/components/script/dom/processinginstruction.rs index a8a0e666560..a3067cbd29d 100644 --- a/src/components/script/dom/processinginstruction.rs +++ b/src/components/script/dom/processinginstruction.rs @@ -3,10 +3,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::ProcessingInstructionBinding; -use dom::bindings::utils::DOMString; use dom::characterdata::CharacterData; use dom::document::AbstractDocument; use dom::node::{AbstractNode, Node, ProcessingInstructionNodeTypeId}; +use servo_util::str::DOMString; /// An HTML processing instruction node. pub struct ProcessingInstruction { diff --git a/src/components/script/dom/text.rs b/src/components/script/dom/text.rs index 7ea96245124..857367bfb3d 100644 --- a/src/components/script/dom/text.rs +++ b/src/components/script/dom/text.rs @@ -3,11 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::TextBinding; -use dom::bindings::utils::{DOMString, Fallible}; +use dom::bindings::utils::Fallible; use dom::characterdata::CharacterData; use dom::document::AbstractDocument; use dom::node::{AbstractNode, Node, TextNodeTypeId}; use dom::window::Window; +use servo_util::str::DOMString; /// An HTML text node. pub struct Text { diff --git a/src/components/script/dom/uievent.rs b/src/components/script/dom/uievent.rs index 83503c7ee56..4ae1c6869b2 100644 --- a/src/components/script/dom/uievent.rs +++ b/src/components/script/dom/uievent.rs @@ -3,12 +3,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::UIEventBinding; -use dom::bindings::utils::{DOMString, Fallible}; +use dom::bindings::utils::Fallible; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::node::AbstractNode; use dom::event::{AbstractEvent, Event, EventTypeId, UIEventTypeId}; use dom::window::Window; use dom::windowproxy::WindowProxy; +use servo_util::str::DOMString; pub struct UIEvent { parent: Event, diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs index bc6512ae787..3596c5de9f9 100644 --- a/src/components/script/dom/window.rs +++ b/src/components/script/dom/window.rs @@ -5,7 +5,6 @@ use dom::bindings::codegen::WindowBinding; use dom::bindings::utils::{Reflectable, Reflector, Traceable}; use dom::bindings::utils::{trace_option, trace_reflector}; -use dom::bindings::utils::DOMString; use dom::document::AbstractDocument; use dom::eventtarget::{EventTarget, WindowTypeId}; use dom::node::AbstractNode; @@ -17,6 +16,7 @@ use layout_interface::{ReflowForDisplay, DocumentDamageLevel}; use script_task::{ExitWindowMsg, FireTimerMsg, Page, ScriptChan}; use servo_msg::compositor_msg::ScriptListener; use servo_net::image_cache_task::ImageCacheTask; +use servo_util::str::DOMString; use servo_util::task::{spawn_named}; use js::glue::*; diff --git a/src/components/script/html/hubbub_html_parser.rs b/src/components/script/html/hubbub_html_parser.rs index 9c1453b43f7..fdce3cb19a2 100644 --- a/src/components/script/html/hubbub_html_parser.rs +++ b/src/components/script/html/hubbub_html_parser.rs @@ -2,7 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::utils::DOMString; use dom::document::AbstractDocument; use dom::element::{HTMLLinkElementTypeId, HTMLIframeElementTypeId, HTMLImageElementTypeId}; use dom::htmlelement::HTMLElement; @@ -20,9 +19,10 @@ use js::jsapi::JSContext; use servo_msg::constellation_msg::SubpageId; use servo_net::image_cache_task::ImageCacheTask; use servo_net::resource_task::{Load, Payload, Done, ResourceTask, load_whole_resource}; -use servo_util::url::parse_url; -use servo_util::task::spawn_named; use servo_util::namespace::Null; +use servo_util::str::DOMString; +use servo_util::task::spawn_named; +use servo_util::url::parse_url; use std::cast; use std::cell::RefCell; use std::comm::{Port, SharedChan}; diff --git a/src/components/util/util.rs b/src/components/util/util.rs index 44431da502d..05870d12678 100644 --- a/src/components/util/util.rs +++ b/src/components/util/util.rs @@ -12,17 +12,18 @@ extern mod geom; extern mod native; pub mod cache; +pub mod concurrentmap; +pub mod debug; pub mod geometry; +pub mod io; +pub mod namespace; pub mod range; +pub mod smallvec; +pub mod sort; +pub mod str; +pub mod task; pub mod time; pub mod url; pub mod vec; -pub mod debug; -pub mod io; -pub mod task; pub mod workqueue; -pub mod namespace; -pub mod sort; -pub mod smallvec; -pub mod concurrentmap; |