Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make Promise::reject unsafe

Browse source
This commit is contained in:
Anthony Ramine 2017-09-22 14:04:07 +02:00
parent d246c5cf20
commit d31018d444
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/script/dom/promise.rs
View file

@ -166,9 +166,9 @@ impl Promise {
rooted!(in(cx) let mut v = UndefinedValue()); rooted!(in(cx) let mut v = UndefinedValue());
unsafe { unsafe {
val.to_jsval(cx, v.handle_mut()); val.to_jsval(cx, v.handle_mut());
}
self.reject(cx, v.handle()); self.reject(cx, v.handle());
} }
}
#[allow(unsafe_code)] #[allow(unsafe_code)]
pub fn reject_error(&self, error: Error) { pub fn reject_error(&self, error: Error) {
@ -177,20 +177,16 @@ impl Promise {
rooted!(in(cx) let mut v = UndefinedValue()); rooted!(in(cx) let mut v = UndefinedValue());
unsafe { unsafe {
error.to_jsval(cx, &self.global(), v.handle_mut()); error.to_jsval(cx, &self.global(), v.handle_mut());
}
self.reject(cx, v.handle()); self.reject(cx, v.handle());
} }
}
#[allow(unrooted_must_root, unsafe_code)] #[allow(unrooted_must_root, unsafe_code)]
pub fn reject(&self, pub unsafe fn reject(&self, cx: *mut JSContext, value: HandleValue) {
cx: *mut JSContext,
value: HandleValue) {
unsafe {
if !RejectPromise(cx, self.promise_obj(), value) { if !RejectPromise(cx, self.promise_obj(), value) {
JS_ClearPendingException(cx); JS_ClearPendingException(cx);
} }
} }
}
#[allow(unrooted_must_root, unsafe_code)] #[allow(unrooted_must_root, unsafe_code)]
pub fn then(&self, pub fn then(&self,