aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/script/dom/bindings/codegen/CodegenRust.py
diff options
context:
space:
mode:
authorMs2ger <ms2ger@gmail.com>2014-04-17 12:19:47 +0200
committerMs2ger <ms2ger@gmail.com>2014-04-25 10:47:00 +0200
commit643ea874d101700d59153d9bd3f2033135754d08 (patch)
treed281d5ac289c17d1127db3ed0a18bda96a8d5bd8 /src/components/script/dom/bindings/codegen/CodegenRust.py
parent1027801b04b8fa2670642021aa0a2632b8d6c15b (diff)
downloadservo-643ea874d101700d59153d9bd3f2033135754d08.tar.gz
servo-643ea874d101700d59153d9bd3f2033135754d08.zip
Rewrite the any unwrapping to return an expression.
Diffstat (limited to 'src/components/script/dom/bindings/codegen/CodegenRust.py')
-rw-r--r--src/components/script/dom/bindings/codegen/CodegenRust.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py
index 7262c6d7a77..62f2138147c 100644
--- a/src/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/src/components/script/dom/bindings/codegen/CodegenRust.py
@@ -767,11 +767,8 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
declType = CGWrapper(declType, pre="Option<", post=">")
value = CGWrapper(value, pre="Some(", post=")")
- templateBody = "${declName} = %s;" % value.define()
- templateBody = handleDefaultNull(templateBody,
- "${declName} = NullValue();")
-
- return (templateBody, declType, None, isOptional, "None" if isOptional else None)
+ templateBody = handleDefaultNull(value.define(), "NullValue()")
+ return ("${declName} = " + templateBody + ";", declType, None, isOptional, "None" if isOptional else None)
if type.isObject():
raise TypeError("Can't handle object arguments yet")