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

script_bindings(python): Handle WebIDL methods named with Rust keywords (#39343)

Browse source 
Some WebIDL methods, attributes and dictionary members are named with
Rust keywords such as `type`, `use` and `continue`. Using those
identifiers directly in the generated Rust code would cause compilation
errors.

The code generator already addresses this issue for attributes and
dictionary members by adding a `_` suffix to the conflicting
identifiers, but does not yet apply the same treatment to methods. This
patch extends the handling to methods as well.

Fixes: #39286

Signed-off-by: Kingsley Yung <kingsley@kkoyung.dev>
This commit is contained in:
Kingsley Yung 2025-09-17 12:09:02 +08:00 • committed by GitHub
parent 8c50c44942
commit e3818a33c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script_bindings/codegen/codegen.py
View file

@ -3045,7 +3045,7 @@ class CGAbstractMethod(CGThing):
extra_decorators: list[str] = []) -> None: extra_decorators: list[str] = []) -> None:
CGThing.__init__(self) CGThing.__init__(self)
self.descriptor = descriptor self.descriptor = descriptor
self.name = name self.name = CGDictionary.makeMemberName(name)
self.returnType = returnType self.returnType = returnType
self.args = args self.args = args
self.alwaysInline = alwaysInline self.alwaysInline = alwaysInline
@ -4805,7 +4805,7 @@ class CGMemberJITInfo(CGThing):
), ),
} }
""", """,
opValue=f"Some({opName}::<D>)", opValue=f"Some({CGDictionary.makeMemberName(opName)}::<D>)",
name=self.descriptor.name, name=self.descriptor.name,
depth=str(self.descriptor.interface.inheritanceDepth()), depth=str(self.descriptor.interface.inheritanceDepth()),
opType=opType, opType=opType,
@ -5137,7 +5137,7 @@ class CGStaticMethodJitinfo(CGGeneric):
pub(crate) fn init_{method.identifier.name}_methodinfo<D: DomTypes>() {{ pub(crate) fn init_{method.identifier.name}_methodinfo<D: DomTypes>() {{
{method.identifier.name}_methodinfo.set(JSJitInfo {{ {method.identifier.name}_methodinfo.set(JSJitInfo {{
__bindgen_anon_1: JSJitInfo__bindgen_ty_1 {{ __bindgen_anon_1: JSJitInfo__bindgen_ty_1 {{
staticMethod: Some({method.identifier.name}::<D>) staticMethod: Some({CGDictionary.makeMemberName(method.identifier.name)}::<D>)
}}, }},
__bindgen_anon_2: JSJitInfo__bindgen_ty_2 {{ __bindgen_anon_2: JSJitInfo__bindgen_ty_2 {{
protoID: PrototypeList::ID::Last as u16, protoID: PrototypeList::ID::Last as u16,