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, 116 insertions, 120 deletions

diff --git a/third_party/nix/src/nix/upgrade-nix.cc b/third_party/nix/src/nix/upgrade-nix.cc
index 35c44a70cf52..66230a9ddf4f 100644
--- a/third_party/nix/src/nix/upgrade-nix.cc
+++ b/third_party/nix/src/nix/upgrade-nix.cc
@@ -1,160 +1,156 @@
+#include "attr-path.hh"
 #include "command.hh"
 #include "common-args.hh"
-#include "store-api.hh"
 #include "download.hh"
 #include "eval.hh"
-#include "attr-path.hh"
 #include "names.hh"
 #include "progress-bar.hh"
+#include "store-api.hh"
 
 using namespace nix;
 
-struct CmdUpgradeNix : MixDryRun, StoreCommand
-{
-    Path profileDir;
-    std::string storePathsUrl = "https://github.com/NixOS/nixpkgs/raw/master/nixos/modules/installer/tools/nix-fallback-paths.nix";
-
-    CmdUpgradeNix()
+struct CmdUpgradeNix : MixDryRun, StoreCommand {
+  Path profileDir;
+  std::string storePathsUrl =
+      "https://github.com/NixOS/nixpkgs/raw/master/nixos/modules/installer/"
+      "tools/nix-fallback-paths.nix";
+
+  CmdUpgradeNix() {
+    mkFlag()
+        .longName("profile")
+        .shortName('p')
+        .labels({"profile-dir"})
+        .description("the Nix profile to upgrade")
+        .dest(&profileDir);
+
+    mkFlag()
+        .longName("nix-store-paths-url")
+        .labels({"url"})
+        .description(
+            "URL of the file that contains the store paths of the latest Nix "
+            "release")
+        .dest(&storePathsUrl);
+  }
+
+  std::string name() override { return "upgrade-nix"; }
+
+  std::string description() override {
+    return "upgrade Nix to the latest stable version";
+  }
+
+  Examples examples() override {
+    return {
+        Example{"To upgrade Nix to the latest stable version:",
+                "nix upgrade-nix"},
+        Example{
+            "To upgrade Nix in a specific profile:",
+            "nix upgrade-nix -p /nix/var/nix/profiles/per-user/alice/profile"},
+    };
+  }
+
+  void run(ref<Store> store) override {
+    evalSettings.pureEval = true;
+
+    if (profileDir == "") profileDir = getProfileDir(store);
+
+    printInfo("upgrading Nix in profile '%s'", profileDir);
+
+    Path storePath;
     {
-        mkFlag()
-            .longName("profile")
-            .shortName('p')
-            .labels({"profile-dir"})
-            .description("the Nix profile to upgrade")
-            .dest(&profileDir);
-
-        mkFlag()
-            .longName("nix-store-paths-url")
-            .labels({"url"})
-            .description("URL of the file that contains the store paths of the latest Nix release")
-            .dest(&storePathsUrl);
+      Activity act(*logger, lvlInfo, actUnknown, "querying latest Nix version");
+      storePath = getLatestNix(store);
     }
 
-    std::string name() override
-    {
-        return "upgrade-nix";
-    }
+    auto version = DrvName(storePathToName(storePath)).version;
 
-    std::string description() override
-    {
-        return "upgrade Nix to the latest stable version";
+    if (dryRun) {
+      stopProgressBar();
+      printError("would upgrade to version %s", version);
+      return;
     }
 
-    Examples examples() override
     {
-        return {
-            Example{
-                "To upgrade Nix to the latest stable version:",
-                "nix upgrade-nix"
-            },
-            Example{
-                "To upgrade Nix in a specific profile:",
-                "nix upgrade-nix -p /nix/var/nix/profiles/per-user/alice/profile"
-            },
-        };
+      Activity act(*logger, lvlInfo, actUnknown,
+                   fmt("downloading '%s'...", storePath));
+      store->ensurePath(storePath);
     }
 
-    void run(ref<Store> store) override
     {
-        evalSettings.pureEval = true;
-
-        if (profileDir == "")
-            profileDir = getProfileDir(store);
-
-        printInfo("upgrading Nix in profile '%s'", profileDir);
-
-        Path storePath;
-        {
-            Activity act(*logger, lvlInfo, actUnknown, "querying latest Nix version");
-            storePath = getLatestNix(store);
-        }
-
-        auto version = DrvName(storePathToName(storePath)).version;
-
-        if (dryRun) {
-            stopProgressBar();
-            printError("would upgrade to version %s", version);
-            return;
-        }
-
-        {
-            Activity act(*logger, lvlInfo, actUnknown, fmt("downloading '%s'...", storePath));
-            store->ensurePath(storePath);
-        }
-
-        {
-            Activity act(*logger, lvlInfo, actUnknown, fmt("verifying that '%s' works...", storePath));
-            auto program = storePath + "/bin/nix-env";
-            auto s = runProgram(program, false, {"--version"});
-            if (s.find("Nix") == std::string::npos)
-                throw Error("could not verify that '%s' works", program);
-        }
-
-        stopProgressBar();
+      Activity act(*logger, lvlInfo, actUnknown,
+                   fmt("verifying that '%s' works...", storePath));
+      auto program = storePath + "/bin/nix-env";
+      auto s = runProgram(program, false, {"--version"});
+      if (s.find("Nix") == std::string::npos)
+        throw Error("could not verify that '%s' works", program);
+    }
 
-        {
-            Activity act(*logger, lvlInfo, actUnknown, fmt("installing '%s' into profile '%s'...", storePath, profileDir));
-            runProgram(settings.nixBinDir + "/nix-env", false,
-                {"--profile", profileDir, "-i", storePath, "--no-sandbox"});
-        }
+    stopProgressBar();
 
-        printError(ANSI_GREEN "upgrade to version %s done" ANSI_NORMAL, version);
+    {
+      Activity act(
+          *logger, lvlInfo, actUnknown,
+          fmt("installing '%s' into profile '%s'...", storePath, profileDir));
+      runProgram(settings.nixBinDir + "/nix-env", false,
+                 {"--profile", profileDir, "-i", storePath, "--no-sandbox"});
     }
 
-    /* Return the profile in which Nix is installed. */
-    Path getProfileDir(ref<Store> store)
-    {
-        Path where;
+    printError(ANSI_GREEN "upgrade to version %s done" ANSI_NORMAL, version);
+  }
 
-        for (auto & dir : tokenizeString<Strings>(getEnv("PATH"), ":"))
-            if (pathExists(dir + "/nix-env")) {
-                where = dir;
-                break;
-            }
+  /* Return the profile in which Nix is installed. */
+  Path getProfileDir(ref<Store> store) {
+    Path where;
 
-        if (where == "")
-            throw Error("couldn't figure out how Nix is installed, so I can't upgrade it");
+    for (auto& dir : tokenizeString<Strings>(getEnv("PATH"), ":"))
+      if (pathExists(dir + "/nix-env")) {
+        where = dir;
+        break;
+      }
 
-        printInfo("found Nix in '%s'", where);
+    if (where == "")
+      throw Error(
+          "couldn't figure out how Nix is installed, so I can't upgrade it");
 
-        if (hasPrefix(where, "/run/current-system"))
-            throw Error("Nix on NixOS must be upgraded via 'nixos-rebuild'");
+    printInfo("found Nix in '%s'", where);
 
-        Path profileDir = dirOf(where);
+    if (hasPrefix(where, "/run/current-system"))
+      throw Error("Nix on NixOS must be upgraded via 'nixos-rebuild'");
 
-        // Resolve profile to /nix/var/nix/profiles/<name> link.
-        while (canonPath(profileDir).find("/profiles/") == std::string::npos && isLink(profileDir))
-            profileDir = readLink(profileDir);
+    Path profileDir = dirOf(where);
 
-        printInfo("found profile '%s'", profileDir);
+    // Resolve profile to /nix/var/nix/profiles/<name> link.
+    while (canonPath(profileDir).find("/profiles/") == std::string::npos &&
+           isLink(profileDir))
+      profileDir = readLink(profileDir);
 
-        Path userEnv = canonPath(profileDir, true);
+    printInfo("found profile '%s'", profileDir);
 
-        if (baseNameOf(where) != "bin" ||
-            !hasSuffix(userEnv, "user-environment"))
-            throw Error("directory '%s' does not appear to be part of a Nix profile", where);
+    Path userEnv = canonPath(profileDir, true);
 
-        if (!store->isValidPath(userEnv))
-            throw Error("directory '%s' is not in the Nix store", userEnv);
+    if (baseNameOf(where) != "bin" || !hasSuffix(userEnv, "user-environment"))
+      throw Error("directory '%s' does not appear to be part of a Nix profile",
+                  where);
 
-        return profileDir;
-    }
+    if (!store->isValidPath(userEnv))
+      throw Error("directory '%s' is not in the Nix store", userEnv);
 
-    /* Return the store path of the latest stable Nix. */
-    Path getLatestNix(ref<Store> store)
-    {
-        // FIXME: use nixos.org?
-        auto req = DownloadRequest(storePathsUrl);
-        auto res = getDownloader()->download(req);
+    return profileDir;
+  }
 
-        auto state = std::make_unique<EvalState>(Strings(), store);
-        auto v = state->allocValue();
-        state->eval(state->parseExprFromString(*res.data, "/no-such-path"), *v);
-        Bindings & bindings(*state->allocBindings(0));
-        auto v2 = findAlongAttrPath(*state, settings.thisSystem, bindings, *v);
+  /* Return the store path of the latest stable Nix. */
+  Path getLatestNix(ref<Store> store) {
+    // FIXME: use nixos.org?
+    auto req = DownloadRequest(storePathsUrl);
+    auto res = getDownloader()->download(req);
 
-        return state->forceString(*v2);
-    }
+    auto state = std::make_unique<EvalState>(Strings(), store);
+    auto v = state->allocValue();
+    state->eval(state->parseExprFromString(*res.data, "/no-such-path"), *v);
+    Bindings& bindings(*state->allocBindings(0));
+    auto v2 = findAlongAttrPath(*state, settings.thisSystem, bindings, *v);
+
+    return state->forceString(*v2);
+  }
 };
 
 static RegisterCommand r1(make_ref<CmdUpgradeNix>());