refactor(3p/nix/libexpr): Use std::string as qualified type r/797

Replaces most uses of `string` with `std::string`.

This came up because I removed the "types.hh" import from
"symbol-table.hh", which percolated through a bunch of files where
`string` was suddenly no longer defined ... *sigh*

1 files changed, 2 insertions, 2 deletions

diff --git a/third_party/nix/src/libexpr/nixexpr.cc b/third_party/nix/src/libexpr/nixexpr.cc
index d7b1a0fdd5..49b4a7ea41 100644
--- a/third_party/nix/src/libexpr/nixexpr.cc
+++ b/third_party/nix/src/libexpr/nixexpr.cc
@@ -14,7 +14,7 @@ std::ostream& operator<<(std::ostream& str, const Expr& e) {
   return str;
 }
 
-static void showString(std::ostream& str, const string& s) {
+static void showString(std::ostream& str, const std::string& s) {
   str << '"';
   for (auto c : (string)s) {
     if (c == '"' || c == '\\' || c == '$') {
@@ -32,7 +32,7 @@ static void showString(std::ostream& str, const string& s) {
   str << '"';
 }
 
-static void showId(std::ostream& str, const string& s) {
+static void showId(std::ostream& str, const std::string& s) {
   if (s.empty()) {
     str << "\"\"";
   } else if (s == "if") {  // FIXME: handle other keywords