1 files changed, 17 insertions, 19 deletions

diff --git a/lib/internal/queue.js b/lib/internal/queue.js
index a421d2e..a811080 100644
--- a/lib/internal/queue.js
+++ b/lib/internal/queue.js
@@ -27,9 +27,7 @@ export default function queue(worker, concurrency, payload) {
         }
         if (data.length === 0 && q.idle()) {
             // call drain immediately if there are no tasks
-            return setImmediate(function() {
-                q.drain();
-            });
+            return setImmediate(() => q.drain());
         }
 
         for (var i = 0, l = data.length; i < l; i++) {
@@ -47,7 +45,7 @@ export default function queue(worker, concurrency, payload) {
 
         if (!processingScheduled) {
             processingScheduled = true;
-            setImmediate(function() {
+            setImmediate(() => {
                 processingScheduled = false;
                 q.process();
             });
@@ -55,7 +53,7 @@ export default function queue(worker, concurrency, payload) {
     }
 
     function _next(tasks) {
-        return function(err){
+        return function (err, ...args) {
             numRunning -= 1;
 
             for (var i = 0, l = tasks.length; i < l; i++) {
@@ -68,7 +66,7 @@ export default function queue(worker, concurrency, payload) {
                     workersList.splice(index, 1);
                 }
 
-                task.callback.apply(task, arguments);
+                task.callback(err, ...args);
 
                 if (err != null) {
                     q.error(err, task.data);
@@ -89,8 +87,8 @@ export default function queue(worker, concurrency, payload) {
     var isProcessing = false;
     var q = {
         _tasks: new DLL(),
-        concurrency: concurrency,
-        payload: payload,
+        concurrency,
+        payload,
         saturated: noop,
         unsaturated:noop,
         buffer: concurrency / 4,
@@ -99,20 +97,20 @@ export default function queue(worker, concurrency, payload) {
         error: noop,
         started: false,
         paused: false,
-        push: function (data, callback) {
+        push (data, callback) {
             _insert(data, false, callback);
         },
-        kill: function () {
+        kill () {
             q.drain = noop;
             q._tasks.empty();
         },
-        unshift: function (data, callback) {
+        unshift (data, callback) {
             _insert(data, true, callback);
         },
-        remove: function (testFn) {
+        remove (testFn) {
             q._tasks.remove(testFn);
         },
-        process: function () {
+        process () {
             // Avoid trying to start too many processing operations. This can occur
             // when callbacks resolve synchronously (#1267).
             if (isProcessing) {
@@ -145,22 +143,22 @@ export default function queue(worker, concurrency, payload) {
             }
             isProcessing = false;
         },
-        length: function () {
+        length () {
             return q._tasks.length;
         },
-        running: function () {
+        running () {
             return numRunning;
         },
-        workersList: function () {
+        workersList () {
             return workersList;
         },
-        idle: function() {
+        idle() {
             return q._tasks.length + numRunning === 0;
         },
-        pause: function () {
+        pause () {
             q.paused = true;
         },
-        resume: function () {
+        resume () {
             if (q.paused === false) { return; }
             q.paused = false;
             setImmediate(q.process);