diff options
| author | bors-servo <release+servo@mozilla.com> | 2014-03-05 12:19:33 -0500 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2014-03-05 12:19:33 -0500 |
| commit | cfbcb5c62b4589ccf93520a90da14a5d93b323a0 (patch) | |
| tree | 05b9949625d8aa5f6a708a43a09d63f3519a7b7f /src/components/script/dom/bindings/codegen | |
| parent | 81ef420e3f977a2e89c56be6c47f2e2ce13dc955 (diff) | |
| parent | 81a9b54bf8ff2bd7ed144fb31d1cebfb0ff21743 (diff) | |
| download | servo-cfbcb5c62b4589ccf93520a90da14a5d93b323a0.tar.gz servo-cfbcb5c62b4589ccf93520a90da14a5d93b323a0.zip | |
auto merge of #1821 : Ms2ger/servo/result-JSValConvertible, r=jdm
Diffstat (limited to 'src/components/script/dom/bindings/codegen')
| -rw-r--r-- | src/components/script/dom/bindings/codegen/CodegenRust.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index aa4e72c9bfa..f9a82da32e9 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 |