auto merge of #1945 : Ms2ger/servo/1196-isDefinitelyObject, r=jdm

... and fix nearby whitespace (fixes #1196).
This commit is contained in:
bors-servo 2014-03-20 09:40:32 -04:00
commit 9e53b4d828

View file

@ -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)