diff options
author | eldritch horrors <pennae@lix.systems> | 2024-09-24 00:21:16 +0200 |
---|---|---|
committer | eldritch horrors <pennae@lix.systems> | 2024-09-29 14:29:14 +0000 |
commit | 8fb642b6e09368d10d8357fcb7c508f706fa5f08 (patch) | |
tree | 8ddf9ab70729c40c2776a0f8a00eb305c79abfcb /src/libstore/build/goal.hh | |
parent | 1a52e4f755c3fcc50e58f7a0b04269a3839b7eea (diff) |
libstore: remove Goal::WaitForWorld
have DerivationGoal and its subclasses produce a wrapper promise for
their intermediate results instead, and return this wrapper promise.
Worker already handles promises that do not complete immediately, so
we do not have to duplicate this into an entire result type variant.
Change-Id: Iae8dbf63cfc742afda4d415922a29ac5a3f39348
Diffstat (limited to 'src/libstore/build/goal.hh')
-rw-r--r-- | src/libstore/build/goal.hh | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/libstore/build/goal.hh b/src/libstore/build/goal.hh index e7a500a00..7933fbc31 100644 --- a/src/libstore/build/goal.hh +++ b/src/libstore/build/goal.hh @@ -115,9 +115,6 @@ public: struct [[nodiscard]] StillAlive {}; struct [[nodiscard]] ContinueImmediately {}; - struct [[nodiscard]] WaitForWorld { - kj::Promise<Outcome<void, Finished>> promise; - }; struct [[nodiscard]] Finished { ExitCode exitCode; BuildResult result; @@ -131,7 +128,6 @@ public: struct [[nodiscard]] WorkResult : std::variant< StillAlive, ContinueImmediately, - WaitForWorld, Finished> { WorkResult() = delete; |