diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-01-22 11:11:44 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 11:11:44 -0600 |
| commit | c1ed4bb2d5ed6a4f9967215620d2105cda5ef76a (patch) | |
| tree | 3cea287720d2e343b5a78ed03af137397d48fdf6 /components/script/dom/vreyeparameters.rs | |
| parent | abb04ce7c6d68bd6fa24d39692d2884c6cbc371d (diff) | |
| parent | 4be30960400dc25c68d7d0cb8da2de3cc4682b56 (diff) | |
| download | servo-c1ed4bb2d5ed6a4f9967215620d2105cda5ef76a.tar.gz servo-c1ed4bb2d5ed6a4f9967215620d2105cda5ef76a.zip | |
Auto merge of #19829 - servo:rustup, r=nox
Update Rust and use the newly-stable std::ptr::NonNull
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19829)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/vreyeparameters.rs')
| -rw-r--r-- | components/script/dom/vreyeparameters.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/vreyeparameters.rs b/components/script/dom/vreyeparameters.rs index 496277ba65d..333c717f06b 100644 --- a/components/script/dom/vreyeparameters.rs +++ b/components/script/dom/vreyeparameters.rs @@ -5,7 +5,6 @@ use dom::bindings::cell::DomRefCell; use dom::bindings::codegen::Bindings::VREyeParametersBinding; use dom::bindings::codegen::Bindings::VREyeParametersBinding::VREyeParametersMethods; -use dom::bindings::nonnull::NonNullJSObjectPtr; use dom::bindings::reflector::{Reflector, reflect_dom_object}; use dom::bindings::root::{Dom, DomRoot}; use dom::globalscope::GlobalScope; @@ -15,6 +14,7 @@ use js::jsapi::{Heap, JSContext, JSObject}; use js::typedarray::{Float32Array, CreateWith}; use std::default::Default; use std::ptr; +use std::ptr::NonNull; use webvr_traits::WebVREyeParameters; #[dom_struct] @@ -60,8 +60,8 @@ impl VREyeParameters { impl VREyeParametersMethods for VREyeParameters { #[allow(unsafe_code)] // https://w3c.github.io/webvr/#dom-vreyeparameters-offset - unsafe fn Offset(&self, _cx: *mut JSContext) -> NonNullJSObjectPtr { - NonNullJSObjectPtr::new_unchecked(self.offset.get()) + unsafe fn Offset(&self, _cx: *mut JSContext) -> NonNull<JSObject> { + NonNull::new_unchecked(self.offset.get()) } // https://w3c.github.io/webvr/#dom-vreyeparameters-fieldofview |