From cb0185971865ccfd8fd6c6b332bbd91039fca1dc Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 25 Jan 2021 15:18:52 -0500
Subject: [PATCH] hydra-evaluator: JobsetName -> JobsetIdentity

---
 src/hydra-evaluator/hydra-evaluator.cc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/hydra-evaluator/hydra-evaluator.cc b/src/hydra-evaluator/hydra-evaluator.cc
index f3397a7c..b3dec4ac 100644
--- a/src/hydra-evaluator/hydra-evaluator.cc
+++ b/src/hydra-evaluator/hydra-evaluator.cc
@@ -13,7 +13,7 @@
 
 using namespace nix;
 
-typedef std::pair<std::string, std::string> JobsetName;
+typedef std::pair<std::string, std::string> JobsetIdentity;
 
 enum class EvaluationStyle
 {
@@ -30,16 +30,16 @@ struct Evaluator
 
     struct Jobset
     {
-        JobsetName name;
+        JobsetIdentity name;
         std::optional<EvaluationStyle> evaluation_style;
         time_t lastCheckedTime, triggerTime;
         int checkInterval;
         Pid pid;
     };
 
-    typedef std::map<JobsetName, Jobset> Jobsets;
+    typedef std::map<JobsetIdentity, Jobset> Jobsets;
 
-    std::optional<JobsetName> evalOne;
+    std::optional<JobsetIdentity> evalOne;
 
     const size_t maxEvals;
 
@@ -76,10 +76,10 @@ struct Evaluator
 
         auto state(state_.lock());
 
-        std::set<JobsetName> seen;
+        std::set<JobsetIdentity> seen;
 
         for (auto const & row : res) {
-            auto name = JobsetName{row["project"].as<std::string>(), row["name"].as<std::string>()};
+            auto name = JobsetIdentity{row["project"].as<std::string>(), row["name"].as<std::string>()};
 
             if (evalOne && name != *evalOne) continue;
 
@@ -466,7 +466,7 @@ int main(int argc, char * * argv)
         else {
             if (!args.empty()) {
                 if (args.size() != 2) throw UsageError("Syntax: hydra-evaluator [<project> <jobset>]");
-                evaluator.evalOne = JobsetName(args[0], args[1]);
+                evaluator.evalOne = JobsetIdentity(args[0], args[1]);
             }
             evaluator.run();
         }