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

Took ref and rev out of FlakeRef

Browse source
This commit is contained in:
Nick Van den Broeck 2019-04-06 20:45:35 +02:00
parent 3ec0c82fab
commit f39670c631
3 changed files with 41 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/libexpr/primops/flakeref.hh
View file

@ -101,25 +101,23 @@ typedef std::string FlakeId;
struct FlakeRef
{
std::optional<std::string> ref;
std::optional<Hash> rev;
struct IsFlakeId
{
FlakeId id;
std::optional<std::string> ref;
std::optional<Hash> rev;
};
struct IsGitHub
{
std::string owner, repo;
std::optional<std::string> ref;
std::optional<Hash> rev;
};
// Git, Tarball
struct IsGit
{
std::string uri;
std::optional<std::string> ref;
std::optional<Hash> rev;
};
struct IsPath
@ -161,22 +159,8 @@ struct FlakeRef
FlakeRef baseRef() const;
void setRef(std::optional<std::string> ref) {
if (auto refData = std::get_if<IsGit>(&data))
refData->ref = ref;
else if (auto refData = std::get_if<IsGitHub>(&data))
refData->ref = ref;
else if (auto refData = std::get_if<IsFlakeId>(&data))
refData->ref = ref;
}
void setRef(std::optional<std::string> ref) { ref = ref; }
void setRev(std::optional<Hash> rev) {
if (auto refData = std::get_if<IsGit>(&data))
refData->rev = rev;
else if (auto refData = std::get_if<IsGitHub>(&data))
refData->rev = rev;
else if (auto refData = std::get_if<IsFlakeId>(&data))
refData->rev = rev;
}
void setRev(std::optional<Hash> rev) { rev = rev; }
};
}