about summary refs log tree commit diff
path: root/third_party/nix/src/nix-instantiate/nix-instantiate.cc
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-19T17·55+0100
committerVincent Ambo <tazjin@google.com>2020-05-19T17·55+0100
commit867055133d3f487e52dd44149f76347c2c28bf10 (patch)
treec367803ad94f024b0052727a2c7a037af169169a /third_party/nix/src/nix-instantiate/nix-instantiate.cc
parentc6a31838cd7e88ebcb01422b329a499d04ab4b6b (diff)
style(3p/nix): Add braces around single-line conditionals r/771
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
Diffstat (limited to 'third_party/nix/src/nix-instantiate/nix-instantiate.cc')
-rw-r--r--third_party/nix/src/nix-instantiate/nix-instantiate.cc12
1 files changed, 9 insertions, 3 deletions
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<LocalFSStore>();
           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) {