From d1ccd87d551b9f10631eff3632801327aef0c09b Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 25 Mar 2021 15:08:22 +0000 Subject: util.promise: Switch order of parameters to join() This saves awkward fiddlery with varargs and also echoes the signature of pcall/xpcall. --- util/promise.lua | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'util/promise.lua') diff --git a/util/promise.lua b/util/promise.lua index 89bd1f26..ea30898c 100644 --- a/util/promise.lua +++ b/util/promise.lua @@ -146,12 +146,10 @@ local function all_settled(promises) end); end -local function join(...) +local function join(handler, ...) local promises, n = { ... }, select("#", ...); - local handler = promises[n]; - promises[n] = nil; return all(promises):next(function (results) - return handler(unpack(results, 1, n - 1)); + return handler(unpack(results, 1, n)); end); end -- cgit v1.2.3