diff options
| author | Ms2ger <ms2ger@gmail.com> | 2014-12-20 14:04:50 +0100 |
|---|---|---|
| committer | Ms2ger <ms2ger@gmail.com> | 2014-12-20 14:07:23 +0100 |
| commit | 73c236ce3b95c2bf9342f0f12f4218e1a87bc8ba (patch) | |
| tree | 5b2e10501700d87000c909d61065f5cf3833f3a2 /components/script/dom/bindings/codegen | |
| parent | b8c2573f4d7500561790428800a777deb56323c9 (diff) | |
| download | servo-73c236ce3b95c2bf9342f0f12f4218e1a87bc8ba.tar.gz servo-73c236ce3b95c2bf9342f0f12f4218e1a87bc8ba.zip | |
Use unwrap() when finalizing.
This allows us to duplicate a little less code.
Diffstat (limited to 'components/script/dom/bindings/codegen')
| -rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 28e1b439775..7f6a5ba1ccb 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -3922,10 +3922,10 @@ let this: *const %s = unwrap::<%s>(obj); assert(False) def finalizeHook(descriptor, hookName, context): - release = """let val = JS_GetReservedSlot(obj, dom_object_slot(obj)); -let _: Box<%s> = mem::transmute(val.to_private()); + release = """let value = unwrap::<%s>(obj); +let _: Box<%s> = mem::transmute(value); debug!("%s finalize: {:p}", this); -""" % (descriptor.concreteType, descriptor.concreteType) +""" % (descriptor.concreteType, descriptor.concreteType, descriptor.concreteType) return release class CGClassTraceHook(CGAbstractClassHook): @@ -4492,7 +4492,7 @@ class CGBindingRoot(CGThing): 'dom::bindings::js::{OptionalRootedReference, OptionalOptionalRootedRootable}', 'dom::bindings::utils::{CreateDOMGlobal, CreateInterfaceObjects2}', 'dom::bindings::utils::ConstantSpec', - 'dom::bindings::utils::{dom_object_slot, DOM_OBJECT_SLOT, DOMClass}', + 'dom::bindings::utils::{DOM_OBJECT_SLOT, DOMClass}', 'dom::bindings::utils::{DOMJSClass, JSCLASS_DOM_GLOBAL}', 'dom::bindings::utils::{FindEnumStringIndex, GetArrayIndexFromId}', 'dom::bindings::utils::{GetPropertyOnPrototype, GetProtoOrIfaceArray}', |