nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-14 21:11:04 +01:00
Code Activity

Rename OutputPath -> ExtendedOutputPath

Browse source 
Do this prior to making a new more limitted `OutputPath` we will use in
more places.
This commit is contained in:
John Ericson 2023-01-11 02:00:44 -05:00
parent a8f45b5e5a
commit a7c0cff07f
9 changed files with 60 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libstore/outputs-spec.hh
View file

@ -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 &);
}