mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Remove maybe_ prefix from Promise methods.
This commit is contained in:
parent
54d2060eae
commit
e9c0606454
2 changed files with 15 additions and 17 deletions
|
@ -136,18 +136,16 @@ impl Promise {
|
|||
}
|
||||
|
||||
#[allow(unsafe_code)]
|
||||
pub fn maybe_resolve_native<T>(&self, cx: *mut JSContext, val: &T) where T: ToJSValConvertible {
|
||||
pub fn resolve_native<T>(&self, cx: *mut JSContext, val: &T) where T: ToJSValConvertible {
|
||||
rooted!(in(cx) let mut v = UndefinedValue());
|
||||
unsafe {
|
||||
val.to_jsval(cx, v.handle_mut());
|
||||
}
|
||||
self.maybe_resolve(cx, v.handle());
|
||||
self.resolve(cx, v.handle());
|
||||
}
|
||||
|
||||
#[allow(unrooted_must_root, unsafe_code)]
|
||||
pub fn maybe_resolve(&self,
|
||||
cx: *mut JSContext,
|
||||
value: HandleValue) {
|
||||
pub fn resolve(&self, cx: *mut JSContext, value: HandleValue) {
|
||||
unsafe {
|
||||
if !ResolvePromise(cx, self.promise_obj(), value) {
|
||||
JS_ClearPendingException(cx);
|
||||
|
@ -156,25 +154,25 @@ impl Promise {
|
|||
}
|
||||
|
||||
#[allow(unsafe_code)]
|
||||
pub fn maybe_reject_native<T>(&self, cx: *mut JSContext, val: &T) where T: ToJSValConvertible {
|
||||
pub fn reject_native<T>(&self, cx: *mut JSContext, val: &T) where T: ToJSValConvertible {
|
||||
rooted!(in(cx) let mut v = UndefinedValue());
|
||||
unsafe {
|
||||
val.to_jsval(cx, v.handle_mut());
|
||||
}
|
||||
self.maybe_reject(cx, v.handle());
|
||||
self.reject(cx, v.handle());
|
||||
}
|
||||
|
||||
#[allow(unsafe_code)]
|
||||
pub fn maybe_reject_error(&self, cx: *mut JSContext, error: Error) {
|
||||
pub fn reject_error(&self, cx: *mut JSContext, error: Error) {
|
||||
rooted!(in(cx) let mut v = UndefinedValue());
|
||||
unsafe {
|
||||
error.maybe_to_jsval(cx, self.global().r(), v.handle_mut());
|
||||
error.to_jsval(cx, self.global().r(), v.handle_mut());
|
||||
}
|
||||
self.maybe_reject(cx, v.handle());
|
||||
self.reject(cx, v.handle());
|
||||
}
|
||||
|
||||
#[allow(unrooted_must_root, unsafe_code)]
|
||||
pub fn maybe_reject(&self,
|
||||
pub fn reject(&self,
|
||||
cx: *mut JSContext,
|
||||
value: HandleValue) {
|
||||
unsafe {
|
||||
|
|
|
@ -664,15 +664,15 @@ impl TestBindingMethods for TestBinding {
|
|||
}
|
||||
|
||||
fn PromiseResolveNative(&self, cx: *mut JSContext, p: &Promise, v: HandleValue) {
|
||||
p.maybe_resolve(cx, v);
|
||||
p.resolve(cx, v);
|
||||
}
|
||||
|
||||
fn PromiseRejectNative(&self, cx: *mut JSContext, p: &Promise, v: HandleValue) {
|
||||
p.maybe_reject(cx, v);
|
||||
p.reject(cx, v);
|
||||
}
|
||||
|
||||
fn PromiseRejectWithTypeError(&self, p: &Promise, s: USVString) {
|
||||
p.maybe_reject_error(self.global().r().get_cx(), Error::Type(s.0));
|
||||
p.reject_error(self.global().r().get_cx(), Error::Type(s.0));
|
||||
}
|
||||
|
||||
#[allow(unrooted_must_root)]
|
||||
|
@ -692,8 +692,8 @@ impl TestBindingMethods for TestBinding {
|
|||
reject: Option<Rc<SimpleCallback>>) -> Rc<Promise> {
|
||||
let global = self.global();
|
||||
let handler = PromiseNativeHandler::new(global.r(),
|
||||
resolve.map(|r| SimpleHandler::new(r)),
|
||||
reject.map(|r| SimpleHandler::new(r)));
|
||||
resolve.map(SimpleHandler::new),
|
||||
reject.map(SimpleHandler::new));
|
||||
let p = Promise::new(global.r());
|
||||
p.append_native_handler(&handler);
|
||||
return p;
|
||||
|
@ -788,6 +788,6 @@ impl TestBindingCallback {
|
|||
let p = self.promise.root();
|
||||
let cx = p.global().r().get_cx();
|
||||
let _ac = JSAutoCompartment::new(cx, p.reflector().get_jsobject().get());
|
||||
p.maybe_resolve_native(cx, &self.value);
|
||||
p.resolve_native(cx, &self.value);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue