aboutsummaryrefslogtreecommitdiff
path: root/src/libexpr/primops/flake.hh
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-05-28 13:12:43 +0200
committerEelco Dolstra <edolstra@gmail.com>2019-05-28 13:12:43 +0200
commitdda4f7167b9a421f1bb85ee5eed79a1bf03a13e4 (patch)
treeb622c997c8dc7d52996b90948b0d97ac6b97d8b7 /src/libexpr/primops/flake.hh
parent48463045415d6099b01e360d27f3cdd1053c9ed0 (diff)
Remove redundant resolvedRef fields since they're already in SourceInfo
Diffstat (limited to 'src/libexpr/primops/flake.hh')
-rw-r--r--src/libexpr/primops/flake.hh10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/libexpr/primops/flake.hh b/src/libexpr/primops/flake.hh
index d90404ae6..a26103736 100644
--- a/src/libexpr/primops/flake.hh
+++ b/src/libexpr/primops/flake.hh
@@ -92,7 +92,6 @@ struct Flake
{
FlakeId id;
FlakeRef originalRef;
- FlakeRef resolvedRef;
std::string description;
SourceInfo sourceInfo;
std::vector<FlakeRef> requires;
@@ -100,18 +99,17 @@ struct Flake
Value * vProvides; // FIXME: gc
unsigned int epoch;
- Flake(const FlakeRef & origRef, const SourceInfo & sourceInfo) : originalRef(origRef),
- resolvedRef(sourceInfo.resolvedRef), sourceInfo(sourceInfo) {};
+ Flake(const FlakeRef & origRef, const SourceInfo & sourceInfo)
+ : originalRef(origRef), sourceInfo(sourceInfo) {};
};
struct NonFlake
{
FlakeAlias alias;
FlakeRef originalRef;
- FlakeRef resolvedRef;
SourceInfo sourceInfo;
- NonFlake(const FlakeRef & origRef, const SourceInfo & sourceInfo) :
- originalRef(origRef), resolvedRef(sourceInfo.resolvedRef), sourceInfo(sourceInfo) {};
+ NonFlake(const FlakeRef & origRef, const SourceInfo & sourceInfo)
+ : originalRef(origRef), sourceInfo(sourceInfo) {};
};
Flake getFlake(EvalState &, const FlakeRef &, bool impureIsAllowed);