From 81a9b54bf8ff2bd7ed144fb31d1cebfb0ff21743 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 4 Mar 2014 22:44:55 +0100 Subject: Return Result from JSValConvertible::from_jsval. --- src/components/script/dom/bindings/codegen/CodegenRust.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/components/script/dom/bindings/codegen') diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 2c9b346db96..bff69a11a0a 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -1239,8 +1239,8 @@ for (uint32_t i = 0; i < length; ++i) { #XXXjdm support conversionBehavior here template = ( "match JSValConvertible::from_jsval(cx, ${val}) {\n" - " Some(v) => ${declName} = %s,\n" - " None => %s\n" + " Ok(v) => ${declName} = %s,\n" + " Err(_) => %s\n" "}" % (successVal, failureCode)) if defaultValue is not None and isinstance(defaultValue, IDLNullValue): @@ -1262,8 +1262,8 @@ for (uint32_t i = 0; i < length; ++i) { successVal = preSuccess + successVal + postSuccess template = ( "match JSValConvertible::from_jsval(cx, ${val}) {\n" - " None => %s,\n" - " Some(v) => %s = %s\n" + " Err(_) => %s,\n" + " Ok(v) => %s = %s\n" "}" % (failureCode, dataLoc, successVal)) declType = CGGeneric(typeName) if (defaultValue is not None and -- cgit v1.2.3