mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Auto merge of #11231 - servo:rustup, r=Ms2ger
Update Rust to 1.10.0-nightly (cd6a40017 2016-05-16) <!-- 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/11231) <!-- Reviewable:end -->
This commit is contained in:
commit
82036b57c7
9 changed files with 86 additions and 146 deletions
|
@ -6377,9 +6377,7 @@ class GlobalGenRoots():
|
|||
if not config.getInterface(base).getExtendedAttribute("Abstract"):
|
||||
variants.append(CGGeneric(base))
|
||||
variants += [CGGeneric(type_id_variant(derivedName)) for derivedName in derived]
|
||||
derives = "Clone, Copy, Debug"
|
||||
if base != 'EventTarget' and base != 'HTMLElement':
|
||||
derives += ", PartialEq"
|
||||
derives = "Clone, Copy, Debug, PartialEq"
|
||||
typeIdCode.append(CGWrapper(CGIndenter(CGList(variants, ",\n"), 4),
|
||||
pre="#[derive(%s)]\npub enum %sTypeId {\n" % (derives, base),
|
||||
post="\n}\n\n"))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue