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. --- spec/util_promise_spec.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/util_promise_spec.lua') diff --git a/spec/util_promise_spec.lua b/spec/util_promise_spec.lua index f64702bf..307c094a 100644 --- a/spec/util_promise_spec.lua +++ b/spec/util_promise_spec.lua @@ -498,10 +498,10 @@ describe("util.promise", function () local res1, res2; local p1, p2 = promise.new(function (resolve) r1 = resolve end), promise.new(function (resolve) r2 = resolve end); - local p = promise.join(p1, p2, function (_res1, _res2) + local p = promise.join(function (_res1, _res2) res1, res2 = _res1, _res2; return promise.resolve("works"); - end); + end, p1, p2); local result; local cb = spy.new(function (v) -- cgit v1.2.3