1 files changed, 28 insertions, 28 deletions

diff --git a/src/libstore/build/worker.cc b/src/libstore/build/worker.cc
index 10f58f5d3..2a764b193 100644
--- a/src/libstore/build/worker.cc
+++ b/src/libstore/build/worker.cc
@@ -229,8 +229,8 @@ try {
     co_return result::failure(std::current_exception());
 }
 
-Worker::Results Worker::run(std::function<Targets (GoalFactory &)> req)
-{
+kj::Promise<Result<Worker::Results>> Worker::run(std::function<Targets (GoalFactory &)> req)
+try {
     auto topGoals = req(goalFactory());
 
     assert(!running);
@@ -252,16 +252,18 @@ Worker::Results Worker::run(std::function<Targets (GoalFactory &)> req)
         promise = promise.exclusiveJoin(boopGC(*localStore));
     }
 
-    return promise.wait(aio.waitScope).value();
+    co_return co_await promise;
+} catch (...) {
+    co_return result::failure(std::current_exception());
 }
 
 kj::Promise<Result<Worker::Results>> Worker::runImpl(Targets topGoals)
 try {
     debug("entered goal loop");
 
-    kj::Vector<Targets::value_type> promises(topGoals.size());
-    for (auto & gp : topGoals) {
-        promises.add(std::move(gp));
+    kj::Vector<std::pair<size_t, kj::Promise<Result<Goal::WorkResult>>>> promises(topGoals.size());
+    for (auto && [idx, gp] : enumerate(topGoals)) {
+        promises.add(idx, std::move(gp.second));
     }
 
     Results results;
@@ -270,7 +272,7 @@ try {
     while (auto done = co_await collect.next()) {
         // propagate goal exceptions outward
         BOOST_OUTCOME_CO_TRY(auto result, done->second);
-        results.emplace(done->first, result);
+        results.goals.emplace(done->first, result);
 
         /* If a top-level goal failed, then kill all other goals
            (unless keepGoing was set). */
@@ -285,6 +287,25 @@ try {
        --keep-going *is* set, then they must all be finished now. */
     assert(!settings.keepGoing || children.isEmpty());
 
+    results.failingExitStatus = [&] {
+        // See API docs in header for explanation
+        unsigned int mask = 0;
+        bool buildFailure = permanentFailure || timedOut || hashMismatch;
+        if (buildFailure)
+            mask |= 0x04;  // 100
+        if (timedOut)
+            mask |= 0x01;  // 101
+        if (hashMismatch)
+            mask |= 0x02;  // 102
+        if (checkMismatch) {
+            mask |= 0x08;  // 104
+        }
+
+        if (mask)
+            mask |= 0x60;
+        return mask ? mask : 1;
+    }();
+
     co_return std::move(results);
 } catch (...) {
     co_return result::failure(std::current_exception());
@@ -301,27 +322,6 @@ try {
 }
 
 
-unsigned int Worker::failingExitStatus()
-{
-    // See API docs in header for explanation
-    unsigned int mask = 0;
-    bool buildFailure = permanentFailure || timedOut || hashMismatch;
-    if (buildFailure)
-        mask |= 0x04;  // 100
-    if (timedOut)
-        mask |= 0x01;  // 101
-    if (hashMismatch)
-        mask |= 0x02;  // 102
-    if (checkMismatch) {
-        mask |= 0x08;  // 104
-    }
-
-    if (mask)
-        mask |= 0x60;
-    return mask ? mask : 1;
-}
-
-
 bool Worker::pathContentsGood(const StorePath & path)
 {
     auto i = pathContentsGoodCache.find(path);