diff options
author | Ms2ger <ms2ger@gmail.com> | 2015-02-28 16:04:29 +0100 |
---|---|---|
committer | Ms2ger <ms2ger@gmail.com> | 2015-02-28 18:20:41 +0100 |
commit | 4873682a3cf9c041bb1672b49c0dd77bf6b4b1bc (patch) | |
tree | f2992d799587cde775960ce89ada4860667e0cf9 /components/script/dom/bindings/codegen | |
parent | 3dac90b49e57e1b387eb902e4f2dffff88f48757 (diff) | |
download | servo-4873682a3cf9c041bb1672b49c0dd77bf6b4b1bc.tar.gz servo-4873682a3cf9c041bb1672b49c0dd77bf6b4b1bc.zip |
Rename FailureUnknown to JSFailed.
Diffstat (limited to 'components/script/dom/bindings/codegen')
-rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 3ac47486fe0..ed2144a30ec 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -4645,7 +4645,7 @@ class CGBindingRoot(CGThing): 'dom::bindings::codegen::{PrototypeList, RegisterBindings, UnionTypes}', 'dom::bindings::codegen::Bindings::*', 'dom::bindings::error::{Fallible, Error, ErrorResult}', - 'dom::bindings::error::Error::FailureUnknown', + 'dom::bindings::error::Error::JSFailed', 'dom::bindings::error::throw_dom_exception', 'dom::bindings::error::throw_type_error', 'dom::bindings::proxyhandler', @@ -4814,14 +4814,14 @@ class CGCallback(CGClass): setupCall = ("let s = CallSetup::new(self, aExceptionHandling);\n" "if s.get_context().is_null() {\n" - " return Err(FailureUnknown);\n" + " return Err(JSFailed);\n" "}\n") bodyWithThis = string.Template( setupCall+ "let thisObjJS = wrap_call_this_object(s.get_context(), thisObj);\n" "if thisObjJS.is_null() {\n" - " return Err(FailureUnknown);\n" + " return Err(JSFailed);\n" "}\n" "return ${methodName}(${callArgs});").substitute({ "callArgs" : ", ".join(argnamesWithThis), @@ -4946,7 +4946,7 @@ class CallbackMember(CGNativeMember): jsObjectsArePtr=True) # We have to do all the generation of our body now, because # the caller relies on us throwing if we can't manage it. - self.exceptionCode= "return Err(FailureUnknown);" + self.exceptionCode = "return Err(JSFailed);" self.body = self.getImpl() def getImpl(self): @@ -5076,7 +5076,7 @@ class CallbackMember(CGNativeMember): "CallSetup s(CallbackPreserveColor(), aRv, aExceptionHandling);\n" "JSContext* cx = s.get_context();\n" "if (!cx) {\n" - " return Err(FailureUnknown);\n" + " return Err(JSFailed);\n" "}\n") def getArgcDecl(self): @@ -5121,7 +5121,7 @@ class CallbackMethod(CallbackMember): " ${argc}, ${argv}, &mut rval)\n" "};\n" "if ok == 0 {\n" - " return Err(FailureUnknown);\n" + " return Err(JSFailed);\n" "}\n").substitute(replacements) class CallCallback(CallbackMethod): @@ -5158,7 +5158,7 @@ class CallbackOperationBase(CallbackMethod): } getCallableFromProp = string.Template( 'match self.parent.get_callable_property(cx, "${methodName}") {\n' - ' Err(_) => return Err(FailureUnknown),\n' + ' Err(_) => return Err(JSFailed),\n' ' Ok(callable) => callable,\n' '}').substitute(replacements) if not self.singleOperation: @@ -5201,7 +5201,7 @@ class CallbackGetter(CallbackMember): } return string.Template( 'if (!JS_GetProperty(cx, mCallback, "${attrName}", &rval)) {\n' - ' return Err(FailureUnknown);\n' + ' return Err(JSFailed);\n' '}\n').substitute(replacements); class CallbackSetter(CallbackMember): @@ -5227,7 +5227,7 @@ class CallbackSetter(CallbackMember): return string.Template( 'MOZ_ASSERT(argv.length() == 1);\n' 'if (!JS_SetProperty(cx, mCallback, "${attrName}", ${argv})) {\n' - ' return Err(FailureUnknown);\n' + ' return Err(JSFailed);\n' '}\n').substitute(replacements) def getArgcDecl(self): |