fix(3p/nix): apply all clang-tidy fixes r/1495

Change-Id: I265e763393422ee1881653527c91024458060825
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1432
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>

1 files changed, 12 insertions, 6 deletions

diff --git a/third_party/nix/src/libstore/builtins/fetchurl.cc b/third_party/nix/src/libstore/builtins/fetchurl.cc
index 867a120e8d4a..f7857b543d55 100644
--- a/third_party/nix/src/libstore/builtins/fetchurl.cc
+++ b/third_party/nix/src/libstore/builtins/fetchurl.cc
@@ -20,8 +20,9 @@ void builtinFetchurl(const BasicDerivation& drv, const std::string& netrcData) {
 
   auto getAttr = [&](const std::string& name) {
     auto i = drv.env.find(name);
-    if (i == drv.env.end())
+    if (i == drv.env.end()) {
       throw Error(format("attribute '%s' missing") % name);
+    }
     return i->second;
   };
 
@@ -47,21 +48,24 @@ void builtinFetchurl(const BasicDerivation& drv, const std::string& netrcData) {
       decompressor->finish();
     });
 
-    if (unpack)
+    if (unpack) {
       restorePath(storePath, *source);
-    else
+    } else {
       writeFile(storePath, *source);
+    }
 
     auto executable = drv.env.find("executable");
     if (executable != drv.env.end() && executable->second == "1") {
-      if (chmod(storePath.c_str(), 0755) == -1)
+      if (chmod(storePath.c_str(), 0755) == -1) {
         throw SysError(format("making '%1%' executable") % storePath);
+      }
     }
   };
 
   /* Try the hashed mirrors first. */
-  if (getAttr("outputHashMode") == "flat")
-    for (auto hashedMirror : settings.hashedMirrors.get()) try {
+  if (getAttr("outputHashMode") == "flat") {
+    for (auto hashedMirror : settings.hashedMirrors.get()) {
+      try {
         if (!absl::EndsWith(hashedMirror, "/")) {
           hashedMirror += '/';
         }
@@ -73,6 +77,8 @@ void builtinFetchurl(const BasicDerivation& drv, const std::string& netrcData) {
       } catch (Error& e) {
         LOG(ERROR) << e.what();
       }
+    }
+  }
 
   /* Otherwise try the specified URL. */
   fetch(mainUrl);