From 54a2a0da486c7cc28c58d0bbcf3fddec89a0f28b Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Sun, 23 Jun 2013 22:34:05 -0700 Subject: [PATCH] =?UTF-8?q?Use=20`=5F.difference`=20instead=20of=20`=5F.wi?= =?UTF-8?q?thout.apply(=5F,=20=E2=80=A6)`=20in=20test=20and=20build=20file?= =?UTF-8?q?s.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 5646e8c3e895ea0662df81e7c77e70cdfe2c3a6d --- build.js | 22 +++++++++++----------- test/test-build.js | 6 +++--- test/test.js | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build.js b/build.js index 0d7c967a7..906eace7a 100755 --- a/build.js +++ b/build.js @@ -383,10 +383,10 @@ ]; /** List of Lo-Dash methods */ - var lodashMethods = _.without.apply(_, [allMethods, 'findWhere'].concat(privateMethods)); + var lodashMethods = _.difference(allMethods, privateMethods.concat('findWhere')); /** List of Underscore methods */ - var underscoreMethods = _.without.apply(_, [allMethods].concat(lodashOnlyMethods, privateMethods)); + var underscoreMethods = _.difference(allMethods, lodashOnlyMethods.concat(privateMethods)); /*--------------------------------------------------------------------------*/ @@ -1109,7 +1109,7 @@ result.push(varA || varB || varC); }); - return _.without.apply(_, [_.uniq(result)].concat(lodashMethods)).sort(); + return _.difference(_.uniq(result), allMethods).sort(); } /** @@ -2098,10 +2098,10 @@ var isLodashMethod = function(methodName) { if (_.contains(lodashOnlyMethods, methodName) || /^(?:assign|zipObject)$/.test(methodName)) { - var methods = _.without.apply(_, [_.union(includeMethods, plusMethods)].concat(minusMethods)); + var methods = _.difference(_.union(includeMethods, plusMethods), minusMethods); return _.contains(methods, methodName); } - methods = _.without.apply(_, [plusMethods].concat(minusMethods)); + methods = _.difference(plusMethods, minusMethods); return _.contains(methods, methodName); }; @@ -2160,9 +2160,9 @@ }); // remove categories from method names - includeMethods = _.without.apply(_, [includeMethods].concat(methodCategories)); - minusMethods = _.without.apply(_, [minusMethods].concat(methodCategories)); - plusMethods = _.without.apply(_, [plusMethods].concat(methodCategories)); + includeMethods = _.difference(includeMethods, methodCategories); + minusMethods = _.difference(minusMethods, methodCategories); + plusMethods = _.difference(plusMethods, methodCategories); /*------------------------------------------------------------------------*/ @@ -2439,10 +2439,10 @@ result = _.union(result, plusMethods); } if (minusMethods.length) { - result = _.without.apply(_, [result].concat(minusMethods, isNoDep + result = _.difference(result, isNoDep ? minusMethods - : getDependants(minusMethods) - )); + : minusMethods.concat(getDependants(minusMethods)) + ); } if (!isNoDep) { result = getDependencies(result); diff --git a/test/test-build.js b/test/test-build.js index 798e3b2bb..a27a5112b 100644 --- a/test/test-build.js +++ b/test/test-build.js @@ -322,7 +322,7 @@ var lodashMethods = allMethods.slice(); /** List of Underscore methods */ - var underscoreMethods = _.without.apply(_, [allMethods].concat(lodashOnlyMethods)); + var underscoreMethods = _.difference(allMethods, lodashOnlyMethods); /*--------------------------------------------------------------------------*/ @@ -1660,10 +1660,10 @@ methodNames = methodNames.concat(command.match(/\bplus=(\S*)/)[1].split(/, */)); } if (/\bminus=/.test(command)) { - methodNames = _.without.apply(_, [methodNames].concat(expandMethodNames(command.match(/\bminus=(\S*)/)[1].split(/, */)))); + methodNames = _.difference(methodNames, expandMethodNames(command.match(/\bminus=(\S*)/)[1].split(/, */))); } if (/\bexclude=/.test(command)) { - methodNames = _.without.apply(_, [methodNames].concat(expandMethodNames(command.match(/\bexclude=(\S*)/)[1].split(/, */)))); + methodNames = _.difference(methodNames, expandMethodNames(command.match(/\bexclude=(\S*)/)[1].split(/, */))); } // expand categories to real method names diff --git a/test/test.js b/test/test.js index 122b2034c..c43c6093e 100644 --- a/test/test.js +++ b/test/test.js @@ -3697,7 +3697,7 @@ return /^_/.test(methodName); }); - var funcs = _.without.apply(_, [allMethods].concat([ + var funcs = _.difference(allMethods, [ 'after', 'bind', 'bindAll', @@ -3713,7 +3713,7 @@ 'tap', 'throttle', 'wrap' - ])); + ]); _.each(funcs, function(methodName) { var actual = [],