From 41274f3c3e82d3b7f13147f1828890c1e0e8d141 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 1 Feb 2025 18:33:58 -0500 Subject: [PATCH] Inline `outputsSubstitutionTried` --- src/libstore/build/derivation-goal.cc | 5 ----- src/libstore/build/derivation-goal.hh | 1 - 2 files changed, 6 deletions(-) diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc index 401e2cda1..2993333fd 100644 --- a/src/libstore/build/derivation-goal.cc +++ b/src/libstore/build/derivation-goal.cc @@ -270,12 +270,7 @@ Goal::Co DerivationGoal::haveDerivation() } if (!waitees.empty()) co_await Suspend{}; /* to prevent hang (no wake-up event) */ - co_return outputsSubstitutionTried(); -} - -Goal::Co DerivationGoal::outputsSubstitutionTried() -{ trace("all outputs substituted (maybe)"); assert(!drv->type().isImpure()); diff --git a/src/libstore/build/derivation-goal.hh b/src/libstore/build/derivation-goal.hh index ad3d9ca2a..82fee3539 100644 --- a/src/libstore/build/derivation-goal.hh +++ b/src/libstore/build/derivation-goal.hh @@ -236,7 +236,6 @@ struct DerivationGoal : public Goal Co getDerivation(); Co loadDerivation(); Co haveDerivation(); - Co outputsSubstitutionTried(); Co gaveUpOnSubstitution(); Co closureRepaired(); Co inputsRealised();