aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/promise.rs
diff options
context:
space:
mode:
authorJosh Matthews <josh@joshmatthews.net>2016-09-22 15:58:37 -0400
committerJosh Matthews <josh@joshmatthews.net>2016-09-22 16:21:23 -0400
commite9c0606454ed50ef7f8aa0858aa211a146aebfcb (patch)
treef52522fdce8d90e9e60a5a48744551f41c5b63a1 /components/script/dom/promise.rs
parent54d2060eae2c07d7d888a4a90c4bfe0c34382ed1 (diff)
downloadservo-e9c0606454ed50ef7f8aa0858aa211a146aebfcb.tar.gz
servo-e9c0606454ed50ef7f8aa0858aa211a146aebfcb.zip
Remove maybe_ prefix from Promise methods.
Diffstat (limited to 'components/script/dom/promise.rs')
-rw-r--r--components/script/dom/promise.rs20
1 files changed, 9 insertions, 11 deletions
diff --git a/components/script/dom/promise.rs b/components/script/dom/promise.rs
index 295a73f43a1..5fd1ef6f85e 100644
--- a/components/script/dom/promise.rs
+++ b/components/script/dom/promise.rs
@@ -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 {