From b6ca60cb821c67739f03152e683b3e68dd632e7b Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 13 Aug 2025 23:01:58 -0400 Subject: [PATCH] `DerivationBuilder::checkPathValidity`: Simplify `allValid` calc Now that the loops is gone, we can just inline this mutation to a single simple expression. --- src/libstore/build/derivation-goal.cc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc index c791aa5fc..3273ab82f 100644 --- a/src/libstore/build/derivation-goal.cc +++ b/src/libstore/build/derivation-goal.cc @@ -363,14 +363,7 @@ std::pair DerivationGoal::checkPathValidity() "derivation '%s' does not have wanted outputs '%s'", worker.store.printStorePath(drvPath), wantedOutput); } - bool allValid = true; - { - if (!outputKnown || !outputKnown->isValid()) { - allValid = false; - } - } - - return {allValid, validOutputs}; + return {outputKnown && outputKnown->isValid(), validOutputs}; } SingleDrvOutputs DerivationGoal::assertPathValidity()