libstore: remove Worker::removeGoal

we can use our newfound powers of Goal::work Is A Real Promise to remove
completed goals from continuation promises. apart from being much easier
to follow it's also a lot more efficient because we have the iterator to
the item we are trying to remove, skipping a linear search of the cache.

Change-Id: Ie0190d051c5f4b81304d98db478348b20c209df5

1 files changed, 1 insertions, 6 deletions

diff --git a/src/libstore/build/worker.hh b/src/libstore/build/worker.hh
index 923092b51..fcf0ad8c7 100644
--- a/src/libstore/build/worker.hh
+++ b/src/libstore/build/worker.hh
@@ -95,7 +95,7 @@ private:
     template<typename G>
     struct CachedGoal
     {
-        std::weak_ptr<G> goal;
+        std::shared_ptr<G> goal;
         kj::ForkedPromise<Result<Goal::WorkResult>> promise{nullptr};
     };
     /**
@@ -135,11 +135,6 @@ private:
     void goalFinished(GoalPtr goal, Goal::WorkResult & f);
 
     /**
-     * Remove a dead goal.
-     */
-    void removeGoal(GoalPtr goal);
-
-    /**
      * Registers a running child process.
      */
     void childStarted(GoalPtr goal, kj::Promise<Result<Goal::WorkResult>> promise);