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

Auto merge of #10674 - KiChjang:codegen-avoid-rust-keywords, r=Manishearth

Browse source 
Avoid generating parameter names that are Rust keywords

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10674)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-18 05:10:43 +05:30
commit f93379ff4e
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,6 +36,13 @@ TRACE_HOOK_NAME = '_trace'
CONSTRUCT_HOOK_NAME = '_constructor'
HASINSTANCE_HOOK_NAME = '_hasInstance'
RUST_KEYWORDS = {"abstract", "alignof", "as", "become", "box", "break", "const", "continue",
"else", "enum", "extern", "false", "final", "fn", "for", "if", "impl", "in",
"let", "loop", "macro", "match", "mod", "move", "mut", "offsetof", "override",
"priv", "proc", "pub", "pure", "ref", "return", "static", "self", "sizeof",
"struct", "super", "true", "trait", "type", "typeof", "unsafe", "unsized",
"use", "virtual", "where", "while", "yield"}
def replaceFileIfChanged(filename, newContents):
"""
@ -5247,7 +5254,7 @@ class CGDictionary(CGThing):
@staticmethod
def makeMemberName(name):
# Can't use Rust keywords as member names.
if name == "type":
if name in RUST_KEYWORDS:
return name + "_"
return name