style(3p/nix): Enforce braces around loops and conditionals

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.
This commit is contained in:
Vincent Ambo 2020-05-19 17:38:04 +01:00
parent c758de9d22
commit b490742a51
44 changed files with 661 additions and 298 deletions

View file

@ -59,16 +59,18 @@ N getIntArg(const string& opt, Strings::iterator& i,
if (allowUnit && !s.empty()) {
char u = std::toupper(*s.rbegin());
if (std::isalpha(u)) {
if (u == 'K')
if (u == 'K') {
multiplier = 1ULL << 10;
else if (u == 'M')
} else if (u == 'M') {
multiplier = 1ULL << 20;
else if (u == 'G')
} else if (u == 'G') {
multiplier = 1ULL << 30;
else if (u == 'T')
} else if (u == 'T') {
multiplier = 1ULL << 40;
else
throw UsageError(format("invalid unit specifier '%1%'") % u);
} else {
throw
}
UsageError(format("invalid unit specifier '%1%'") % u);
s.resize(s.size() - 1);
}
}