From 114a6e2b09eda7f23e7776e1cdf77715044e073e Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 11 Jan 2023 11:54:43 -0500
Subject: Make it hard to construct an empty `OutputsSpec::Names`

This should be a non-empty set, and so we don't want people doing this
by accident. We remove the zero-0 constructor with a little inheritance
trickery.
---
 src/libstore/build/derivation-goal.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/libstore/build/derivation-goal.cc')

diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc
index 98c1ddaae..61169635a 100644
--- a/src/libstore/build/derivation-goal.cc
+++ b/src/libstore/build/derivation-goal.cc
@@ -990,7 +990,7 @@ void DerivationGoal::resolvedFinished()
                 return resolvedDrv.outputNames();
             },
             [&](const OutputsSpec::Names & names) {
-                return names;
+                return static_cast<std::set<std::string>>(names);
             },
         }, wantedOutputs.raw());
 
@@ -1325,7 +1325,7 @@ std::pair<bool, DrvOutputs> DerivationGoal::checkPathValidity()
             return StringSet {};
         },
         [&](const OutputsSpec::Names & names) {
-            return names;
+            return static_cast<StringSet>(names);
         },
     }, wantedOutputs.raw());
     DrvOutputs validOutputs;
-- 
cgit v1.2.3