diff options
| author | bors-servo <release+servo@mozilla.com> | 2014-03-20 09:40:32 -0400 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2014-03-20 09:40:32 -0400 |
| commit | 9e53b4d828f9cf9af560a4f9106e474eadfa3fa1 (patch) | |
| tree | 28a02436e780f1f3aa90a8e451aae48a6a4d9da2 /src/components/script | |
| parent | 19a7c429a1eea7b80cefb4b72138fafecc9b924a (diff) | |
| parent | bdfd89508adc5935a013d693f2b4d8f2d835aafe (diff) | |
| download | servo-9e53b4d828f9cf9af560a4f9106e474eadfa3fa1.tar.gz servo-9e53b4d828f9cf9af560a4f9106e474eadfa3fa1.zip | |
auto merge of #1945 : Ms2ger/servo/1196-isDefinitelyObject, r=jdm
... and fix nearby whitespace (fixes #1196).
Diffstat (limited to 'src/components/script')
| -rw-r--r-- | src/components/script/dom/bindings/codegen/CodegenRust.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 0a6b241a543..95a0b2b6a5b 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -629,9 +629,9 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None, if descriptor.interface.isCallback(): name = descriptor.nativeType declType = CGGeneric("Option<%s>" % name); - conversion = (" ${declName} = Some(%s::new((${val}).to_object()));\n" % name) + conversion = ("${declName} = Some(%s::new((${val}).to_object()));" % name) - template = wrapObjectTemplate(conversion, type, + template = wrapObjectTemplate(conversion, isDefinitelyObject, type, "${declName} = None", failureCode) return (template, declType, None, isOptional, None) |