Move Error, Fallible, ErrorResult out of utils.rs (fixes #1749)

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

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;
+}

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 {

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;

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};

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};

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;

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};

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;

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;

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;

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;

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;

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;

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};

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};

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};

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;

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;

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;

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};

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};

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;

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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};

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;
 

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;

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;
 

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;

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};

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;

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;