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

style(3p/nix): Add braces around single-line for-loops

Browse source 
These were not caught by the previous clang-tidy invocation, but were
instead sorted out using amber[0] as such:

    ambr --regex 'for (\(.+\))\s([a-z].*;)' 'for $1 { $2 }'

[0]: https://github.com/dalance/amber
This commit is contained in:
Vincent Ambo 2020-05-19 19:04:08 +01:00
parent 867055133d
commit 1841d93ccb
45 changed files with 426 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

12
third_party/nix/src/libstore/gc.cc vendored
View file

@ -615,7 +615,9 @@ bool LocalStore::canReachRoot(GCState& state, PathSet& visited,
are derivers of this path that are not garbage. */
if (state.gcKeepOutputs) {
PathSet derivers = queryValidDerivers(path);
for (auto& i : derivers) incoming.insert(i);
for (auto& i : derivers) {
incoming.insert(i);
}
}
for (auto& i : incoming)
@ -775,7 +777,9 @@ void LocalStore::collectGarbage(const GCOptions& options, GCResults& results) {
FDs fds;
Roots tempRoots;
findTempRoots(fds, tempRoots, true);
for (auto& root : tempRoots) state.tempRoots.insert(root.first);
for (auto& root : tempRoots) {
state.tempRoots.insert(root.first);
}
state.roots.insert(state.tempRoots.begin(), state.tempRoots.end());
/* After this point the set of roots or temporary roots cannot
@ -852,7 +856,9 @@ void LocalStore::collectGarbage(const GCOptions& options, GCResults& results) {
std::mt19937 gen(1);
std::shuffle(entries_.begin(), entries_.end(), gen);
for (auto& i : entries_) tryToDelete(state, i);
for (auto& i : entries_) {
tryToDelete(state, i);
}
} catch (GCLimitReached& e) {
}