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

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

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

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

[0]: https://github.com/dalance/amber
This commit is contained in:
Vincent Ambo 2020-05-19 18:55:58 +01:00
parent c6a31838cd
commit 867055133d
97 changed files with 2223 additions and 753 deletions
Download patch file Download diff file Expand all files Collapse all files

12
third_party/nix/src/libexpr/primops/fetchGit.cc vendored
View file

@ -37,7 +37,9 @@ GitInfo exportGit(ref<Store> store, const std::string& uri,
runProgram("git", true,
{"-C", uri, "diff-index", "--quiet", "HEAD", "--"});
} catch (ExecError& e) {
if (!WIFEXITED(e.status) || WEXITSTATUS(e.status) != 1) throw;
if (!WIFEXITED(e.status) || WEXITSTATUS(e.status) != 1) {
throw;
}
clean = false;
}
@ -78,7 +80,9 @@ GitInfo exportGit(ref<Store> store, const std::string& uri,
ref = "HEAD"s;
}
if (!ref) ref = "HEAD"s;
if (!ref) {
ref = "HEAD"s;
}
if (rev != "" && !std::regex_match(rev, revRegex))
throw Error("invalid Git revision '%s'", rev);
@ -166,7 +170,9 @@ GitInfo exportGit(ref<Store> store, const std::string& uri,
}
} catch (SysError& e) {
if (e.errNo != ENOENT) throw;
if (e.errNo != ENOENT) {
throw;
}
}
// FIXME: should pipe this, or find some better way to extract a