Improve `OutputsSpec` slightly

A few little changes preparing for the rest.

1 files changed, 19 insertions, 7 deletions

diff --git a/src/libstore/outputs-spec.hh b/src/libstore/outputs-spec.hh
index e2cf1d12b..6f886ccb6 100644
--- a/src/libstore/outputs-spec.hh
+++ b/src/libstore/outputs-spec.hh
@@ -1,9 +1,8 @@
 #pragma once
 
+#include <set>
 #include <variant>
 
-#include "util.hh"
-
 #include "nlohmann/json_fwd.hpp"
 
 namespace nix {
@@ -18,13 +17,26 @@ struct DefaultOutputs {
     bool operator < (const DefaultOutputs & _) const { return false; }
 };
 
-typedef std::variant<DefaultOutputs, AllOutputs, OutputNames> OutputsSpec;
+typedef std::variant<DefaultOutputs, AllOutputs, OutputNames> _OutputsSpecRaw;
+
+struct OutputsSpec : _OutputsSpecRaw {
+    using Raw = _OutputsSpecRaw;
+    using Raw::Raw;
+
+    using Names = OutputNames;
+    using All = AllOutputs;
+    using Default = DefaultOutputs;
 
-/* Parse a string of the form 'prefix^output1,...outputN' or
-   'prefix^*', returning the prefix and the outputs spec. */
-std::pair<std::string, OutputsSpec> parseOutputsSpec(const std::string & s);
+    inline const Raw & raw() const {
+        return static_cast<const Raw &>(*this);
+    }
 
-std::string printOutputsSpec(const OutputsSpec & outputsSpec);
+    /* Parse a string of the form 'prefix^output1,...outputN' or
+       'prefix^*', returning the prefix and the outputs spec. */
+    static std::pair<std::string, OutputsSpec> parse(std::string s);
+
+    std::string to_string() const;
+};
 
 void to_json(nlohmann::json &, const OutputsSpec &);
 void from_json(const nlohmann::json &, OutputsSpec &);