From d331d3a0b5c497a46e2636f308234be66566c04c Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Wed, 20 May 2020 04:33:07 +0100
Subject: refactor(3p/nix): Apply clang-tidy's modernize-* fixes

This applies the modernization fixes listed here:

https://clang.llvm.org/extra/clang-tidy/checks/list.html

The 'modernize-use-trailing-return-type' fix was excluded due to my
personal preference (more specifically, I think the 'auto' keyword is
misleading in that position).
---
 .../src/nix-collect-garbage/nix-collect-garbage.cc | 42 +++++++++++-----------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'third_party/nix/src/nix-collect-garbage')

diff --git a/third_party/nix/src/nix-collect-garbage/nix-collect-garbage.cc b/third_party/nix/src/nix-collect-garbage/nix-collect-garbage.cc
index 29c68e963716..dee803ada38f 100644
--- a/third_party/nix/src/nix-collect-garbage/nix-collect-garbage.cc
+++ b/third_party/nix/src/nix-collect-garbage/nix-collect-garbage.cc
@@ -60,27 +60,27 @@ static int _main(int argc, char** argv) {
 
     GCOptions options;
 
-    parseCmdLine(
-        argc, argv, [&](Strings::iterator& arg, const Strings::iterator& end) {
-          if (*arg == "--help") {
-            showManPage("nix-collect-garbage");
-          } else if (*arg == "--version") {
-            printVersion("nix-collect-garbage");
-          } else if (*arg == "--delete-old" || *arg == "-d") {
-            removeOld = true;
-          } else if (*arg == "--delete-older-than") {
-            removeOld = true;
-            deleteOlderThan = getArg(*arg, arg, end);
-          } else if (*arg == "--dry-run") {
-            dryRun = true;
-          } else if (*arg == "--max-freed") {
-            long long maxFreed = getIntArg<long long>(*arg, arg, end, true);
-            options.maxFreed = maxFreed >= 0 ? maxFreed : 0;
-          } else {
-            return false;
-          }
-          return true;
-        });
+    parseCmdLine(argc, argv,
+                 [&](Strings::iterator& arg, const Strings::iterator& end) {
+                   if (*arg == "--help") {
+                     showManPage("nix-collect-garbage");
+                   } else if (*arg == "--version") {
+                     printVersion("nix-collect-garbage");
+                   } else if (*arg == "--delete-old" || *arg == "-d") {
+                     removeOld = true;
+                   } else if (*arg == "--delete-older-than") {
+                     removeOld = true;
+                     deleteOlderThan = getArg(*arg, arg, end);
+                   } else if (*arg == "--dry-run") {
+                     dryRun = true;
+                   } else if (*arg == "--max-freed") {
+                     auto maxFreed = getIntArg<long long>(*arg, arg, end, true);
+                     options.maxFreed = maxFreed >= 0 ? maxFreed : 0;
+                   } else {
+                     return false;
+                   }
+                   return true;
+                 });
 
     initPlugins();
 
-- 
cgit 1.4.1