Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-01-31 07:17:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use _.difference instead of _.without.apply(_, …) in test and build files.

Browse Source 
Former-commit-id: 5646e8c3e895ea0662df81e7c77e70cdfe2c3a6d
This commit is contained in:
John-David Dalton
2013-06-23 22:34:05 -07:00
parent e209fedb27
commit 54a2a0da48
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
build.js
View File

@@ -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);

6
test/test-build.js
View File

@@ -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

4
test/test.js
View File

@@ -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 = [],