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

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

Browse source 
This applies the performance fixes listed here:

https://clang.llvm.org/extra/clang-tidy/checks/list.html
This commit is contained in:
Vincent Ambo 2020-05-20 22:58:43 +01:00
parent 689ef502f5
commit 43677021e3
60 changed files with 189 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

2
third_party/nix/src/libmain/common-args.cc vendored
View file

@ -26,7 +26,7 @@ MixCommonArgs::MixCommonArgs(const string& programName)
.shortName('j')
.label("jobs")
.description("maximum number of parallel builds")
.handler([=](std::string s) { settings.set("max-jobs", s); });
.handler([=](const std::string& s) { settings.set("max-jobs", s); });
std::string cat = "config";
globalConfig.convertToArgs(*this, cat);

12
third_party/nix/src/libmain/shared.cc vendored
View file

@ -36,7 +36,7 @@ void printGCWarning() {
}
}
void printMissing(ref<Store> store, const PathSet& paths) {
void printMissing(const ref<Store>& store, const PathSet& paths) {
unsigned long long downloadSize;
unsigned long long narSize;
PathSet willBuild;
@ -48,7 +48,7 @@ void printMissing(ref<Store> store, const PathSet& paths) {
narSize);
}
void printMissing(ref<Store> store, const PathSet& willBuild,
void printMissing(const ref<Store>& store, const PathSet& willBuild,
const PathSet& willSubstitute, const PathSet& unknown,
unsigned long long downloadSize, unsigned long long narSize) {
if (!willBuild.empty()) {
@ -260,14 +260,15 @@ void parseCmdLine(
int argc, char** argv,
std::function<bool(Strings::iterator& arg, const Strings::iterator& end)>
parseArg) {
parseCmdLine(baseNameOf(argv[0]), argvToStrings(argc, argv), parseArg);
parseCmdLine(baseNameOf(argv[0]), argvToStrings(argc, argv),
std::move(parseArg));
}
void parseCmdLine(
const string& programName, const Strings& args,
std::function<bool(Strings::iterator& arg, const Strings::iterator& end)>
parseArg) {
LegacyArgs(programName, parseArg).parseCmdline(args);
LegacyArgs(programName, std::move(parseArg)).parseCmdline(args);
}
void printVersion(const string& programName) {
@ -298,7 +299,8 @@ void showManPage(const string& name) {
throw SysError(format("command 'man %1%' failed") % name.c_str());
}
int handleExceptions(const string& programName, std::function<void()> fun) {
int handleExceptions(const string& programName,
const std::function<void()>& fun) {
ReceiveInterrupts receiveInterrupts; // FIXME: need better place for this
string error = ANSI_RED "error:" ANSI_NORMAL " ";

7
third_party/nix/src/libmain/shared.hh vendored
View file

@ -18,7 +18,8 @@ class Exit : public std::exception {
virtual ~Exit();
};
int handleExceptions(const string& programName, std::function<void()> fun);
int handleExceptions(const string& programName,
const std::function<void()>& fun);
/* Don't forget to call initPlugins() after settings are initialized! */
void initNix();
@ -40,9 +41,9 @@ void printGCWarning();
class Store;
void printMissing(ref<Store> store, const PathSet& paths);
void printMissing(const ref<Store>& store, const PathSet& paths);
void printMissing(ref<Store> store, const PathSet& willBuild,
void printMissing(const ref<Store>& store, const PathSet& willBuild,
const PathSet& willSubstitute, const PathSet& unknown,
unsigned long long downloadSize, unsigned long long narSize);