aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/xmldocument.rs
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2018-01-22 12:42:05 +0100
committerSimon Sapin <simon.sapin@exyr.org>2018-01-22 17:41:25 +0100
commit52eda6082fd32d3e28f3600858afd8f5bbc918fe (patch)
treee4318bad96b0c58beec18a2ece26d114b620c8f3 /components/script/dom/xmldocument.rs
parent897a5b39c5d843cf0920870e8b4a01a84df236fc (diff)
downloadservo-52eda6082fd32d3e28f3600858afd8f5bbc918fe.tar.gz
servo-52eda6082fd32d3e28f3600858afd8f5bbc918fe.zip
Replace NonNullJSObjectPtr with std::ptr::NonNull<JSObject>
Diffstat (limited to 'components/script/dom/xmldocument.rs')
-rw-r--r--components/script/dom/xmldocument.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/components/script/dom/xmldocument.rs b/components/script/dom/xmldocument.rs
index ed67be90900..68764eb1080 100644
--- a/components/script/dom/xmldocument.rs
+++ b/components/script/dom/xmldocument.rs
@@ -6,7 +6,6 @@ use document_loader::DocumentLoader;
use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods;
use dom::bindings::codegen::Bindings::XMLDocumentBinding::{self, XMLDocumentMethods};
use dom::bindings::inheritance::Castable;
-use dom::bindings::nonnull::NonNullJSObjectPtr;
use dom::bindings::reflector::reflect_dom_object;
use dom::bindings::root::DomRoot;
use dom::bindings::str::DOMString;
@@ -16,8 +15,10 @@ use dom::node::Node;
use dom::window::Window;
use dom_struct::dom_struct;
use js::jsapi::JSContext;
+use js::jsapi::JSObject;
use script_traits::DocumentActivity;
use servo_url::{MutableOrigin, ServoUrl};
+use std::ptr::NonNull;
// https://dom.spec.whatwg.org/#xmldocument
#[dom_struct]
@@ -101,7 +102,7 @@ impl XMLDocumentMethods for XMLDocument {
#[allow(unsafe_code)]
// https://html.spec.whatwg.org/multipage/#dom-tree-accessors:dom-document-nameditem-filter
- unsafe fn NamedGetter(&self, _cx: *mut JSContext, name: DOMString) -> Option<NonNullJSObjectPtr> {
+ unsafe fn NamedGetter(&self, _cx: *mut JSContext, name: DOMString) -> Option<NonNull<JSObject>> {
self.upcast::<Document>().NamedGetter(_cx, name)
}
}