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/node.rs | |
| 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/node.rs')
| -rw-r--r-- | components/script/dom/node.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index cd9dc6e6098..1ce9cfeae9e 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -913,7 +913,7 @@ pub fn from_untrusted_node_address(runtime: *mut JSRuntime, candidate: Untrusted if object.is_null() { panic!("Attempted to create a `JS<Node>` from an invalid pointer!") } - let boxed_node: *const Node = conversions::unwrap(object); + let boxed_node: *const Node = conversions::native_from_reflector(object); Temporary::from_unrooted(Unrooted::from_raw(boxed_node)) } } |