diff options
author | Vincent Ambo <tazjin@google.com> | 2020-05-19T16·38+0100 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-05-19T16·38+0100 |
commit | b490742a511dd03afc43f5143d6d61edaeeb8091 (patch) | |
tree | 727370e8e7607a3078c2ce1cd6d717105c7d9c44 /third_party/nix/src/libstore/gc.cc | |
parent | c758de9d22506eb279c5abe61f621e5c8f61af95 (diff) |
style(3p/nix): Enforce braces around loops and conditionals r/767
This change was generated with: fd -e cc -e hh | xargs -I{} clang-tidy {} -p ~/projects/nix-build/ \ --checks='-*,readability-braces-around-statements' --fix \ -fix-errors Some manual fixes were applied because some convoluted unbraced statements couldn't be untangled by clang-tidy. This commit still includes invalid files, but I decided to clean them up in a subsequent commit so that it becomes more obvious where clang-tidy failed. Maybe this will allow for a bug-report to clang-tidy.
Diffstat (limited to 'third_party/nix/src/libstore/gc.cc')
-rw-r--r-- | third_party/nix/src/libstore/gc.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/third_party/nix/src/libstore/gc.cc b/third_party/nix/src/libstore/gc.cc index 44c118bed448..19de00143c8b 100644 --- a/third_party/nix/src/libstore/gc.cc +++ b/third_party/nix/src/libstore/gc.cc @@ -630,7 +630,9 @@ void LocalStore::tryToDelete(GCState& state, const Path& path) { ‘nix-store --delete’ doesn't have the unexpected effect of recursing into derivations and outputs. */ state.dead.insert(visited.begin(), visited.end()); - if (state.shouldDelete) deletePathRecursive(state, path); + if (state.shouldDelete) { + deletePathRecursive(state, path); + } } } @@ -704,7 +706,9 @@ void LocalStore::collectGarbage(const GCOptions& options, GCResults& results) { state.shouldDelete = options.action == GCOptions::gcDeleteDead || options.action == GCOptions::gcDeleteSpecific; - if (state.shouldDelete) deletePath(reservedPath); + if (state.shouldDelete) { + deletePath(reservedPath); + } /* Acquire the global GC root. This prevents a) New roots from being added. @@ -737,7 +741,9 @@ void LocalStore::collectGarbage(const GCOptions& options, GCResults& results) { that is not reachable from `roots' is garbage. */ if (state.shouldDelete) { - if (pathExists(trashDir)) deleteGarbage(state, trashDir); + if (pathExists(trashDir)) { + deleteGarbage(state, trashDir); + } try { createDirs(trashDir); } catch (SysError& e) { |