maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(3p/nix): Apply clang-tidy's modernize-* fixes

Browse source 
This applies the modernization fixes listed here:

https://clang.llvm.org/extra/clang-tidy/checks/list.html

The 'modernize-use-trailing-return-type' fix was excluded due to my
personal preference (more specifically, I think the 'auto' keyword is
misleading in that position).
This commit is contained in:
Vincent Ambo 2020-05-20 04:33:07 +01:00
parent fed31b2c9b
commit d331d3a0b5
59 changed files with 349 additions and 321 deletions
Download patch file Download diff file Expand all files Collapse all files

42
third_party/nix/src/nix-collect-garbage/nix-collect-garbage.cc vendored
View file

@ -60,27 +60,27 @@ static int _main(int argc, char** argv) {
GCOptions options;
parseCmdLine(
argc, argv, [&](Strings::iterator& arg, const Strings::iterator& end) {
if (*arg == "--help") {
showManPage("nix-collect-garbage");
} else if (*arg == "--version") {
printVersion("nix-collect-garbage");
} else if (*arg == "--delete-old" || *arg == "-d") {
removeOld = true;
} else if (*arg == "--delete-older-than") {
removeOld = true;
deleteOlderThan = getArg(*arg, arg, end);
} else if (*arg == "--dry-run") {
dryRun = true;
} else if (*arg == "--max-freed") {
long long maxFreed = getIntArg<long long>(*arg, arg, end, true);
options.maxFreed = maxFreed >= 0 ? maxFreed : 0;
} else {
return false;
}
return true;
});
parseCmdLine(argc, argv,
[&](Strings::iterator& arg, const Strings::iterator& end) {
if (*arg == "--help") {
showManPage("nix-collect-garbage");
} else if (*arg == "--version") {
printVersion("nix-collect-garbage");
} else if (*arg == "--delete-old" || *arg == "-d") {
removeOld = true;
} else if (*arg == "--delete-older-than") {
removeOld = true;
deleteOlderThan = getArg(*arg, arg, end);
} else if (*arg == "--dry-run") {
dryRun = true;
} else if (*arg == "--max-freed") {
auto maxFreed = getIntArg<long long>(*arg, arg, end, true);
options.maxFreed = maxFreed >= 0 ? maxFreed : 0;
} else {
return false;
}
return true;
});
initPlugins();