diff options
author | Ms2ger <ms2ger@gmail.com> | 2014-12-20 14:51:14 +0100 |
---|---|---|
committer | Ms2ger <ms2ger@gmail.com> | 2014-12-20 14:51:14 +0100 |
commit | 96180ec3adc855cfa32e92156d766986a1748e5a (patch) | |
tree | 774583976ce07d6ba21eec6f6e88d1c46d201e0f /components/script/dom/node.rs | |
parent | 73c236ce3b95c2bf9342f0f12f4218e1a87bc8ba (diff) | |
download | servo-96180ec3adc855cfa32e92156d766986a1748e5a.tar.gz servo-96180ec3adc855cfa32e92156d766986a1748e5a.zip |
Move unwrap_jsmanaged and related machinery to conversions.rs.
Diffstat (limited to 'components/script/dom/node.rs')
-rw-r--r-- | components/script/dom/node.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index e8d6035e856..1584ff112ac 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -19,6 +19,7 @@ use dom::bindings::codegen::InheritTypes::{CharacterDataCast, NodeBase, NodeDeri use dom::bindings::codegen::InheritTypes::{ProcessingInstructionCast, EventTargetCast}; use dom::bindings::codegen::InheritTypes::{HTMLLegendElementDerived, HTMLFieldSetElementDerived}; use dom::bindings::codegen::InheritTypes::HTMLOptGroupElementDerived; +use dom::bindings::conversions; use dom::bindings::error::Fallible; use dom::bindings::error::Error::{NotFound, HierarchyRequest, Syntax}; use dom::bindings::global::GlobalRef; @@ -26,7 +27,6 @@ use dom::bindings::js::{JS, JSRef, RootedReference, Temporary, Root}; use dom::bindings::js::{OptionalSettable, TemporaryPushable, OptionalRootedRootable}; use dom::bindings::js::{ResultRootable, OptionalRootable, MutNullableJS}; use dom::bindings::trace::JSTraceable; -use dom::bindings::utils; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::characterdata::CharacterData; use dom::comment::Comment; @@ -884,7 +884,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 = utils::unwrap(object); + let boxed_node: *const Node = conversions::unwrap(object); Temporary::new(JS::from_raw(boxed_node)) } } |