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

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

10
third_party/nix/src/nix-instantiate/nix-instantiate.cc vendored
View file

@ -147,7 +147,9 @@ static int _main(int argc, char** argv) {
initPlugins();
if (evalOnly && !wantsReadWrite) settings.readOnlyMode = true;
if (evalOnly && !wantsReadWrite) {
settings.readOnlyMode = true;
}
auto store = openStore();
@ -171,8 +173,10 @@ static int _main(int argc, char** argv) {
Expr* e = state->parseStdin();
processExpr(*state, attrPaths, parseOnly, strict, autoArgs, evalOnly,
outputKind, xmlOutputSourceLocation, e);
} else if (files.empty() && !fromArgs)
files.push_back("./default.nix");
} else {
if
}
(files.empty() && !fromArgs) files.push_back("./default.nix");
for (auto& i : files) {
Expr* e = fromArgs