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

17
third_party/nix/src/libstore/store-api.cc vendored
View file

@ -1,6 +1,7 @@
#include "store-api.hh"
#include <future>
#include <utility>
#include <glog/logging.h>
@ -570,7 +571,7 @@ void Store::buildPaths(const PathSet& paths, BuildMode buildMode) {
}
}
void copyStorePath(ref<Store> srcStore, ref<Store> dstStore,
void copyStorePath(ref<Store> srcStore, const ref<Store>& dstStore,
const Path& storePath, RepairFlag repair,
CheckSigsFlag checkSigs) {
auto srcUri = srcStore->getUri();
@ -693,7 +694,7 @@ void copyPaths(ref<Store> srcStore, ref<Store> dstStore,
});
}
void copyClosure(ref<Store> srcStore, ref<Store> dstStore,
void copyClosure(const ref<Store>& srcStore, const ref<Store>& dstStore,
const PathSet& storePaths, RepairFlag repair,
CheckSigsFlag checkSigs, SubstituteFlag substitute) {
PathSet closure;
@ -824,14 +825,14 @@ void Store::addToStore(const ValidPathInfo& info, Source& narSource,
RepairFlag repair, CheckSigsFlag checkSigs,
std::shared_ptr<FSAccessor> accessor) {
addToStore(info, make_ref<std::string>(narSource.drain()), repair, checkSigs,
accessor);
std::move(accessor));
}
void Store::addToStore(const ValidPathInfo& info, const ref<std::string>& nar,
RepairFlag repair, CheckSigsFlag checkSigs,
std::shared_ptr<FSAccessor> accessor) {
StringSource source(*nar);
addToStore(info, source, repair, checkSigs, accessor);
addToStore(info, source, repair, checkSigs, std::move(accessor));
}
} // namespace nix
@ -851,7 +852,7 @@ std::pair<std::string, Store::Params> splitUriAndParams(
Store::Params params;
auto q = uri.find('?');
if (q != std::string::npos) {
for (auto s : tokenizeString<Strings>(uri.substr(q + 1), "&")) {
for (const auto& s : tokenizeString<Strings>(uri.substr(q + 1), "&")) {
auto e = s.find('=');
if (e != std::string::npos) {
auto value = s.substr(e + 1);
@ -885,7 +886,7 @@ ref<Store> openStore(const std::string& uri_,
auto params = extraParams;
params.insert(uriParams.begin(), uriParams.end());
for (auto fun : *RegisterStoreImplementation::implementations) {
for (const auto& fun : *RegisterStoreImplementation::implementations) {
auto store = fun(uri, params);
if (store) {
store->warnUnknownSettings();
@ -952,11 +953,11 @@ std::list<ref<Store>> getDefaultSubstituters() {
}
};
for (auto uri : settings.substituters.get()) {
for (const auto& uri : settings.substituters.get()) {
addStore(uri);
}
for (auto uri : settings.extraSubstituters.get()) {
for (const auto& uri : settings.extraSubstituters.get()) {
addStore(uri);
}