DerivationBuildingGoal::started make local (lambda) variable

Author: Ericson2314

src/libstore/build/derivation-building-goal.cc

@@ -439,37 +439,36 @@ Goal::Co DerivationBuildingGoal::gaveUpOnSubstitution()
     co_return tryToBuild();
 }
 
-void DerivationBuildingGoal::started()
+Goal::Co DerivationBuildingGoal::tryToBuild()
 {
-    auto msg =
-        fmt(buildMode == bmRepair  ? "repairing outputs of '%s'"
-            : buildMode == bmCheck ? "checking outputs of '%s'"
-                                   : "building '%s'",
-            worker.store.printStorePath(drvPath));
-    fmt("building '%s'", worker.store.printStorePath(drvPath));
+    auto started = [&]() {
+        auto msg =
+            fmt(buildMode == bmRepair  ? "repairing outputs of '%s'"
+                : buildMode == bmCheck ? "checking outputs of '%s'"
+                                       : "building '%s'",
+                worker.store.printStorePath(drvPath));
+        fmt("building '%s'", worker.store.printStorePath(drvPath));
 #ifndef _WIN32 // TODO enable build hook on Windows
-    if (hook)
-        msg += fmt(" on '%s'", machineName);
+        if (hook)
+            msg += fmt(" on '%s'", machineName);
 #endif
-    act = std::make_unique<Activity>(
-        *logger,
-        lvlInfo,
-        actBuild,
-        msg,
-        Logger::Fields{
-            worker.store.printStorePath(drvPath),
+        act = std::make_unique<Activity>(
+            *logger,
+            lvlInfo,
+            actBuild,
+            msg,
+            Logger::Fields{
+                worker.store.printStorePath(drvPath),
 #ifndef _WIN32 // TODO enable build hook on Windows
-            hook ? machineName :
+                hook ? machineName :
 #endif
-                 "",
-            1,
-            1});
-    mcRunningBuilds = std::make_unique<MaintainCount<uint64_t>>(worker.runningBuilds);
-    worker.updateProgress();
-}
+                     "",
+                1,
+                1});
+        mcRunningBuilds = std::make_unique<MaintainCount<uint64_t>>(worker.runningBuilds);
+        worker.updateProgress();
+    };
 
-Goal::Co DerivationBuildingGoal::tryToBuild()
-{
     /**
      * Activity that denotes waiting for a lock.
      */

src/libstore/include/nix/store/build/derivation-building-goal.hh

@@ -158,8 +158,6 @@ struct DerivationBuildingGoal : public Goal
      */
     void killChild();
 
-    void started();
-
     Done doneSuccess(BuildResult::Status status, SingleDrvOutputs builtOutputs);
 
     Done doneFailure(BuildError ex);