From 32993350d03ec9a566ae91e5c279510282e15d17 Mon Sep 17 00:00:00 2001 From: Alexander Early Date: Mon, 7 Mar 2016 23:24:15 -0800 Subject: clean up code, use ES6 --- lib/waterfall.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/waterfall.js b/lib/waterfall.js index e25f629..a31b3b4 100644 --- a/lib/waterfall.js +++ b/lib/waterfall.js @@ -15,21 +15,20 @@ export default function(tasks, cb) { function nextTask(args) { if (taskIndex === tasks.length) { - return cb.apply(null, [null].concat(args)); + return cb(null, ...args); } - var task = tasks[taskIndex]; - taskIndex++; var taskCallback = onlyOnce(rest(function(err, args) { if (err) { - return cb.apply(null, [err].concat(args)); + return cb(err, ...args); } nextTask(args); })); args.push(taskCallback); - task.apply(null, args); + var task = tasks[taskIndex++]; + task(...args); } nextTask([]); -- cgit v1.2.1