aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/textencoder.rs
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2017-10-14 12:54:57 +0200
committerSimon Sapin <simon.sapin@exyr.org>2017-10-16 20:19:56 +0200
commite2fafd2dfc7a1b66fb224c83e15042d8f6d595c0 (patch)
tree51fa54657e9b0dddc4a0e1f6dc660c8943284335 /components/script/dom/textencoder.rs
parent115d859551323c821beb412d550c6dacbcdd5e23 (diff)
downloadservo-e2fafd2dfc7a1b66fb224c83e15042d8f6d595c0.tar.gz
servo-e2fafd2dfc7a1b66fb224c83e15042d8f6d595c0.zip
Replace NonZero<*mut JSObject> with a wrapper to enable local trait impls.
Diffstat (limited to 'components/script/dom/textencoder.rs')
-rw-r--r--components/script/dom/textencoder.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/textencoder.rs b/components/script/dom/textencoder.rs
index 78ccbfcae0b..7ca2a429525 100644
--- a/components/script/dom/textencoder.rs
+++ b/components/script/dom/textencoder.rs
@@ -2,16 +2,16 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-use core::nonzero::NonZero;
use dom::bindings::codegen::Bindings::TextEncoderBinding;
use dom::bindings::codegen::Bindings::TextEncoderBinding::TextEncoderMethods;
use dom::bindings::error::Fallible;
+use dom::bindings::nonnull::NonNullJSObjectPtr;
use dom::bindings::reflector::{Reflector, reflect_dom_object};
use dom::bindings::root::DomRoot;
use dom::bindings::str::{DOMString, USVString};
use dom::globalscope::GlobalScope;
use dom_struct::dom_struct;
-use js::jsapi::{JSContext, JSObject};
+use js::jsapi::JSContext;
use js::typedarray::{Uint8Array, CreateWith};
use std::ptr;
@@ -47,12 +47,12 @@ impl TextEncoderMethods for TextEncoder {
#[allow(unsafe_code)]
// https://encoding.spec.whatwg.org/#dom-textencoder-encode
- unsafe fn Encode(&self, cx: *mut JSContext, input: USVString) -> NonZero<*mut JSObject> {
+ unsafe fn Encode(&self, cx: *mut JSContext, input: USVString) -> NonNullJSObjectPtr {
let encoded = input.0.as_bytes();
rooted!(in(cx) let mut js_object = ptr::null_mut());
assert!(Uint8Array::create(cx, CreateWith::Slice(&encoded), js_object.handle_mut()).is_ok());
- NonZero::new_unchecked(js_object.get())
+ NonNullJSObjectPtr::new_unchecked(js_object.get())
}
}