Merge pull request NixOS#14310 from obsidiansystems/inline-drv-output-subst-goal

Inline `realisationFetched`

Author: Ericson2314

src/libstore/build/drv-output-substitution-goal.cc

@@ -112,7 +112,21 @@ Goal::Co DrvOutputSubstitutionGoal::init()
         if (failed)
             continue;
 
-        co_return realisationFetched(std::move(waitees), outputInfo, sub);
+        waitees.insert(worker.makePathSubstitutionGoal(outputInfo->outPath));
+
+        co_await await(std::move(waitees));
+
+        trace("output path substituted");
+
+        if (nrFailed > 0) {
+            debug("The output path of the derivation output '%s' could not be substituted", id.to_string());
+            co_return amDone(nrNoSubstituters > 0 ? ecNoSubstituters : ecFailed);
+        }
+
+        worker.store.registerDrvOutput({*outputInfo, id});
+
+        trace("finished");
+        co_return amDone(ecSuccess);
     }
 
     /* None left.  Terminate this goal and let someone else deal
@@ -130,26 +144,6 @@ Goal::Co DrvOutputSubstitutionGoal::init()
     co_return amDone(substituterFailed ? ecFailed : ecNoSubstituters);
 }
 
-Goal::Co DrvOutputSubstitutionGoal::realisationFetched(
-    Goals waitees, std::shared_ptr<const UnkeyedRealisation> outputInfo, nix::ref<nix::Store> sub)
-{
-    waitees.insert(worker.makePathSubstitutionGoal(outputInfo->outPath));
-
-    co_await await(std::move(waitees));
-
-    trace("output path substituted");
-
-    if (nrFailed > 0) {
-        debug("The output path of the derivation output '%s' could not be substituted", id.to_string());
-        co_return amDone(nrNoSubstituters > 0 ? ecNoSubstituters : ecFailed);
-    }
-
-    worker.store.registerDrvOutput({*outputInfo, id});
-
-    trace("finished");
-    co_return amDone(ecSuccess);
-}
-
 std::string DrvOutputSubstitutionGoal::key()
 {
     return "a$" + std::string(id.to_string());

src/libstore/include/nix/store/build/drv-output-substitution-goal.hh

@@ -32,8 +32,6 @@ public:
     DrvOutputSubstitutionGoal(const DrvOutput & id, Worker & worker);
 
     Co init();
-    Co
-    realisationFetched(Goals waitees, std::shared_ptr<const UnkeyedRealisation> outputInfo, nix::ref<nix::Store> sub);
 
     void timedOut(Error && ex) override
     {