diff options
Diffstat (limited to 'src')
80 files changed, 125 insertions, 116 deletions
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 8382e2e9d26..9cfe8917ef6 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -5341,6 +5341,7 @@ class CGBindingRoot(CGThing): 'dom::bindings::utils::*', 'dom::bindings::trace::Traceable', 'dom::bindings::callback::*', + 'dom::bindings::error::{FailureUnknown, Fallible, Error, ErrorResult, throw_method_failed_with_details, throw_not_in_union}', 'dom::bindings::conversions::*', 'dom::bindings::codegen::*', #XXXjdm 'dom::bindings::codegen::UnionTypes::*', #XXXjdm diff --git a/src/components/script/dom/bindings/error.rs b/src/components/script/dom/bindings/error.rs new file mode 100644 index 00000000000..8ea949b28f6 --- /dev/null +++ b/src/components/script/dom/bindings/error.rs @@ -0,0 +1,45 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * 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 js::jsapi::{JSContext, JSBool}; +use js::jsapi::{JS_IsExceptionPending}; + +use js::glue::{ReportError}; + +#[deriving(ToStr)] +pub enum Error { + FailureUnknown, + NotFound, + HierarchyRequest, + InvalidCharacter, + NotSupported, + InvalidState, + NamespaceError +} + +pub type Fallible<T> = Result<T, Error>; + +pub type ErrorResult = Fallible<()>; + +pub fn throw_method_failed_with_details<T>(cx: *JSContext, + result: Result<T, Error>, + interface: &'static str, + member: &'static str) -> JSBool { + assert!(result.is_err()); + assert!(unsafe { JS_IsExceptionPending(cx) } == 0); + let message = format!("Method failed: {}.{}", interface, member); + message.with_c_str(|string| { + unsafe { ReportError(cx, string) }; + }); + return 0; +} + +pub fn throw_not_in_union(cx: *JSContext, names: &'static str) -> JSBool { + assert!(unsafe { JS_IsExceptionPending(cx) } == 0); + let message = format!("argument could not be converted to any of: {}", names); + message.with_c_str(|string| { + unsafe { ReportError(cx, string) }; + }); + return 0; +} diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs index 26269ddd8f5..8e7e86e0530 100644 --- a/src/components/script/dom/bindings/utils.rs +++ b/src/components/script/dom/bindings/utils.rs @@ -21,7 +21,6 @@ use std::unstable::raw::Box; use js::glue::*; use js::glue::{DefineFunctionWithReserved, GetObjectJSClass, RUST_OBJECT_TO_JSVAL}; use js::glue::{js_IsObjectProxyClass, js_IsFunctionProxyClass, IsProxyHandlerFamily}; -use js::glue::{ReportError}; use js::jsapi::{JS_AlreadyHasOwnProperty, JS_NewObject, JS_NewFunction}; use js::jsapi::{JS_DefineProperties, JS_WrapValue, JS_ForwardGetPropertyTo}; use js::jsapi::{JS_GetClass, JS_LinkConstructorAndPrototype, JS_GetStringCharsAndLength}; @@ -34,7 +33,7 @@ use js::jsapi::{JSContext, JSObject, JSBool, jsid, JSClass, JSNative}; use js::jsapi::{JSFunctionSpec, JSPropertySpec, JSVal, JSPropertyDescriptor}; use js::jsapi::{JS_NewGlobalObject, JS_InitStandardClasses}; use js::jsapi::{JSString}; -use js::jsapi::{JS_IsExceptionPending, JS_AllowGC, JS_InhibitGC}; +use js::jsapi::{JS_AllowGC, JS_InhibitGC}; use js::jsfriendapi::bindgen::JS_NewObjectWithUniqueType; use js::{JSPROP_ENUMERATE, JSVAL_NULL, JSCLASS_IS_GLOBAL, JSCLASS_IS_DOMJSCLASS}; use js::{JSPROP_PERMANENT, JSID_VOID, JSPROP_NATIVE_ACCESSORS, JSPROP_GETTER}; @@ -738,21 +737,6 @@ pub fn InitIds(cx: *JSContext, specs: &[JSPropertySpec], ids: &mut [jsid]) -> bo true } -#[deriving(ToStr)] -pub enum Error { - FailureUnknown, - NotFound, - HierarchyRequest, - InvalidCharacter, - NotSupported, - InvalidState, - NamespaceError -} - -pub type Fallible<T> = Result<T, Error>; - -pub type ErrorResult = Fallible<()>; - pub struct EnumEntry { value: &'static str, length: uint @@ -849,28 +833,6 @@ pub fn cx_for_dom_object<T: Reflectable>(obj: &T) -> *JSContext { cx_for_dom_reflector(obj.reflector().get_jsobject()) } -pub fn throw_method_failed_with_details<T>(cx: *JSContext, - result: Result<T, Error>, - interface: &'static str, - member: &'static str) -> JSBool { - assert!(result.is_err()); - assert!(unsafe { JS_IsExceptionPending(cx) } == 0); - let message = format!("Method failed: {}.{}", interface, member); - message.with_c_str(|string| { - unsafe { ReportError(cx, string) }; - }); - return 0; -} - -pub fn throw_not_in_union(cx: *JSContext, names: &'static str) -> JSBool { - assert!(unsafe { JS_IsExceptionPending(cx) } == 0); - let message = format!("argument could not be converted to any of: {}", names); - message.with_c_str(|string| { - unsafe { ReportError(cx, string) }; - }); - return 0; -} - /// Execute arbitrary code with the JS GC enabled, then disable it afterwards. pub fn with_gc_enabled<R>(cx: *JSContext, f: || -> R) -> R { unsafe { diff --git a/src/components/script/dom/blob.rs b/src/components/script/dom/blob.rs index 386b9447590..87034e5107e 100644 --- a/src/components/script/dom/blob.rs +++ b/src/components/script/dom/blob.rs @@ -4,7 +4,7 @@ use dom::bindings::js::JS; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; -use dom::bindings::utils::Fallible; +use dom::bindings::error::Fallible; use dom::bindings::codegen::BlobBinding; use dom::window::Window; use servo_util::str::DOMString; diff --git a/src/components/script/dom/characterdata.rs b/src/components/script/dom/characterdata.rs index f4bb567b5c6..40b72f18faf 100644 --- a/src/components/script/dom/characterdata.rs +++ b/src/components/script/dom/characterdata.rs @@ -6,7 +6,7 @@ use dom::bindings::codegen::InheritTypes::CharacterDataDerived; use dom::bindings::js::JS; -use dom::bindings::utils::{Fallible, ErrorResult}; +use dom::bindings::error::{Fallible, ErrorResult}; use dom::bindings::utils::{Reflectable, Reflector}; use dom::document::Document; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/comment.rs b/src/components/script/dom/comment.rs index 5dcfde7b418..515d414297d 100644 --- a/src/components/script/dom/comment.rs +++ b/src/components/script/dom/comment.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::InheritTypes::CommentDerived; use dom::bindings::codegen::CommentBinding; use dom::bindings::js::JS; -use dom::bindings::utils::Fallible; +use dom::bindings::error::Fallible; use dom::characterdata::CharacterData; use dom::document::Document; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs index a5b1903c903..5994f653f18 100644 --- a/src/components/script/dom/document.rs +++ b/src/components/script/dom/document.rs @@ -9,7 +9,7 @@ use dom::bindings::codegen::InheritTypes::{DocumentTypeCast, HTMLHtmlElementCast use dom::bindings::codegen::DocumentBinding; use dom::bindings::js::JS; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; -use dom::bindings::utils::{ErrorResult, Fallible, NotSupported, InvalidCharacter, HierarchyRequest}; +use dom::bindings::error::{ErrorResult, Fallible, NotSupported, InvalidCharacter, HierarchyRequest}; use dom::bindings::utils::{xml_name_type, InvalidXMLName}; use dom::comment::Comment; use dom::documentfragment::DocumentFragment; diff --git a/src/components/script/dom/documentfragment.rs b/src/components/script/dom/documentfragment.rs index 0e38b72f8ea..13fe9b9c80e 100644 --- a/src/components/script/dom/documentfragment.rs +++ b/src/components/script/dom/documentfragment.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::InheritTypes::DocumentFragmentDerived; use dom::bindings::codegen::DocumentFragmentBinding; use dom::bindings::js::JS; -use dom::bindings::utils::Fallible; +use dom::bindings::error::Fallible; use dom::document::Document; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; use dom::node::{DocumentFragmentNodeTypeId, Node}; diff --git a/src/components/script/dom/domimplementation.rs b/src/components/script/dom/domimplementation.rs index 86968680741..47ba1026dec 100644 --- a/src/components/script/dom/domimplementation.rs +++ b/src/components/script/dom/domimplementation.rs @@ -6,7 +6,7 @@ use dom::bindings::codegen::DOMImplementationBinding; use dom::bindings::codegen::InheritTypes::NodeCast; use dom::bindings::js::JS; use dom::bindings::utils::{Reflector, Reflectable, reflect_dom_object}; -use dom::bindings::utils::{Fallible, InvalidCharacter, NamespaceError}; +use dom::bindings::error::{Fallible, InvalidCharacter, NamespaceError}; use dom::bindings::utils::{QName, Name, InvalidXMLName, xml_name_type}; use dom::document::{Document, HTMLDocument}; use dom::documenttype::DocumentType; diff --git a/src/components/script/dom/domparser.rs b/src/components/script/dom/domparser.rs index f66e737a5f8..e679a9daf46 100644 --- a/src/components/script/dom/domparser.rs +++ b/src/components/script/dom/domparser.rs @@ -6,8 +6,7 @@ use dom::bindings::codegen::DOMParserBinding; use dom::bindings::codegen::DOMParserBinding::SupportedTypeValues::{Text_html, Text_xml}; use dom::bindings::js::JS; use dom::bindings::utils::{Reflector, Reflectable, reflect_dom_object}; -use dom::bindings::utils::Fallible; -use dom::bindings::utils::FailureUnknown; +use dom::bindings::error::{Fallible, FailureUnknown}; use dom::document::{Document, HTMLDocument}; use dom::window::Window; use servo_util::str::DOMString; diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs index 592511cd943..d045968c42c 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -11,7 +11,7 @@ use dom::bindings::codegen::InheritTypes::{HTMLIFrameElementCast, NodeCast}; use dom::bindings::codegen::InheritTypes::HTMLObjectElementCast; use dom::bindings::js::JS; use dom::bindings::utils::{Reflectable, Reflector}; -use dom::bindings::utils::{ErrorResult, Fallible, NamespaceError, InvalidCharacter}; +use dom::bindings::error::{ErrorResult, Fallible, NamespaceError, InvalidCharacter}; use dom::bindings::utils::{QName, Name, InvalidXMLName, xml_name_type}; use dom::htmlcollection::HTMLCollection; use dom::clientrect::ClientRect; diff --git a/src/components/script/dom/event.rs b/src/components/script/dom/event.rs index a8fac4308ef..4c3fb0e5b5b 100644 --- a/src/components/script/dom/event.rs +++ b/src/components/script/dom/event.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::EventBinding; use dom::bindings::js::JS; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; -use dom::bindings::utils::{Fallible, ErrorResult}; +use dom::bindings::error::{Fallible, ErrorResult}; use dom::eventtarget::EventTarget; use dom::window::Window; use servo_util::str::DOMString; diff --git a/src/components/script/dom/eventtarget.rs b/src/components/script/dom/eventtarget.rs index 07445b12de5..5b4d2d52412 100644 --- a/src/components/script/dom/eventtarget.rs +++ b/src/components/script/dom/eventtarget.rs @@ -4,7 +4,7 @@ use dom::bindings::js::JS; use dom::bindings::utils::{Reflectable, Reflector}; -use dom::bindings::utils::{Fallible, InvalidState}; +use dom::bindings::error::{Fallible, InvalidState}; use dom::bindings::codegen::EventListenerBinding::EventListener; use dom::event::Event; use dom::eventdispatcher::dispatch_event; diff --git a/src/components/script/dom/formdata.rs b/src/components/script/dom/formdata.rs index 3beb7e996aa..011722ea275 100644 --- a/src/components/script/dom/formdata.rs +++ b/src/components/script/dom/formdata.rs @@ -2,7 +2,8 @@ * 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::{Fallible, Reflectable, Reflector, reflect_dom_object}; +use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; +use dom::bindings::error::{Fallible}; use dom::bindings::codegen::FormDataBinding; use dom::bindings::js::JS; use dom::blob::Blob; diff --git a/src/components/script/dom/htmlanchorelement.rs b/src/components/script/dom/htmlanchorelement.rs index 4b4bcf7c115..4191a8bccfa 100644 --- a/src/components/script/dom/htmlanchorelement.rs +++ b/src/components/script/dom/htmlanchorelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLAnchorElementBinding; use dom::bindings::codegen::InheritTypes::HTMLAnchorElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLAnchorElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlappletelement.rs b/src/components/script/dom/htmlappletelement.rs index 463414890c8..462be40a898 100644 --- a/src/components/script/dom/htmlappletelement.rs +++ b/src/components/script/dom/htmlappletelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLAppletElementBinding; use dom::bindings::codegen::InheritTypes::HTMLAppletElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLAppletElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlareaelement.rs b/src/components/script/dom/htmlareaelement.rs index 91d89feed00..40226962db6 100644 --- a/src/components/script/dom/htmlareaelement.rs +++ b/src/components/script/dom/htmlareaelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLAreaElementBinding; use dom::bindings::codegen::InheritTypes::HTMLAreaElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLAreaElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlbaseelement.rs b/src/components/script/dom/htmlbaseelement.rs index 4384d620e93..2a697bd019d 100644 --- a/src/components/script/dom/htmlbaseelement.rs +++ b/src/components/script/dom/htmlbaseelement.rs @@ -4,7 +4,7 @@ use dom::bindings::codegen::HTMLBaseElementBinding; use dom::bindings::codegen::InheritTypes::HTMLBaseElementDerived; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::bindings::js::JS; use dom::document::Document; use dom::element::HTMLBaseElementTypeId; diff --git a/src/components/script/dom/htmlbodyelement.rs b/src/components/script/dom/htmlbodyelement.rs index a12a0dcf68f..5d41a3bd6c9 100644 --- a/src/components/script/dom/htmlbodyelement.rs +++ b/src/components/script/dom/htmlbodyelement.rs @@ -4,7 +4,7 @@ use dom::bindings::codegen::HTMLBodyElementBinding; use dom::bindings::codegen::InheritTypes::HTMLBodyElementDerived; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::bindings::js::JS; use dom::document::Document; use dom::element::HTMLBodyElementTypeId; diff --git a/src/components/script/dom/htmlbrelement.rs b/src/components/script/dom/htmlbrelement.rs index 9da6651455d..38798106026 100644 --- a/src/components/script/dom/htmlbrelement.rs +++ b/src/components/script/dom/htmlbrelement.rs @@ -4,7 +4,7 @@ use dom::bindings::codegen::HTMLBRElementBinding; use dom::bindings::codegen::InheritTypes::HTMLBRElementDerived; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::bindings::js::JS; use dom::document::Document; use dom::element::HTMLBRElementTypeId; diff --git a/src/components/script/dom/htmlbuttonelement.rs b/src/components/script/dom/htmlbuttonelement.rs index 83662da0340..06614bd48f8 100644 --- a/src/components/script/dom/htmlbuttonelement.rs +++ b/src/components/script/dom/htmlbuttonelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLButtonElementBinding; use dom::bindings::codegen::InheritTypes::HTMLButtonElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLButtonElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlcanvaselement.rs b/src/components/script/dom/htmlcanvaselement.rs index 199f4ad8c5b..6be5dfc6e65 100644 --- a/src/components/script/dom/htmlcanvaselement.rs +++ b/src/components/script/dom/htmlcanvaselement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLCanvasElementBinding; use dom::bindings::codegen::InheritTypes::HTMLCanvasElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::{ErrorResult}; +use dom::bindings::error::{ErrorResult}; use dom::document::Document; use dom::element::HTMLCanvasElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlcollection.rs b/src/components/script/dom/htmlcollection.rs index f14ecd05db7..0ad4d94d357 100644 --- a/src/components/script/dom/htmlcollection.rs +++ b/src/components/script/dom/htmlcollection.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLCollectionBinding; use dom::bindings::js::JS; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; -use dom::bindings::utils::Fallible; +use dom::bindings::error::Fallible; use dom::element::Element; use dom::window::Window; use servo_util::str::DOMString; diff --git a/src/components/script/dom/htmldataelement.rs b/src/components/script/dom/htmldataelement.rs index 59eb30945c6..84a13869c81 100644 --- a/src/components/script/dom/htmldataelement.rs +++ b/src/components/script/dom/htmldataelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLDataElementBinding; use dom::bindings::codegen::InheritTypes::HTMLDataElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLDataElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmldirectoryelement.rs b/src/components/script/dom/htmldirectoryelement.rs index 6847d7b1cf3..989019b3aee 100644 --- a/src/components/script/dom/htmldirectoryelement.rs +++ b/src/components/script/dom/htmldirectoryelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLDirectoryElementBinding; use dom::bindings::codegen::InheritTypes::HTMLDirectoryElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLDirectoryElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmldivelement.rs b/src/components/script/dom/htmldivelement.rs index 3220a7c6e24..f3346d0b049 100644 --- a/src/components/script/dom/htmldivelement.rs +++ b/src/components/script/dom/htmldivelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLDivElementBinding; use dom::bindings::codegen::InheritTypes::HTMLDivElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLDivElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmldlistelement.rs b/src/components/script/dom/htmldlistelement.rs index c1394c37bd8..fe8294daf46 100644 --- a/src/components/script/dom/htmldlistelement.rs +++ b/src/components/script/dom/htmldlistelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLDListElementBinding; use dom::bindings::codegen::InheritTypes::HTMLDListElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLDListElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlelement.rs b/src/components/script/dom/htmlelement.rs index 55c7c1141b6..b27afdfff2e 100644 --- a/src/components/script/dom/htmlelement.rs +++ b/src/components/script/dom/htmlelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLElementBinding; use dom::bindings::codegen::InheritTypes::HTMLElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::{ErrorResult, Fallible}; +use dom::bindings::error::{ErrorResult, Fallible}; use dom::document::Document; use dom::element::{Element, ElementTypeId, HTMLElementTypeId}; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlembedelement.rs b/src/components/script/dom/htmlembedelement.rs index d2da7f540d1..68a60d243fc 100644 --- a/src/components/script/dom/htmlembedelement.rs +++ b/src/components/script/dom/htmlembedelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLEmbedElementBinding; use dom::bindings::codegen::InheritTypes::HTMLEmbedElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLEmbedElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlfieldsetelement.rs b/src/components/script/dom/htmlfieldsetelement.rs index a67e3a8bc91..cdfc6eab402 100644 --- a/src/components/script/dom/htmlfieldsetelement.rs +++ b/src/components/script/dom/htmlfieldsetelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLFieldSetElementBinding; use dom::bindings::codegen::InheritTypes::HTMLFieldSetElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLFieldSetElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlfontelement.rs b/src/components/script/dom/htmlfontelement.rs index 024d546cc41..b0c67b585c9 100644 --- a/src/components/script/dom/htmlfontelement.rs +++ b/src/components/script/dom/htmlfontelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLFontElementBinding; use dom::bindings::codegen::InheritTypes::HTMLFontElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLFontElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlformelement.rs b/src/components/script/dom/htmlformelement.rs index d213c68dbdb..03d2ee8eeb1 100644 --- a/src/components/script/dom/htmlformelement.rs +++ b/src/components/script/dom/htmlformelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLFormElementBinding; use dom::bindings::codegen::InheritTypes::HTMLFormElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::{Element, HTMLFormElementTypeId}; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlframeelement.rs b/src/components/script/dom/htmlframeelement.rs index 26486c7cceb..2d534ac6b44 100644 --- a/src/components/script/dom/htmlframeelement.rs +++ b/src/components/script/dom/htmlframeelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLFrameElementBinding; use dom::bindings::codegen::InheritTypes::HTMLFrameElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLFrameElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlframesetelement.rs b/src/components/script/dom/htmlframesetelement.rs index 252c17709c5..5ab1db437d2 100644 --- a/src/components/script/dom/htmlframesetelement.rs +++ b/src/components/script/dom/htmlframesetelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLFrameSetElementBinding; use dom::bindings::codegen::InheritTypes::HTMLFrameSetElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLFrameSetElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlhrelement.rs b/src/components/script/dom/htmlhrelement.rs index 557a423787c..e0b5d054024 100644 --- a/src/components/script/dom/htmlhrelement.rs +++ b/src/components/script/dom/htmlhrelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLHRElementBinding; use dom::bindings::codegen::InheritTypes::HTMLHRElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLHRElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlhtmlelement.rs b/src/components/script/dom/htmlhtmlelement.rs index dcadd267abb..9a406da7d90 100644 --- a/src/components/script/dom/htmlhtmlelement.rs +++ b/src/components/script/dom/htmlhtmlelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLHtmlElementBinding; use dom::bindings::codegen::InheritTypes::HTMLHtmlElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLHtmlElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmliframeelement.rs b/src/components/script/dom/htmliframeelement.rs index 4f25371772b..46fb91a6239 100644 --- a/src/components/script/dom/htmliframeelement.rs +++ b/src/components/script/dom/htmliframeelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLIFrameElementBinding; use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLIFrameElementDerived}; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLIframeElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlimageelement.rs b/src/components/script/dom/htmlimageelement.rs index 05d2a0b7c3e..df852ad86b2 100644 --- a/src/components/script/dom/htmlimageelement.rs +++ b/src/components/script/dom/htmlimageelement.rs @@ -6,7 +6,7 @@ use dom::bindings::codegen::HTMLImageElementBinding; use dom::bindings::codegen::InheritTypes::{NodeCast, HTMLImageElementDerived}; use dom::bindings::codegen::InheritTypes::{ElementCast}; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::{Element, HTMLImageElementTypeId}; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlinputelement.rs b/src/components/script/dom/htmlinputelement.rs index 426f78b3e6b..162006a1413 100644 --- a/src/components/script/dom/htmlinputelement.rs +++ b/src/components/script/dom/htmlinputelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLInputElementBinding; use dom::bindings::codegen::InheritTypes::HTMLInputElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::{ErrorResult, Fallible}; +use dom::bindings::error::{ErrorResult, Fallible}; use dom::document::Document; use dom::element::HTMLInputElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmllegendelement.rs b/src/components/script/dom/htmllegendelement.rs index 9c98a6b103a..cf751f3ec8c 100644 --- a/src/components/script/dom/htmllegendelement.rs +++ b/src/components/script/dom/htmllegendelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLLegendElementBinding; use dom::bindings::codegen::InheritTypes::HTMLLegendElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLLegendElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmllielement.rs b/src/components/script/dom/htmllielement.rs index 79a243c7fb2..19e9789eb97 100644 --- a/src/components/script/dom/htmllielement.rs +++ b/src/components/script/dom/htmllielement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLLIElementBinding; use dom::bindings::codegen::InheritTypes::HTMLLIElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLLIElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmllinkelement.rs b/src/components/script/dom/htmllinkelement.rs index f8e6bdc73e7..caa7649624f 100644 --- a/src/components/script/dom/htmllinkelement.rs +++ b/src/components/script/dom/htmllinkelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLLinkElementBinding; use dom::bindings::codegen::InheritTypes::HTMLLinkElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLLinkElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlmapelement.rs b/src/components/script/dom/htmlmapelement.rs index fcb09820fb1..41516e9a5d2 100644 --- a/src/components/script/dom/htmlmapelement.rs +++ b/src/components/script/dom/htmlmapelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLMapElementBinding; use dom::bindings::codegen::InheritTypes::HTMLMapElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLMapElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlmediaelement.rs b/src/components/script/dom/htmlmediaelement.rs index d28b38085de..d41e53d0081 100644 --- a/src/components/script/dom/htmlmediaelement.rs +++ b/src/components/script/dom/htmlmediaelement.rs @@ -4,7 +4,7 @@ use dom::bindings::js::JS; use dom::bindings::codegen::InheritTypes::HTMLMediaElementDerived; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::{ElementTypeId, HTMLAudioElementTypeId, HTMLVideoElementTypeId}; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlmetaelement.rs b/src/components/script/dom/htmlmetaelement.rs index 94639c05d0e..a0c753fb62b 100644 --- a/src/components/script/dom/htmlmetaelement.rs +++ b/src/components/script/dom/htmlmetaelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLMetaElementBinding; use dom::bindings::codegen::InheritTypes::HTMLMetaElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLMetaElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlmeterelement.rs b/src/components/script/dom/htmlmeterelement.rs index ac7e4e04736..fbdd1ddcddf 100644 --- a/src/components/script/dom/htmlmeterelement.rs +++ b/src/components/script/dom/htmlmeterelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLMeterElementBinding; use dom::bindings::codegen::InheritTypes::HTMLMeterElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLMeterElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlmodelement.rs b/src/components/script/dom/htmlmodelement.rs index bd1b00f30f4..fe95f503843 100644 --- a/src/components/script/dom/htmlmodelement.rs +++ b/src/components/script/dom/htmlmodelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLModElementBinding; use dom::bindings::codegen::InheritTypes::HTMLModElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLModElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlobjectelement.rs b/src/components/script/dom/htmlobjectelement.rs index d75b9750b78..fba1a979e43 100644 --- a/src/components/script/dom/htmlobjectelement.rs +++ b/src/components/script/dom/htmlobjectelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLObjectElementBinding; use dom::bindings::codegen::InheritTypes::HTMLObjectElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLObjectElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlolistelement.rs b/src/components/script/dom/htmlolistelement.rs index ea677919edb..cd0bb64ef0f 100644 --- a/src/components/script/dom/htmlolistelement.rs +++ b/src/components/script/dom/htmlolistelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLOListElementBinding; use dom::bindings::codegen::InheritTypes::HTMLOListElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLOListElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmloptgroupelement.rs b/src/components/script/dom/htmloptgroupelement.rs index d8a3d222cb3..c775a2f95e8 100644 --- a/src/components/script/dom/htmloptgroupelement.rs +++ b/src/components/script/dom/htmloptgroupelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLOptGroupElementBinding; use dom::bindings::codegen::InheritTypes::HTMLOptGroupElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLOptGroupElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmloptionelement.rs b/src/components/script/dom/htmloptionelement.rs index d01de54a8bc..136ff75eef5 100644 --- a/src/components/script/dom/htmloptionelement.rs +++ b/src/components/script/dom/htmloptionelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLOptionElementBinding; use dom::bindings::codegen::InheritTypes::HTMLOptionElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLOptionElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmloutputelement.rs b/src/components/script/dom/htmloutputelement.rs index 95c03763c3c..59f3938f4f2 100644 --- a/src/components/script/dom/htmloutputelement.rs +++ b/src/components/script/dom/htmloutputelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLOutputElementBinding; use dom::bindings::codegen::InheritTypes::HTMLOutputElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLOutputElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlparagraphelement.rs b/src/components/script/dom/htmlparagraphelement.rs index a1aef4a7f5d..753a1089c18 100644 --- a/src/components/script/dom/htmlparagraphelement.rs +++ b/src/components/script/dom/htmlparagraphelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLParagraphElementBinding; use dom::bindings::codegen::InheritTypes::HTMLParagraphElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLParagraphElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlparamelement.rs b/src/components/script/dom/htmlparamelement.rs index 1e3e7785c0d..6dbcf24a9d9 100644 --- a/src/components/script/dom/htmlparamelement.rs +++ b/src/components/script/dom/htmlparamelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLParamElementBinding; use dom::bindings::codegen::InheritTypes::HTMLParamElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLParamElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlpreelement.rs b/src/components/script/dom/htmlpreelement.rs index 33f5b1a7247..fbe7ac49832 100644 --- a/src/components/script/dom/htmlpreelement.rs +++ b/src/components/script/dom/htmlpreelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLPreElementBinding; use dom::bindings::codegen::InheritTypes::HTMLPreElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::{ErrorResult}; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLPreElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlprogresselement.rs b/src/components/script/dom/htmlprogresselement.rs index ee6b3bff48b..6c380d76226 100644 --- a/src/components/script/dom/htmlprogresselement.rs +++ b/src/components/script/dom/htmlprogresselement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLProgressElementBinding; use dom::bindings::codegen::InheritTypes::HTMLProgressElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::{ErrorResult, Fallible}; +use dom::bindings::error::{ErrorResult, Fallible}; use dom::document::Document; use dom::element::HTMLProgressElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlquoteelement.rs b/src/components/script/dom/htmlquoteelement.rs index 9fc115dcf9c..66c863aed2b 100644 --- a/src/components/script/dom/htmlquoteelement.rs +++ b/src/components/script/dom/htmlquoteelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLQuoteElementBinding; use dom::bindings::codegen::InheritTypes::HTMLQuoteElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLQuoteElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlscriptelement.rs b/src/components/script/dom/htmlscriptelement.rs index 191d588585b..6cffaf288a6 100644 --- a/src/components/script/dom/htmlscriptelement.rs +++ b/src/components/script/dom/htmlscriptelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLScriptElementBinding; use dom::bindings::codegen::InheritTypes::HTMLScriptElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLScriptElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlselectelement.rs b/src/components/script/dom/htmlselectelement.rs index 1b7e452a992..1208a0e0112 100644 --- a/src/components/script/dom/htmlselectelement.rs +++ b/src/components/script/dom/htmlselectelement.rs @@ -6,7 +6,7 @@ use dom::bindings::codegen::HTMLSelectElementBinding; use dom::bindings::codegen::InheritTypes::HTMLSelectElementDerived; use dom::bindings::codegen::UnionTypes::{HTMLElementOrLong, HTMLOptionElementOrHTMLOptGroupElement}; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::{Element, HTMLSelectElementTypeId}; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlsourceelement.rs b/src/components/script/dom/htmlsourceelement.rs index c5c7beaec13..ecaa2d5f8df 100644 --- a/src/components/script/dom/htmlsourceelement.rs +++ b/src/components/script/dom/htmlsourceelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLSourceElementBinding; use dom::bindings::codegen::InheritTypes::HTMLSourceElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLSourceElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlstyleelement.rs b/src/components/script/dom/htmlstyleelement.rs index bc12ca5a291..8c09d6336c0 100644 --- a/src/components/script/dom/htmlstyleelement.rs +++ b/src/components/script/dom/htmlstyleelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLStyleElementBinding; use dom::bindings::codegen::InheritTypes::HTMLStyleElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLStyleElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmltablecaptionelement.rs b/src/components/script/dom/htmltablecaptionelement.rs index 0599e2624bf..980fb4199f6 100644 --- a/src/components/script/dom/htmltablecaptionelement.rs +++ b/src/components/script/dom/htmltablecaptionelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLTableCaptionElementBinding; use dom::bindings::codegen::InheritTypes::HTMLTableCaptionElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLTableCaptionElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmltablecellelement.rs b/src/components/script/dom/htmltablecellelement.rs index 04c745affd4..dd91a284c71 100644 --- a/src/components/script/dom/htmltablecellelement.rs +++ b/src/components/script/dom/htmltablecellelement.rs @@ -4,7 +4,7 @@ use dom::bindings::codegen::InheritTypes::HTMLTableCellElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::{ElementTypeId, HTMLTableDataCellElementTypeId, HTMLTableHeaderCellElementTypeId}; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmltablecolelement.rs b/src/components/script/dom/htmltablecolelement.rs index 8fbdb208124..aaf373bedce 100644 --- a/src/components/script/dom/htmltablecolelement.rs +++ b/src/components/script/dom/htmltablecolelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLTableColElementBinding; use dom::bindings::codegen::InheritTypes::HTMLTableColElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLTableColElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmltableelement.rs b/src/components/script/dom/htmltableelement.rs index 4ebd2cc4c97..484fd7d8100 100644 --- a/src/components/script/dom/htmltableelement.rs +++ b/src/components/script/dom/htmltableelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLTableElementBinding; use dom::bindings::codegen::InheritTypes::HTMLTableElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLTableElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmltablerowelement.rs b/src/components/script/dom/htmltablerowelement.rs index 22ae9fa7071..dacae2f73d9 100644 --- a/src/components/script/dom/htmltablerowelement.rs +++ b/src/components/script/dom/htmltablerowelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLTableRowElementBinding; use dom::bindings::codegen::InheritTypes::HTMLTableRowElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLTableRowElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmltablesectionelement.rs b/src/components/script/dom/htmltablesectionelement.rs index f718e67586a..ec95d9f996d 100644 --- a/src/components/script/dom/htmltablesectionelement.rs +++ b/src/components/script/dom/htmltablesectionelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLTableSectionElementBinding; use dom::bindings::codegen::InheritTypes::HTMLTableSectionElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLTableSectionElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmltextareaelement.rs b/src/components/script/dom/htmltextareaelement.rs index b34dc05c3e3..78e3977b74e 100644 --- a/src/components/script/dom/htmltextareaelement.rs +++ b/src/components/script/dom/htmltextareaelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLTextAreaElementBinding; use dom::bindings::codegen::InheritTypes::HTMLTextAreaElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::{ErrorResult, Fallible}; +use dom::bindings::error::{ErrorResult, Fallible}; use dom::document::Document; use dom::element::HTMLTextAreaElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmltimeelement.rs b/src/components/script/dom/htmltimeelement.rs index baddd3bd908..d41916b7afb 100644 --- a/src/components/script/dom/htmltimeelement.rs +++ b/src/components/script/dom/htmltimeelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLTimeElementBinding; use dom::bindings::codegen::InheritTypes::HTMLTimeElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLTimeElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmltitleelement.rs b/src/components/script/dom/htmltitleelement.rs index 61eebf793a5..b47bb4063eb 100644 --- a/src/components/script/dom/htmltitleelement.rs +++ b/src/components/script/dom/htmltitleelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLTitleElementBinding; use dom::bindings::codegen::InheritTypes::HTMLTitleElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLTitleElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmltrackelement.rs b/src/components/script/dom/htmltrackelement.rs index 24fcb38dd12..bd3129745ca 100644 --- a/src/components/script/dom/htmltrackelement.rs +++ b/src/components/script/dom/htmltrackelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLTrackElementBinding; use dom::bindings::codegen::InheritTypes::HTMLTrackElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLTrackElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlulistelement.rs b/src/components/script/dom/htmlulistelement.rs index 3533632b8a2..e99dd6a7c44 100644 --- a/src/components/script/dom/htmlulistelement.rs +++ b/src/components/script/dom/htmlulistelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLUListElementBinding; use dom::bindings::codegen::InheritTypes::HTMLUListElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLUListElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/htmlvideoelement.rs b/src/components/script/dom/htmlvideoelement.rs index 437e3f8bfc1..c34fb415084 100644 --- a/src/components/script/dom/htmlvideoelement.rs +++ b/src/components/script/dom/htmlvideoelement.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLVideoElementBinding; use dom::bindings::codegen::InheritTypes::HTMLVideoElementDerived; use dom::bindings::js::JS; -use dom::bindings::utils::ErrorResult; +use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLVideoElementTypeId; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/location.rs b/src/components/script/dom/location.rs index 40af193895d..717feb75493 100644 --- a/src/components/script/dom/location.rs +++ b/src/components/script/dom/location.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::LocationBinding; use dom::bindings::js::JS; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; -use dom::bindings::utils::Fallible; +use dom::bindings::error::Fallible; use dom::window::Window; use servo_util::str::DOMString; diff --git a/src/components/script/dom/mouseevent.rs b/src/components/script/dom/mouseevent.rs index 7f840877b30..0e11d2e838b 100644 --- a/src/components/script/dom/mouseevent.rs +++ b/src/components/script/dom/mouseevent.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::MouseEventBinding; use dom::bindings::codegen::InheritTypes::MouseEventDerived; use dom::bindings::js::JS; -use dom::bindings::utils::{ErrorResult, Fallible}; +use dom::bindings::error::{ErrorResult, Fallible}; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::event::{Event, MouseEventTypeId}; use dom::eventtarget::EventTarget; diff --git a/src/components/script/dom/navigator.rs b/src/components/script/dom/navigator.rs index 693e86cb23d..e3c648ec4ed 100644 --- a/src/components/script/dom/navigator.rs +++ b/src/components/script/dom/navigator.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::NavigatorBinding; use dom::bindings::js::JS; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; -use dom::bindings::utils::Fallible; +use dom::bindings::error::Fallible; use dom::window::Window; use servo_util::str::DOMString; diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs index 1aa4a0ff825..50b70cf14e8 100644 --- a/src/components/script/dom/node.rs +++ b/src/components/script/dom/node.rs @@ -9,7 +9,7 @@ use dom::bindings::codegen::InheritTypes::{CharacterDataCast, NodeBase, NodeDeri use dom::bindings::codegen::InheritTypes::ProcessingInstructionCast; use dom::bindings::js::JS; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; -use dom::bindings::utils::{ErrorResult, Fallible, NotFound, HierarchyRequest}; +use dom::bindings::error::{ErrorResult, Fallible, NotFound, HierarchyRequest}; use dom::bindings::utils; use dom::characterdata::CharacterData; use dom::document::Document; diff --git a/src/components/script/dom/text.rs b/src/components/script/dom/text.rs index 2d81937849e..391c2bcf02a 100644 --- a/src/components/script/dom/text.rs +++ b/src/components/script/dom/text.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::TextBinding; use dom::bindings::codegen::InheritTypes::TextDerived; use dom::bindings::js::JS; -use dom::bindings::utils::Fallible; +use dom::bindings::error::Fallible; use dom::characterdata::CharacterData; use dom::document::Document; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; diff --git a/src/components/script/dom/uievent.rs b/src/components/script/dom/uievent.rs index 92e36edd6a5..f5564bee284 100644 --- a/src/components/script/dom/uievent.rs +++ b/src/components/script/dom/uievent.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::UIEventBinding; use dom::bindings::codegen::InheritTypes::UIEventDerived; use dom::bindings::js::JS; -use dom::bindings::utils::Fallible; +use dom::bindings::error::Fallible; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::event::{Event, EventTypeId, UIEventTypeId}; use dom::node::Node; diff --git a/src/components/script/script.rs b/src/components/script/script.rs index 1d23dfc3402..906ca6f22bb 100644 --- a/src/components/script/script.rs +++ b/src/components/script/script.rs @@ -30,6 +30,7 @@ pub mod dom { pub mod element; pub mod utils; pub mod callback; + pub mod error; pub mod conversions; pub mod proxyhandler; pub mod trace; |