From a7c0cff07f3e1af60bdbcd5bf7e13f8ae768da90 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 11 Jan 2023 02:00:44 -0500
Subject: Rename `OutputPath` -> `ExtendedOutputPath`

Do this prior to making a new more limitted `OutputPath` we will use in
more places.
---
 src/libstore/outputs-spec.hh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/libstore/outputs-spec.hh')

diff --git a/src/libstore/outputs-spec.hh b/src/libstore/outputs-spec.hh
index 6f886ccb6..5ed711a62 100644
--- a/src/libstore/outputs-spec.hh
+++ b/src/libstore/outputs-spec.hh
@@ -17,10 +17,10 @@ struct DefaultOutputs {
     bool operator < (const DefaultOutputs & _) const { return false; }
 };
 
-typedef std::variant<DefaultOutputs, AllOutputs, OutputNames> _OutputsSpecRaw;
+typedef std::variant<DefaultOutputs, AllOutputs, OutputNames> _ExtendedOutputsSpecRaw;
 
-struct OutputsSpec : _OutputsSpecRaw {
-    using Raw = _OutputsSpecRaw;
+struct ExtendedOutputsSpec : _ExtendedOutputsSpecRaw {
+    using Raw = _ExtendedOutputsSpecRaw;
     using Raw::Raw;
 
     using Names = OutputNames;
@@ -33,12 +33,12 @@ struct OutputsSpec : _OutputsSpecRaw {
 
     /* 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);
+    static std::pair<std::string, ExtendedOutputsSpec> parse(std::string s);
 
     std::string to_string() const;
 };
 
-void to_json(nlohmann::json &, const OutputsSpec &);
-void from_json(const nlohmann::json &, OutputsSpec &);
+void to_json(nlohmann::json &, const ExtendedOutputsSpec &);
+void from_json(const nlohmann::json &, ExtendedOutputsSpec &);
 
 }
-- 
cgit v1.2.3