renamed doParallelOf functions back to doParallel

1 files changed, 16 insertions, 16 deletions

diff --git a/lib/async.js b/lib/async.js
index 342f838..7c6c2c9 100644
--- a/lib/async.js
+++ b/lib/async.js
@@ -350,17 +350,17 @@
     }
 
 
-    function doParallelOf(fn) {
+    function doParallel(fn) {
         return function (obj, iterator, callback) {
             return fn(async.eachOf, obj, iterator, callback);
         };
     }
-    function doParallelLimitOf(limit, fn) {
+    function doParallelLimit(limit, fn) {
         return function (obj, iterator, callback) {
             return fn(_eachOfLimit(limit), obj, iterator, callback);
         };
     }
-    function doSeriesOf(fn) {
+    function doSeries(fn) {
         return function (obj, iterator, callback) {
             return fn(async.eachOfSeries, obj, iterator, callback);
         };
@@ -379,14 +379,14 @@
         });
     }
 
-    async.map = doParallelOf(_asyncMap);
-    async.mapSeries = doSeriesOf(_asyncMap);
+    async.map = doParallel(_asyncMap);
+    async.mapSeries = doSeries(_asyncMap);
     async.mapLimit = function (arr, limit, iterator, callback) {
         return _mapLimit(limit)(arr, iterator, callback);
     };
 
     function _mapLimit(limit) {
-        return doParallelLimitOf(limit, _asyncMap);
+        return doParallelLimit(limit, _asyncMap);
     }
 
     // reduce only has a series version, as doing reduce in parallel won't
@@ -434,10 +434,10 @@
     }
 
     async.select =
-    async.filter = doParallelOf(_filter);
+    async.filter = doParallel(_filter);
 
     async.selectSeries =
-    async.filterSeries = doSeriesOf(_filter);
+    async.filterSeries = doSeries(_filter);
 
     function _reject(eachfn, arr, iterator, callback) {
         var results = [];
@@ -459,8 +459,8 @@
             }));
         });
     }
-    async.reject = doParallelOf(_reject);
-    async.rejectSeries = doSeriesOf(_reject);
+    async.reject = doParallel(_reject);
+    async.rejectSeries = doSeries(_reject);
 
     function _detect(eachfn, arr, iterator, main_callback) {
         eachfn(arr, function (x, index, callback) {
@@ -477,12 +477,12 @@
             main_callback();
         });
     }
-    async.detect = doParallelOf(_detect);
-    async.detectSeries = doSeriesOf(_detect);
+    async.detect = doParallel(_detect);
+    async.detectSeries = doSeries(_detect);
 
     async.any =
     async.some = function (arr, iterator, main_callback) {
-        async.each(arr, function (x, callback) {
+        async.eachOf(arr, function (x, _, callback) {
             iterator(x, function (v) {
                 if (v) {
                     main_callback(true);
@@ -497,7 +497,7 @@
 
     async.all =
     async.every = function (arr, iterator, main_callback) {
-        async.each(arr, function (x, callback) {
+        async.eachOf(arr, function (x, _, callback) {
             iterator(x, function (v) {
                 if (!v) {
                     main_callback(false);
@@ -806,8 +806,8 @@
             callback(err, result);
         });
     }
-    async.concat = doParallelOf(_concat);
-    async.concatSeries = doSeriesOf(_concat);
+    async.concat = doParallel(_concat);
+    async.concatSeries = doSeries(_concat);
 
     async.whilst = function (test, iterator, callback) {
         if (test()) {