diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-04-28 04:23:05 -0500 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-04-28 04:23:05 -0500 |
| commit | b8ae33e510ea30e3200834fc2f7fbc426b86701e (patch) | |
| tree | d28e1d599528de74d858f1e5a7cfaea787f9390e /components/script/dom/bindings/codegen | |
| parent | 1cb012fc5043dd978d118e49b2f76e9320090bba (diff) | |
| parent | 1a30925cad5c55943e21d60e2891003b0ff722c9 (diff) | |
| download | servo-b8ae33e510ea30e3200834fc2f7fbc426b86701e.tar.gz servo-b8ae33e510ea30e3200834fc2f7fbc426b86701e.zip | |
Auto merge of #5871 - nox:rootable, r=jdm
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5871)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/bindings/codegen')
| -rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 6c0bef73c02..6b4acd64bd4 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -4733,8 +4733,8 @@ class CGBindingRoot(CGThing): 'dom::bindings::global::GlobalRef', 'dom::bindings::global::global_object_for_js_object', 'dom::bindings::js::{JS, JSRef, Root, RootedReference, Temporary, Unrooted}', - 'dom::bindings::js::{OptionalRootable, OptionalRootedRootable, ResultRootable}', - 'dom::bindings::js::{OptionalRootedReference, OptionalOptionalRootedRootable}', + 'dom::bindings::js::{OptionalOptionalRootable, OptionalRootable}', + 'dom::bindings::js::{OptionalRootedReference, ResultRootable, Rootable}', 'dom::bindings::utils::{create_dom_global, do_create_interface_objects}', 'dom::bindings::utils::ConstantSpec', 'dom::bindings::utils::{DOMClass}', @@ -5415,7 +5415,7 @@ class GlobalGenRoots(): descriptors = config.getDescriptors(register=True, isCallback=False) allprotos = [CGGeneric("#![allow(unused_imports)]\n"), CGGeneric("use dom::types::*;\n"), - CGGeneric("use dom::bindings::js::{JS, JSRef, LayoutJS, Temporary};\n"), + CGGeneric("use dom::bindings::js::{JS, JSRef, LayoutJS, Rootable, Temporary};\n"), CGGeneric("use dom::bindings::trace::JSTraceable;\n"), CGGeneric("use dom::bindings::utils::Reflectable;\n"), CGGeneric("use js::jsapi::JSTracer;\n\n"), |