style(3p/nix): Reformat project in Google C++ style r/740

Reformatted with:

    fd . -e hh -e cc | xargs clang-format -i

1 files changed, 169 insertions, 174 deletions

diff --git a/third_party/nix/src/nix-instantiate/nix-instantiate.cc b/third_party/nix/src/nix-instantiate/nix-instantiate.cc
index a736caa8f056..cd1ebce97b0c 100644
--- a/third_party/nix/src/nix-instantiate/nix-instantiate.cc
+++ b/third_party/nix/src/nix-instantiate/nix-instantiate.cc
@@ -1,196 +1,191 @@
-#include "globals.hh"
-#include "shared.hh"
-#include "eval.hh"
-#include "eval-inline.hh"
-#include "get-drvs.hh"
+#include <iostream>
+#include <map>
 #include "attr-path.hh"
-#include "value-to-xml.hh"
-#include "value-to-json.hh"
-#include "util.hh"
-#include "store-api.hh"
 #include "common-eval-args.hh"
+#include "eval-inline.hh"
+#include "eval.hh"
+#include "get-drvs.hh"
+#include "globals.hh"
 #include "legacy.hh"
-
-#include <map>
-#include <iostream>
-
+#include "shared.hh"
+#include "store-api.hh"
+#include "util.hh"
+#include "value-to-json.hh"
+#include "value-to-xml.hh"
 
 using namespace nix;
 
-
 static Path gcRoot;
 static int rootNr = 0;
 static bool indirectRoot = false;
 
-
 enum OutputKind { okPlain, okXML, okJSON };
 
-
-void processExpr(EvalState & state, const Strings & attrPaths,
-    bool parseOnly, bool strict, Bindings & autoArgs,
-    bool evalOnly, OutputKind output, bool location, Expr * e)
-{
-    if (parseOnly) {
-        std::cout << format("%1%\n") % *e;
-        return;
-    }
-
-    Value vRoot;
-    state.eval(e, vRoot);
-
-    for (auto & i : attrPaths) {
-        Value & v(*findAlongAttrPath(state, i, autoArgs, vRoot));
-        state.forceValue(v);
-
-        PathSet context;
-        if (evalOnly) {
-            Value vRes;
-            if (autoArgs.empty())
-                vRes = v;
-            else
-                state.autoCallFunction(autoArgs, v, vRes);
-            if (output == okXML)
-                printValueAsXML(state, strict, location, vRes, std::cout, context);
-            else if (output == okJSON)
-                printValueAsJSON(state, strict, vRes, std::cout, context);
-            else {
-                if (strict) state.forceValueDeep(vRes);
-                std::cout << vRes << std::endl;
-            }
-        } else {
-            DrvInfos drvs;
-            getDerivations(state, v, "", autoArgs, drvs, false);
-            for (auto & i : drvs) {
-                Path drvPath = i.queryDrvPath();
-
-                /* What output do we want? */
-                string outputName = i.queryOutputName();
-                if (outputName == "")
-                    throw Error(format("derivation '%1%' lacks an 'outputName' attribute ") % drvPath);
-
-                if (gcRoot == "")
-                    printGCWarning();
-                else {
-                    Path rootName = indirectRoot ? absPath(gcRoot) : gcRoot;
-                    if (++rootNr > 1) rootName += "-" + std::to_string(rootNr);
-                    auto store2 = state.store.dynamic_pointer_cast<LocalFSStore>();
-                    if (store2)
-                        drvPath = store2->addPermRoot(drvPath, rootName, indirectRoot);
-                }
-                std::cout << format("%1%%2%\n") % drvPath % (outputName != "out" ? "!" + outputName : "");
-            }
+void processExpr(EvalState& state, const Strings& attrPaths, bool parseOnly,
+                 bool strict, Bindings& autoArgs, bool evalOnly,
+                 OutputKind output, bool location, Expr* e) {
+  if (parseOnly) {
+    std::cout << format("%1%\n") % *e;
+    return;
+  }
+
+  Value vRoot;
+  state.eval(e, vRoot);
+
+  for (auto& i : attrPaths) {
+    Value& v(*findAlongAttrPath(state, i, autoArgs, vRoot));
+    state.forceValue(v);
+
+    PathSet context;
+    if (evalOnly) {
+      Value vRes;
+      if (autoArgs.empty())
+        vRes = v;
+      else
+        state.autoCallFunction(autoArgs, v, vRes);
+      if (output == okXML)
+        printValueAsXML(state, strict, location, vRes, std::cout, context);
+      else if (output == okJSON)
+        printValueAsJSON(state, strict, vRes, std::cout, context);
+      else {
+        if (strict) state.forceValueDeep(vRes);
+        std::cout << vRes << std::endl;
+      }
+    } else {
+      DrvInfos drvs;
+      getDerivations(state, v, "", autoArgs, drvs, false);
+      for (auto& i : drvs) {
+        Path drvPath = i.queryDrvPath();
+
+        /* What output do we want? */
+        string outputName = i.queryOutputName();
+        if (outputName == "")
+          throw Error(
+              format("derivation '%1%' lacks an 'outputName' attribute ") %
+              drvPath);
+
+        if (gcRoot == "")
+          printGCWarning();
+        else {
+          Path rootName = indirectRoot ? absPath(gcRoot) : gcRoot;
+          if (++rootNr > 1) rootName += "-" + std::to_string(rootNr);
+          auto store2 = state.store.dynamic_pointer_cast<LocalFSStore>();
+          if (store2)
+            drvPath = store2->addPermRoot(drvPath, rootName, indirectRoot);
         }
+        std::cout << format("%1%%2%\n") % drvPath %
+                         (outputName != "out" ? "!" + outputName : "");
+      }
     }
+  }
 }
 
+static int _main(int argc, char** argv) {
+  {
+    Strings files;
+    bool readStdin = false;
+    bool fromArgs = false;
+    bool findFile = false;
+    bool evalOnly = false;
+    bool parseOnly = false;
+    OutputKind outputKind = okPlain;
+    bool xmlOutputSourceLocation = true;
+    bool strict = false;
+    Strings attrPaths;
+    bool wantsReadWrite = false;
+    RepairFlag repair = NoRepair;
+
+    struct MyArgs : LegacyArgs, MixEvalArgs {
+      using LegacyArgs::LegacyArgs;
+    };
+
+    MyArgs myArgs(baseNameOf(argv[0]),
+                  [&](Strings::iterator& arg, const Strings::iterator& end) {
+                    if (*arg == "--help")
+                      showManPage("nix-instantiate");
+                    else if (*arg == "--version")
+                      printVersion("nix-instantiate");
+                    else if (*arg == "-")
+                      readStdin = true;
+                    else if (*arg == "--expr" || *arg == "-E")
+                      fromArgs = true;
+                    else if (*arg == "--eval" || *arg == "--eval-only")
+                      evalOnly = true;
+                    else if (*arg == "--read-write-mode")
+                      wantsReadWrite = true;
+                    else if (*arg == "--parse" || *arg == "--parse-only")
+                      parseOnly = evalOnly = true;
+                    else if (*arg == "--find-file")
+                      findFile = true;
+                    else if (*arg == "--attr" || *arg == "-A")
+                      attrPaths.push_back(getArg(*arg, arg, end));
+                    else if (*arg == "--add-root")
+                      gcRoot = getArg(*arg, arg, end);
+                    else if (*arg == "--indirect")
+                      indirectRoot = true;
+                    else if (*arg == "--xml")
+                      outputKind = okXML;
+                    else if (*arg == "--json")
+                      outputKind = okJSON;
+                    else if (*arg == "--no-location")
+                      xmlOutputSourceLocation = false;
+                    else if (*arg == "--strict")
+                      strict = true;
+                    else if (*arg == "--repair")
+                      repair = Repair;
+                    else if (*arg == "--dry-run")
+                      settings.readOnlyMode = true;
+                    else if (*arg != "" && arg->at(0) == '-')
+                      return false;
+                    else
+                      files.push_back(*arg);
+                    return true;
+                  });
+
+    myArgs.parseCmdline(argvToStrings(argc, argv));
+
+    initPlugins();
+
+    if (evalOnly && !wantsReadWrite) settings.readOnlyMode = true;
+
+    auto store = openStore();
+
+    auto state = std::make_unique<EvalState>(myArgs.searchPath, store);
+    state->repair = repair;
+
+    Bindings& autoArgs = *myArgs.getAutoArgs(*state);
+
+    if (attrPaths.empty()) attrPaths = {""};
+
+    if (findFile) {
+      for (auto& i : files) {
+        Path p = state->findFile(i);
+        if (p == "") throw Error(format("unable to find '%1%'") % i);
+        std::cout << p << std::endl;
+      }
+      return 0;
+    }
 
-static int _main(int argc, char * * argv)
-{
-    {
-        Strings files;
-        bool readStdin = false;
-        bool fromArgs = false;
-        bool findFile = false;
-        bool evalOnly = false;
-        bool parseOnly = false;
-        OutputKind outputKind = okPlain;
-        bool xmlOutputSourceLocation = true;
-        bool strict = false;
-        Strings attrPaths;
-        bool wantsReadWrite = false;
-        RepairFlag repair = NoRepair;
-
-        struct MyArgs : LegacyArgs, MixEvalArgs
-        {
-            using LegacyArgs::LegacyArgs;
-        };
-
-        MyArgs myArgs(baseNameOf(argv[0]), [&](Strings::iterator & arg, const Strings::iterator & end) {
-            if (*arg == "--help")
-                showManPage("nix-instantiate");
-            else if (*arg == "--version")
-                printVersion("nix-instantiate");
-            else if (*arg == "-")
-                readStdin = true;
-            else if (*arg == "--expr" || *arg == "-E")
-                fromArgs = true;
-            else if (*arg == "--eval" || *arg == "--eval-only")
-                evalOnly = true;
-            else if (*arg == "--read-write-mode")
-                wantsReadWrite = true;
-            else if (*arg == "--parse" || *arg == "--parse-only")
-                parseOnly = evalOnly = true;
-            else if (*arg == "--find-file")
-                findFile = true;
-            else if (*arg == "--attr" || *arg == "-A")
-                attrPaths.push_back(getArg(*arg, arg, end));
-            else if (*arg == "--add-root")
-                gcRoot = getArg(*arg, arg, end);
-            else if (*arg == "--indirect")
-                indirectRoot = true;
-            else if (*arg == "--xml")
-                outputKind = okXML;
-            else if (*arg == "--json")
-                outputKind = okJSON;
-            else if (*arg == "--no-location")
-                xmlOutputSourceLocation = false;
-            else if (*arg == "--strict")
-                strict = true;
-            else if (*arg == "--repair")
-                repair = Repair;
-            else if (*arg == "--dry-run")
-                settings.readOnlyMode = true;
-            else if (*arg != "" && arg->at(0) == '-')
-                return false;
-            else
-                files.push_back(*arg);
-            return true;
-        });
-
-        myArgs.parseCmdline(argvToStrings(argc, argv));
-
-        initPlugins();
-
-        if (evalOnly && !wantsReadWrite)
-            settings.readOnlyMode = true;
-
-        auto store = openStore();
-
-        auto state = std::make_unique<EvalState>(myArgs.searchPath, store);
-        state->repair = repair;
-
-        Bindings & autoArgs = *myArgs.getAutoArgs(*state);
-
-        if (attrPaths.empty()) attrPaths = {""};
-
-        if (findFile) {
-            for (auto & i : files) {
-                Path p = state->findFile(i);
-                if (p == "") throw Error(format("unable to find '%1%'") % i);
-                std::cout << p << std::endl;
-            }
-            return 0;
-        }
-
-        if (readStdin) {
-            Expr * e = state->parseStdin();
-            processExpr(*state, attrPaths, parseOnly, strict, autoArgs,
-                evalOnly, outputKind, xmlOutputSourceLocation, e);
-        } else if (files.empty() && !fromArgs)
-            files.push_back("./default.nix");
-
-        for (auto & i : files) {
-            Expr * e = fromArgs
-                ? state->parseExprFromString(i, absPath("."))
-                : state->parseExprFromFile(resolveExprPath(state->checkSourcePath(lookupFileArg(*state, i))));
-            processExpr(*state, attrPaths, parseOnly, strict, autoArgs,
-                evalOnly, outputKind, xmlOutputSourceLocation, e);
-        }
+    if (readStdin) {
+      Expr* e = state->parseStdin();
+      processExpr(*state, attrPaths, parseOnly, strict, autoArgs, evalOnly,
+                  outputKind, xmlOutputSourceLocation, e);
+    } else if (files.empty() && !fromArgs)
+      files.push_back("./default.nix");
+
+    for (auto& i : files) {
+      Expr* e = fromArgs
+                    ? state->parseExprFromString(i, absPath("."))
+                    : state->parseExprFromFile(resolveExprPath(
+                          state->checkSourcePath(lookupFileArg(*state, i))));
+      processExpr(*state, attrPaths, parseOnly, strict, autoArgs, evalOnly,
+                  outputKind, xmlOutputSourceLocation, e);
+    }
 
-        state->printStats();
+    state->printStats();
 
-        return 0;
-    }
+    return 0;
+  }
 }
 
 static RegisterLegacyCommand s1("nix-instantiate", _main);