From 2af19b26758ee1344f72ade4eee802ca7d4bb925 Mon Sep 17 00:00:00 2001 From: Chris Double Date: Thu, 12 Mar 2015 19:06:07 +1300 Subject: Fix #2108 by renaming unwrap functions to native_from_reflector As noted by @bholley. "unwrap" is confusing because we are both stripping off wrappers *and* getting a native from a reflector. Changing the "unwrap" usage to "native_from_reflector" for clarity. This renames 'unwrap' to 'native_from_reflector' and 'unwrap_jsmanaged' to 'native_from_reflector_jsmanaged'. --- components/script/dom/bindings/codegen/CodegenRust.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'components/script/dom/bindings/codegen/CodegenRust.py') diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 9274c6cafb7..f1ec208b3b2 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -108,7 +108,7 @@ class CastableObjectUnwrapper(): def __str__(self): return string.Template("""\ -match unwrap_jsmanaged(${source}) { +match native_from_reflector_jsmanaged(${source}) { Ok(val) => val, Err(()) => { ${codeOnFailure} @@ -1711,7 +1711,7 @@ def UnionTypes(descriptors, dictionaries, callbacks, config): 'dom::bindings::codegen::PrototypeList', 'dom::bindings::conversions::FromJSValConvertible', 'dom::bindings::conversions::ToJSValConvertible', - 'dom::bindings::conversions::unwrap_jsmanaged', + 'dom::bindings::conversions::native_from_reflector_jsmanaged', 'dom::bindings::conversions::StringificationBehavior::Default', 'dom::bindings::error::throw_not_in_union', 'dom::bindings::js::Unrooted', @@ -4015,7 +4015,7 @@ class CGAbstractClassHook(CGAbstractExternMethod): def definition_body_prologue(self): return CGGeneric("""\ -let this: *const %s = unwrap::<%s>(obj); +let this: *const %s = native_from_reflector::<%s>(obj); """ % (self.descriptor.concreteType, self.descriptor.concreteType)) def definition_body(self): @@ -4628,7 +4628,7 @@ class CGBindingRoot(CGThing): 'dom::bindings::callback::{CallSetup,ExceptionHandling}', 'dom::bindings::callback::wrap_call_this_object', 'dom::bindings::conversions::{FromJSValConvertible, ToJSValConvertible}', - 'dom::bindings::conversions::{unwrap, unwrap_jsmanaged}', + 'dom::bindings::conversions::{native_from_reflector, native_from_reflector_jsmanaged}', 'dom::bindings::conversions::DOM_OBJECT_SLOT', 'dom::bindings::conversions::IDLInterface', 'dom::bindings::conversions::jsid_to_str', -- cgit v1.2.3