fix(3p/nix): Compatibility with updated SymbolTable r/795

The functions in SymbolTable have been renamed to match the Google
Style guide, and some debug-only functions have been removed.

4 files changed, 13 insertions, 13 deletions

diff --git a/third_party/nix/src/libexpr/primops/context.cc b/third_party/nix/src/libexpr/primops/context.cc
index 347b7a0a521e..7fa33bd87fb2 100644
--- a/third_party/nix/src/libexpr/primops/context.cc
+++ b/third_party/nix/src/libexpr/primops/context.cc
@@ -108,10 +108,10 @@ static void prim_getContext(EvalState& state, const Pos& pos, Value** args,
 
   state.mkAttrs(v, contextInfos.size());
 
-  auto sPath = state.symbols.create("path");
-  auto sAllOutputs = state.symbols.create("allOutputs");
+  auto sPath = state.symbols.Create("path");
+  auto sAllOutputs = state.symbols.Create("allOutputs");
   for (const auto& info : contextInfos) {
-    auto& infoVal = *state.allocAttr(v, state.symbols.create(info.first));
+    auto& infoVal = *state.allocAttr(v, state.symbols.Create(info.first));
     state.mkAttrs(infoVal, 3);
     if (info.second.path) {
       mkBool(*state.allocAttr(infoVal, sPath), true);
@@ -145,8 +145,8 @@ static void prim_appendContext(EvalState& state, const Pos& pos, Value** args,
 
   state.forceAttrs(*args[1], pos);
 
-  auto sPath = state.symbols.create("path");
-  auto sAllOutputs = state.symbols.create("allOutputs");
+  auto sPath = state.symbols.Create("path");
+  auto sAllOutputs = state.symbols.Create("allOutputs");
   for (auto& i : *args[1]->attrs) {
     if (!state.store->isStorePath(i.name))
       throw EvalError("Context key '%s' is not a store path, at %s", i.name,
diff --git a/third_party/nix/src/libexpr/primops/fetchGit.cc b/third_party/nix/src/libexpr/primops/fetchGit.cc
index 818a475f5ecd..374f075a9170 100644
--- a/third_party/nix/src/libexpr/primops/fetchGit.cc
+++ b/third_party/nix/src/libexpr/primops/fetchGit.cc
@@ -246,10 +246,10 @@ static void prim_fetchGit(EvalState& state, const Pos& pos, Value** args,
   state.mkAttrs(v, 8);
   mkString(*state.allocAttr(v, state.sOutPath), gitInfo.storePath,
            PathSet({gitInfo.storePath}));
-  mkString(*state.allocAttr(v, state.symbols.create("rev")), gitInfo.rev);
-  mkString(*state.allocAttr(v, state.symbols.create("shortRev")),
+  mkString(*state.allocAttr(v, state.symbols.Create("rev")), gitInfo.rev);
+  mkString(*state.allocAttr(v, state.symbols.Create("shortRev")),
            gitInfo.shortRev);
-  mkInt(*state.allocAttr(v, state.symbols.create("revCount")),
+  mkInt(*state.allocAttr(v, state.symbols.Create("revCount")),
         gitInfo.revCount);
   v.attrs->sort();
 
diff --git a/third_party/nix/src/libexpr/primops/fetchMercurial.cc b/third_party/nix/src/libexpr/primops/fetchMercurial.cc
index 392dbcb00837..67ecf4f498a5 100644
--- a/third_party/nix/src/libexpr/primops/fetchMercurial.cc
+++ b/third_party/nix/src/libexpr/primops/fetchMercurial.cc
@@ -220,11 +220,11 @@ static void prim_fetchMercurial(EvalState& state, const Pos& pos, Value** args,
   state.mkAttrs(v, 8);
   mkString(*state.allocAttr(v, state.sOutPath), hgInfo.storePath,
            PathSet({hgInfo.storePath}));
-  mkString(*state.allocAttr(v, state.symbols.create("branch")), hgInfo.branch);
-  mkString(*state.allocAttr(v, state.symbols.create("rev")), hgInfo.rev);
-  mkString(*state.allocAttr(v, state.symbols.create("shortRev")),
+  mkString(*state.allocAttr(v, state.symbols.Create("branch")), hgInfo.branch);
+  mkString(*state.allocAttr(v, state.symbols.Create("rev")), hgInfo.rev);
+  mkString(*state.allocAttr(v, state.symbols.Create("shortRev")),
            std::string(hgInfo.rev, 0, 12));
-  mkInt(*state.allocAttr(v, state.symbols.create("revCount")), hgInfo.revCount);
+  mkInt(*state.allocAttr(v, state.symbols.Create("revCount")), hgInfo.revCount);
   v.attrs->sort();
 
   if (state.allowedPaths)
diff --git a/third_party/nix/src/libexpr/primops/fromTOML.cc b/third_party/nix/src/libexpr/primops/fromTOML.cc
index 4b652b379af7..320b6120e746 100644
--- a/third_party/nix/src/libexpr/primops/fromTOML.cc
+++ b/third_party/nix/src/libexpr/primops/fromTOML.cc
@@ -25,7 +25,7 @@ static void prim_fromTOML(EvalState& state, const Pos& pos, Value** args,
       state.mkAttrs(v, size);
 
       for (auto& i : *t2) {
-        auto& v2 = *state.allocAttr(v, state.symbols.create(i.first));
+        auto& v2 = *state.allocAttr(v, state.symbols.Create(i.first));
 
         if (auto i2 = i.second->as_table_array()) {
           size_t size2 = i2->get().size();