aboutsummaryrefslogtreecommitdiffstats
path: root/util/promise.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2018-10-26 09:23:31 +0100
committerMatthew Wild <mwild1@gmail.com>2018-10-26 09:23:31 +0100
commita738de82e24ea98b59e43d107db1e0cab9658a05 (patch)
treeb278a7e5ea0311e57b93a14d3e1c9a96a064c260 /util/promise.lua
parenteb378bd2bcf69ffc013c5294b6ab95caea1a92ef (diff)
downloadprosody-a738de82e24ea98b59e43d107db1e0cab9658a05.tar.gz
prosody-a738de82e24ea98b59e43d107db1e0cab9658a05.zip
util.promise: Remove the non-standard ability to pass a promise to reject()
Diffstat (limited to 'util/promise.lua')
-rw-r--r--util/promise.lua4
1 files changed, 1 insertions, 3 deletions
diff --git a/util/promise.lua b/util/promise.lua
index 14521c4a..a3bc59d2 100644
--- a/util/promise.lua
+++ b/util/promise.lua
@@ -65,9 +65,7 @@ local function new_resolve_functions(p)
local function _reject(e)
if resolved then return; end
resolved = true;
- if is_promise(e) then
- e:next(new_resolve_functions(p));
- elseif promise_settle(p, "rejected", next_rejected, p._pending_on_rejected, e) then
+ if promise_settle(p, "rejected", next_rejected, p._pending_on_rejected, e) then
p.reason = e;
end
end