From 869666cb651f97cdce3a6aabf62073bfe1130cbb Mon Sep 17 00:00:00 2001 From: eldritch horrors Date: Thu, 29 Aug 2024 21:06:30 +0200 Subject: libstore: hide Worker goal factory methods this doesn't serve a great purpose yet except to confine construction of goals to the stack frame of Worker::run() and its child frames. we don't need this yet (and the goal constructors remain fully visible), but in a future change that fully removes the current worker loop we'll need some way of knowing which goals are top-level goals without passing the goals themselves around. once that's possible we can remove visible goals as a concept and rely on build result futures and a scheduler built upon them Change-Id: Ia73cdeffcfb9ba1ce9d69b702dc0bc637a4c4ce6 --- src/libstore/build/drv-output-substitution-goal.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libstore/build/drv-output-substitution-goal.cc') diff --git a/src/libstore/build/drv-output-substitution-goal.cc b/src/libstore/build/drv-output-substitution-goal.cc index 54d81d7a0..9acff14b0 100644 --- a/src/libstore/build/drv-output-substitution-goal.cc +++ b/src/libstore/build/drv-output-substitution-goal.cc @@ -112,11 +112,11 @@ Goal::WorkResult DrvOutputSubstitutionGoal::realisationFetched(bool inBuildSlot) ); return tryNext(inBuildSlot); } - result.goals.insert(worker.makeDrvOutputSubstitutionGoal(depId)); + result.goals.insert(worker.goalFactory().makeDrvOutputSubstitutionGoal(depId)); } } - result.goals.insert(worker.makePathSubstitutionGoal(outputInfo->outPath)); + result.goals.insert(worker.goalFactory().makePathSubstitutionGoal(outputInfo->outPath)); if (result.goals.empty()) { return outPathValid(inBuildSlot); -- cgit v1.2.3