diff options
| author | Ms2ger <ms2ger@gmail.com> | 2014-04-17 12:06:23 +0200 |
|---|---|---|
| committer | Ms2ger <ms2ger@gmail.com> | 2014-04-25 09:58:49 +0200 |
| commit | 4905b226737062356bac280563b0760114fef721 (patch) | |
| tree | d522b677eff78913483b05cff4df3e7df0cb1b60 /src/components/script/dom | |
| parent | a9ffff92159645dc3e85f7c1d5bed9e3ae20eaa7 (diff) | |
| download | servo-4905b226737062356bac280563b0760114fef721.tar.gz servo-4905b226737062356bac280563b0760114fef721.zip | |
Rewrite the union unwrapping to return an expression.
Diffstat (limited to 'src/components/script/dom')
| -rw-r--r-- | src/components/script/dom/bindings/codegen/CodegenRust.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 0a77645874f..9b45d130055 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -584,21 +584,21 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None, declType = CGWrapper(declType, pre="Option<", post=" >") value = CGWrapper(value, pre="Some(", post=")") - templateBody = CGGeneric("${declName} = match %s::from_value(cx, ${val}) {\n" + templateBody = CGGeneric("match %s::from_value(cx, ${val}) {\n" " Err(()) => { %s },\n" " Ok(value) => %s,\n" - "};" % (type.name, exceptionCode, value.define())) + "}" % (type.name, exceptionCode, value.define())) if type.nullable(): templateBody = CGIfElseWrapper( "(${val}).is_null_or_undefined()", - CGGeneric("${declName} = None;"), + CGGeneric("None"), templateBody) templateBody = handleDefaultNull(templateBody.define(), - "${declName} = None;") + "None") - return (templateBody, declType, None, isOptional, "None" if isOptional else None) + return ("${declName} = " + templateBody + ";", declType, None, isOptional, "None" if isOptional else None) if type.isGeckoInterface(): assert not isEnforceRange and not isClamp |