From d31018d444626980680bcbd807b89e0163d111ed Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Fri, 22 Sep 2017 14:04:07 +0200
Subject: [PATCH] Make Promise::reject unsafe

---
 components/script/dom/promise.rs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/components/script/dom/promise.rs b/components/script/dom/promise.rs
index 5c3b597839e..c72feeb1146 100644
--- a/components/script/dom/promise.rs
+++ b/components/script/dom/promise.rs
@@ -166,8 +166,8 @@ impl Promise {
         rooted!(in(cx) let mut v = UndefinedValue());
         unsafe {
             val.to_jsval(cx, v.handle_mut());
+            self.reject(cx, v.handle());
         }
-        self.reject(cx, v.handle());
     }
 
     #[allow(unsafe_code)]
@@ -177,18 +177,14 @@ impl Promise {
         rooted!(in(cx) let mut v = UndefinedValue());
         unsafe {
             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)]
-    pub fn reject(&self,
-                        cx: *mut JSContext,
-                        value: HandleValue) {
-        unsafe {
-            if !RejectPromise(cx, self.promise_obj(), value) {
-                JS_ClearPendingException(cx);
-            }
+    pub unsafe fn reject(&self, cx: *mut JSContext, value: HandleValue) {
+        if !RejectPromise(cx, self.promise_obj(), value) {
+            JS_ClearPendingException(cx);
         }
     }