diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-03-12 01:51:49 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-03-12 01:51:49 -0600 |
| commit | d7e9b8b96b77377fa37fd59cdb8c44fa866b5b2e (patch) | |
| tree | 5069a73caee07a9633d2a4ef0e886fd7638734b0 /components/script/dom/bindings/codegen | |
| parent | 27a76f14b2baa58946004e17f4a417344a43e0a5 (diff) | |
| parent | 2af19b26758ee1344f72ade4eee802ca7d4bb925 (diff) | |
| download | servo-d7e9b8b96b77377fa37fd59cdb8c44fa866b5b2e.tar.gz servo-d7e9b8b96b77377fa37fd59cdb8c44fa866b5b2e.zip | |
auto merge of #5202 : doublec/servo/rename_unwrap, r=Ms2ger
Fix for issue #2108. That issue mentions an `unwrap_object` which doesn't seem to exist so I renamed `unwrap` to `native_from_reflector` and `unwrap_jsmanaged` to `native_from_reflector_jsmanaged`. The latter is a bit unweildy - maybe a shorter name might be better?
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 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', |