diff options
author | Simon Sapin <simon.sapin@exyr.org> | 2018-01-22 12:42:05 +0100 |
---|---|---|
committer | Simon Sapin <simon.sapin@exyr.org> | 2018-01-22 17:41:25 +0100 |
commit | 52eda6082fd32d3e28f3600858afd8f5bbc918fe (patch) | |
tree | e4318bad96b0c58beec18a2ece26d114b620c8f3 /components/script/dom/imagedata.rs | |
parent | 897a5b39c5d843cf0920870e8b4a01a84df236fc (diff) | |
download | servo-52eda6082fd32d3e28f3600858afd8f5bbc918fe.tar.gz servo-52eda6082fd32d3e28f3600858afd8f5bbc918fe.zip |
Replace NonNullJSObjectPtr with std::ptr::NonNull<JSObject>
Diffstat (limited to 'components/script/dom/imagedata.rs')
-rw-r--r-- | components/script/dom/imagedata.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/imagedata.rs b/components/script/dom/imagedata.rs index 6be4e5d89c2..9a51c0088d1 100644 --- a/components/script/dom/imagedata.rs +++ b/components/script/dom/imagedata.rs @@ -5,7 +5,6 @@ use dom::bindings::codegen::Bindings::ImageDataBinding; use dom::bindings::codegen::Bindings::ImageDataBinding::ImageDataMethods; use dom::bindings::error::{Fallible, Error}; -use dom::bindings::nonnull::NonNullJSObjectPtr; use dom::bindings::reflector::{Reflector, reflect_dom_object}; use dom::bindings::root::DomRoot; use dom::globalscope::GlobalScope; @@ -16,6 +15,7 @@ use js::rust::Runtime; use js::typedarray::{Uint8ClampedArray, CreateWith}; use std::default::Default; use std::ptr; +use std::ptr::NonNull; use std::vec::Vec; #[dom_struct] @@ -159,8 +159,8 @@ impl ImageDataMethods for ImageData { #[allow(unsafe_code)] // https://html.spec.whatwg.org/multipage/#dom-imagedata-data - unsafe fn Data(&self, _: *mut JSContext) -> NonNullJSObjectPtr { + unsafe fn Data(&self, _: *mut JSContext) -> NonNull<JSObject> { assert!(!self.data.get().is_null()); - NonNullJSObjectPtr::new_unchecked(self.data.get()) + NonNull::new_unchecked(self.data.get()) } } |