Merge pull request #12643 from obsidiansystems/delete-dead-goal-var

Ericson2314 · web-flow · commit b8eaf1b3228a · 2025-03-12T16:45:26.000-07:00
Remove unused parameter to the goal constructor
diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc
@@ -38,7 +38,7 @@ namespace nix {
 
 DerivationGoal::DerivationGoal(const StorePath & drvPath,
     const OutputsSpec & wantedOutputs, Worker & worker, BuildMode buildMode)
-    : Goal(worker, DerivedPath::Built { .drvPath = makeConstantStorePathRef(drvPath), .outputs = wantedOutputs })
+    : Goal(worker)
     , useDerivation(true)
     , drvPath(drvPath)
     , wantedOutputs(wantedOutputs)
@@ -56,7 +56,7 @@ DerivationGoal::DerivationGoal(const StorePath & drvPath,
 
 DerivationGoal::DerivationGoal(const StorePath & drvPath, const BasicDerivation & drv,
     const OutputsSpec & wantedOutputs, Worker & worker, BuildMode buildMode)
-    : Goal(worker, DerivedPath::Built { .drvPath = makeConstantStorePathRef(drvPath), .outputs = wantedOutputs })
+    : Goal(worker)
     , useDerivation(false)
     , drvPath(drvPath)
     , wantedOutputs(wantedOutputs)
diff --git a/src/libstore/build/drv-output-substitution-goal.cc b/src/libstore/build/drv-output-substitution-goal.cc
@@ -11,7 +11,7 @@ DrvOutputSubstitutionGoal::DrvOutputSubstitutionGoal(
     Worker & worker,
     RepairFlag repair,
     std::optional<ContentAddress> ca)
-    : Goal(worker, DerivedPath::Opaque { StorePath::dummy })
+    : Goal(worker)
     , id(id)
 {
     name = fmt("substitution of '%s'", id.to_string());
diff --git a/src/libstore/build/goal.hh b/src/libstore/build/goal.hh
@@ -378,7 +378,7 @@ public:
      */
     std::optional<Error> ex;
 
-    Goal(Worker & worker, DerivedPath path)
+    Goal(Worker & worker)
         : worker(worker), top_co(init_wrapper())
     {
         // top_co shouldn't have a goal already, should be nullptr.
diff --git a/src/libstore/build/substitution-goal.cc b/src/libstore/build/substitution-goal.cc
@@ -8,7 +8,7 @@
 namespace nix {
 
 PathSubstitutionGoal::PathSubstitutionGoal(const StorePath & storePath, Worker & worker, RepairFlag repair, std::optional<ContentAddress> ca)
-    : Goal(worker, DerivedPath::Opaque { storePath })
+    : Goal(worker)
     , storePath(storePath)
     , repair(repair)
     , ca(ca)

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ DrvOutputSubstitutionGoal::DrvOutputSubstitutionGoal(`
`11`	`11`	`Worker & worker,`
`12`	`12`	`RepairFlag repair,`
`13`	`13`	`std::optional<ContentAddress> ca)`
`14`		`- : Goal(worker, DerivedPath::Opaque { StorePath::dummy })`
	`14`	`+ : Goal(worker)`
`15`	`15`	`, id(id)`
`16`	`16`	`{`
`17`	`17`	`name = fmt("substitution of '%s'", id.to_string());`
Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ public:`
`378`	`378`	`*/`
`379`	`379`	`std::optional<Error> ex;`
`380`	`380`
`381`		`- Goal(Worker & worker, DerivedPath path)`
	`381`	`+ Goal(Worker & worker)`
`382`	`382`	`: worker(worker), top_co(init_wrapper())`
`383`	`383`	`{`
`384`	`384`	`// top_co shouldn't have a goal already, should be nullptr.`