Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove unused parameter in instantiateJSToNativeConversionTemplate()

Browse source
This commit is contained in:
Anthony Ramine 2015-10-25 11:19:49 +01:00
parent b290a3161d
commit f84f16384d
1 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -436,14 +436,12 @@ class CGMethodCall(CGThing):
type, descriptor, failureCode="break;", isDefinitelyObject=True) type, descriptor, failureCode="break;", isDefinitelyObject=True)
template = info.template template = info.template
declType = info.declType declType = info.declType
needsRooting = info.needsRooting
testCode = instantiateJSToNativeConversionTemplate( testCode = instantiateJSToNativeConversionTemplate(
template, template,
{"val": distinguishingArg}, {"val": distinguishingArg},
declType, declType,
"arg%d" % distinguishingIndex, "arg%d" % distinguishingIndex)
needsRooting)
# Indent by 4, since we need to indent further than our "do" statement # Indent by 4, since we need to indent further than our "do" statement
caseBody.append(CGIndenter(testCode, 4)) caseBody.append(CGIndenter(testCode, 4))
@ -1079,7 +1077,7 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
def instantiateJSToNativeConversionTemplate(templateBody, replacements, def instantiateJSToNativeConversionTemplate(templateBody, replacements,
declType, declName, needsRooting): declType, declName):
""" """
Take the templateBody and declType as returned by Take the templateBody and declType as returned by
getJSToNativeConversionInfo, a set of replacements as required by the getJSToNativeConversionInfo, a set of replacements as required by the
@ -1165,7 +1163,6 @@ class CGArgumentConverter(CGThing):
template = info.template template = info.template
default = info.default default = info.default
declType = info.declType declType = info.declType
needsRooting = info.needsRooting
if not argument.variadic: if not argument.variadic:
if argument.optional: if argument.optional:
@ -1184,16 +1181,14 @@ class CGArgumentConverter(CGThing):
assert not default assert not default
self.converter = instantiateJSToNativeConversionTemplate( self.converter = instantiateJSToNativeConversionTemplate(
template, replacementVariables, declType, "arg%d" % index, template, replacementVariables, declType, "arg%d" % index)
needsRooting)
else: else:
assert argument.optional assert argument.optional
variadicConversion = { variadicConversion = {
"val": string.Template("${args}.get(variadicArg)").substitute(replacer), "val": string.Template("${args}.get(variadicArg)").substitute(replacer),
} }
innerConverter = instantiateJSToNativeConversionTemplate( innerConverter = instantiateJSToNativeConversionTemplate(
template, variadicConversion, declType, "slot", template, variadicConversion, declType, "slot")
needsRooting)
seqType = CGTemplatedType("Vec", declType) seqType = CGTemplatedType("Vec", declType)
@ -1216,8 +1211,7 @@ class CGArgumentConverter(CGThing):
CGGeneric("Vec::new()")).define() CGGeneric("Vec::new()")).define()
self.converter = instantiateJSToNativeConversionTemplate( self.converter = instantiateJSToNativeConversionTemplate(
variadicConversion, replacementVariables, seqType, "arg%d" % index, variadicConversion, replacementVariables, seqType, "arg%d" % index)
False)
def define(self): def define(self):
return self.converter.define() return self.converter.define()
@ -4060,14 +4054,12 @@ class CGProxySpecialOperation(CGPerSignatureCall):
exceptionCode="return false;") exceptionCode="return false;")
template = info.template template = info.template
declType = info.declType declType = info.declType
needsRooting = info.needsRooting
templateValues = { templateValues = {
"val": "value.handle()", "val": "value.handle()",
} }
self.cgRoot.prepend(instantiateJSToNativeConversionTemplate( self.cgRoot.prepend(instantiateJSToNativeConversionTemplate(
template, templateValues, declType, argument.identifier.name, template, templateValues, declType, argument.identifier.name))
needsRooting))
self.cgRoot.prepend(CGGeneric("let value = RootedValue::new(cx, desc.get().value);")) self.cgRoot.prepend(CGGeneric("let value = RootedValue::new(cx, desc.get().value);"))
elif operation.isGetter(): elif operation.isGetter():
self.cgRoot.prepend(CGGeneric("let mut found = false;")) self.cgRoot.prepend(CGGeneric("let mut found = false;"))
@ -5593,10 +5585,9 @@ class CallbackMember(CGNativeMember):
sourceDescription="return value") sourceDescription="return value")
template = info.template template = info.template
declType = info.declType declType = info.declType
needsRooting = info.needsRooting
convertType = instantiateJSToNativeConversionTemplate( convertType = instantiateJSToNativeConversionTemplate(
template, replacements, declType, "rvalDecl", needsRooting) template, replacements, declType, "rvalDecl")
if self.retvalType is None or self.retvalType.isVoid(): if self.retvalType is None or self.retvalType.isVoid():
retval = "()" retval = "()"