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

Make tidy happy

Browse source
This commit is contained in:
Bastien Orivel 2019-05-25 23:23:42 +02:00
parent 292d468cd1
commit b7e10a8224
1 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3317,7 +3317,7 @@ class CGCallGenerator(CGThing):
if "cx" not in argsPre and needsCx: if "cx" not in argsPre and needsCx:
args.prepend(CGGeneric("cx")) args.prepend(CGGeneric("cx"))
if nativeMethodName in descriptor.inCompartmentMethods: if nativeMethodName in descriptor.inCompartmentMethods:
args.append(CGGeneric("InCompartment::in_compartment(&AlreadyInCompartment::assert_for_cx(cx))")); args.append(CGGeneric("InCompartment::in_compartment(&AlreadyInCompartment::assert_for_cx(cx))"))
# Build up our actual call # Build up our actual call
self.cgRoot = CGList([], "\n") self.cgRoot = CGList([], "\n")
@ -5634,8 +5634,8 @@ class CGInterfaceTrait(CGThing):
if argument: if argument:
yield "value", argument_type(descriptor, argument) yield "value", argument_type(descriptor, argument)
if inCompartment: if inCompartment:
yield "_comp", "InCompartment" yield "_comp", "InCompartment"
def members(): def members():
for m in descriptor.interface.members: for m in descriptor.interface.members:
@ -5645,14 +5645,18 @@ class CGInterfaceTrait(CGThing):
name = CGSpecializedMethod.makeNativeName(descriptor, m) name = CGSpecializedMethod.makeNativeName(descriptor, m)
infallible = 'infallible' in descriptor.getExtendedAttributes(m) infallible = 'infallible' in descriptor.getExtendedAttributes(m)
for idx, (rettype, arguments) in enumerate(m.signatures()): for idx, (rettype, arguments) in enumerate(m.signatures()):
arguments = method_arguments(descriptor, rettype, arguments, inCompartment=name in descriptor.inCompartmentMethods) arguments = method_arguments(descriptor, rettype, arguments,
inCompartment=name in descriptor.inCompartmentMethods)
rettype = return_type(descriptor, rettype, infallible) rettype = return_type(descriptor, rettype, infallible)
yield name + ('_' * idx), arguments, rettype yield name + ('_' * idx), arguments, rettype
elif m.isAttr() and not m.isStatic(): elif m.isAttr() and not m.isStatic():
name = CGSpecializedGetter.makeNativeName(descriptor, m) name = CGSpecializedGetter.makeNativeName(descriptor, m)
infallible = 'infallible' in descriptor.getExtendedAttributes(m, getter=True) infallible = 'infallible' in descriptor.getExtendedAttributes(m, getter=True)
yield (name, yield (name,
attribute_arguments(typeNeedsCx(m.type, True), inCompartment=name in descriptor.inCompartmentMethods), attribute_arguments(
typeNeedsCx(m.type, True),
inCompartment=name in descriptor.inCompartmentMethods
),
return_type(descriptor, m.type, infallible)) return_type(descriptor, m.type, infallible))
if not m.readonly: if not m.readonly:
@ -5662,7 +5666,13 @@ class CGInterfaceTrait(CGThing):
rettype = "()" rettype = "()"
else: else:
rettype = "ErrorResult" rettype = "ErrorResult"
yield name, attribute_arguments(typeNeedsCx(m.type, False), m.type, inCompartment=name in descriptor.inCompartmentMethods), rettype yield (name,
attribute_arguments(
typeNeedsCx(m.type, False),
m.type,
inCompartment=name in descriptor.inCompartmentMethods
),
rettype)
if descriptor.proxy: if descriptor.proxy:
for name, operation in descriptor.operations.iteritems(): for name, operation in descriptor.operations.iteritems():
@ -5676,7 +5686,8 @@ class CGInterfaceTrait(CGThing):
if operation.isGetter(): if operation.isGetter():
if not rettype.nullable(): if not rettype.nullable():
rettype = IDLNullableType(rettype.location, rettype) rettype = IDLNullableType(rettype.location, rettype)
arguments = method_arguments(descriptor, rettype, arguments, inCompartment=name in descriptor.inCompartmentMethods) arguments = method_arguments(descriptor, rettype, arguments,
inCompartment=name in descriptor.inCompartmentMethods)
# If this interface 'supports named properties', then we # If this interface 'supports named properties', then we
# should be able to access 'supported property names' # should be able to access 'supported property names'
@ -5686,7 +5697,8 @@ class CGInterfaceTrait(CGThing):
if operation.isNamed(): if operation.isNamed():
yield "SupportedPropertyNames", [], "Vec<DOMString>" yield "SupportedPropertyNames", [], "Vec<DOMString>"
else: else:
arguments = method_arguments(descriptor, rettype, arguments, inCompartment=name in descriptor.inCompartmentMethods) arguments = method_arguments(descriptor, rettype, arguments,
inCompartment=name in descriptor.inCompartmentMethods)
rettype = return_type(descriptor, rettype, infallible) rettype = return_type(descriptor, rettype, infallible)
yield name, arguments, rettype yield name, arguments, rettype