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

16
third_party/nix/src/build-remote/build-remote.cc vendored
View file

@ -40,7 +40,9 @@ static AutoCloseFD openSlotLock(const Machine& m, unsigned long long slot) {
static bool allSupportedLocally(const std::set<std::string>& requiredFeatures) {
for (auto& feature : requiredFeatures)
if (!settings.systemFeatures.get().count(feature)) return false;
if (!settings.systemFeatures.get().count(feature)) {
return false;
}
return true;
}
@ -50,7 +52,9 @@ static int _main(int argc, char** argv) {
unsetenv("DISPLAY");
unsetenv("SSH_ASKPASS");
if (argc != 2) throw UsageError("called without required arguments");
if (argc != 2) {
throw UsageError("called without required arguments");
}
FdSource source(STDIN_FILENO);
@ -88,7 +92,9 @@ static int _main(int argc, char** argv) {
while (true) {
try {
auto s = readString(source);
if (s != "try") return 0;
if (s != "try") {
return 0;
}
} catch (EndOfFile&) {
return 0;
}
@ -254,7 +260,9 @@ static int _main(int argc, char** argv) {
PathSet missing;
for (auto& path : outputs)
if (!store->isValidPath(path)) missing.insert(path);
if (!store->isValidPath(path)) {
missing.insert(path);
}
if (!missing.empty()) {
DLOG(INFO) << "copying outputs from '" << storeUri << "'";