diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-24 10:40:44 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-24 10:40:44 +0530 |
| commit | edcf24fd4d39e86548717ecdfe36e2f1df30daac (patch) | |
| tree | ed6f283578806e108347f596179844786536b050 /components/script/dom | |
| parent | 2887623c4ae1960dfef52b14cd4afc3b279f9feb (diff) | |
| parent | 2477f6a3630815b0de0e3af1ff463286d44ad83d (diff) | |
| download | servo-edcf24fd4d39e86548717ecdfe36e2f1df30daac.tar.gz servo-edcf24fd4d39e86548717ecdfe36e2f1df30daac.zip | |
Auto merge of #10152 - jdm:9511-rebase, r=nox
Fix #9511. Export webidl enums using "pub use".
Change typedef codegen to export the underlying enum itself, rather
than an alias. Works around https://github.com/rust-lang/rust/issues/31355
Rebase of #9691.
<!-- 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/10152)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
| -rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 0f7e1570138..e497e9a5725 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -5334,8 +5334,8 @@ class CGBindingRoot(CGThing): # Do codegen for all the typdefs for t in typedefs: if t.innerType.isUnion(): - cgthings.extend([CGGeneric("\npub type %s = %s;\n\n" % (t.identifier.name, - "UnionTypes::" + str(t.innerType)))]) + cgthings.extend([CGGeneric("\npub use dom::bindings::codegen::UnionTypes::%s as %s;\n\n" % + (t.innerType, t.identifier.name))]) else: assert not typeNeedsRooting(t.innerType, config.getDescriptorProvider) cgthings.extend([CGGeneric("\npub type %s = " % (t.identifier.name)), |