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).
---
 third_party/nix/src/nix/repl.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'third_party/nix/src/nix/repl.cc')

diff --git a/third_party/nix/src/nix/repl.cc b/third_party/nix/src/nix/repl.cc
index 80921f77dc..9567ad4315 100644
--- a/third_party/nix/src/nix/repl.cc
+++ b/third_party/nix/src/nix/repl.cc
@@ -1,10 +1,10 @@
 #include <climits>
+#include <csetjmp>
 #include <cstdlib>
 #include <cstring>
 #include <iostream>
 
 #include <glog/logging.h>
-#include <setjmp.h>
 
 #ifdef READLINE
 #include <readline/history.h>
@@ -73,7 +73,7 @@ struct NixRepl {
   Expr* parseString(string s);
   void evalString(string s, Value& v);
 
-  typedef set<Value*> ValuesSeen;
+  using ValuesSeen = set<Value*>;
   std::ostream& printValue(std::ostream& str, Value& v, unsigned int maxDepth);
   std::ostream& printValue(std::ostream& str, Value& v, unsigned int maxDepth,
                            ValuesSeen& seen);
@@ -306,7 +306,7 @@ bool NixRepl::getLine(string& input, const std::string& prompt) {
       throw SysError("restoring signals");
     }
 
-    if (sigaction(SIGINT, &old, 0)) {
+    if (sigaction(SIGINT, &old, nullptr)) {
       throw SysError("restoring handler for SIGINT");
     }
   };
@@ -358,7 +358,7 @@ StringSet NixRepl::completePrefix(string prefix) {
     }
   } else if ((dot = cur.rfind('.')) == string::npos) {
     /* This is a variable name; look it up in the current scope. */
-    StringSet::iterator i = varNames.lower_bound(cur);
+    auto i = varNames.lower_bound(cur);
     while (i != varNames.end()) {
       if (string(*i, 0, cur.size()) != cur) {
         break;
-- 
cgit 1.4.1