From 867055133d3f487e52dd44149f76347c2c28bf10 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 19 May 2020 18:55:58 +0100 Subject: style(3p/nix): Add braces around single-line conditionals 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 --- third_party/nix/src/nix-instantiate/nix-instantiate.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'third_party/nix/src/nix-instantiate/nix-instantiate.cc') diff --git a/third_party/nix/src/nix-instantiate/nix-instantiate.cc b/third_party/nix/src/nix-instantiate/nix-instantiate.cc index 2630f5f9ebfc..20dcd7f42df8 100644 --- a/third_party/nix/src/nix-instantiate/nix-instantiate.cc +++ b/third_party/nix/src/nix-instantiate/nix-instantiate.cc @@ -49,7 +49,9 @@ void processExpr(EvalState& state, const Strings& attrPaths, bool parseOnly, else if (output == okJSON) printValueAsJSON(state, strict, vRes, std::cout, context); else { - if (strict) state.forceValueDeep(vRes); + if (strict) { + state.forceValueDeep(vRes); + } std::cout << vRes << std::endl; } } else { @@ -69,7 +71,9 @@ void processExpr(EvalState& state, const Strings& attrPaths, bool parseOnly, printGCWarning(); else { Path rootName = indirectRoot ? absPath(gcRoot) : gcRoot; - if (++rootNr > 1) rootName += "-" + std::to_string(rootNr); + if (++rootNr > 1) { + rootName += "-" + std::to_string(rootNr); + } auto store2 = state.store.dynamic_pointer_cast(); if (store2) drvPath = store2->addPermRoot(drvPath, rootName, indirectRoot); @@ -158,7 +162,9 @@ static int _main(int argc, char** argv) { Bindings& autoArgs = *myArgs.getAutoArgs(*state); - if (attrPaths.empty()) attrPaths = {""}; + if (attrPaths.empty()) { + attrPaths = {""}; + } if (findFile) { for (auto& i : files) { -- cgit 1.4.1