refactor(3p/nix/libutil): Replace string2Int & trim functions r/843

Replaces these functions with corresponding functions from Abseil,
namely absl::StripAsciiWhitespace and absl::SimpleAtoi.

In the course of doing this some minor things I encountered along the
way were also refactored.

This also changes the signatures of the various custom readFile
functions to use absl::string_view types.

1 files changed, 2 insertions, 1 deletions

diff --git a/third_party/nix/src/libmain/shared.hh b/third_party/nix/src/libmain/shared.hh
index edd0a5159a..60d7918931 100644
--- a/third_party/nix/src/libmain/shared.hh
+++ b/third_party/nix/src/libmain/shared.hh
@@ -2,6 +2,7 @@
 
 #include <locale>
 
+#include <absl/strings/numbers.h>
 #include <signal.h>
 
 #include "args.hh"
@@ -78,7 +79,7 @@ N getIntArg(const std::string& opt, Strings::iterator& i,
     }
   }
   N n;
-  if (!string2Int(s, n))
+  if (!absl::SimpleAtoi(s, &n))
     throw UsageError(format("'%1%' requires an integer argument") % opt);
   return n * multiplier;
 }