Skip to content

Commit

Permalink
parentPath -> parentInputPath
Browse files Browse the repository at this point in the history
  • Loading branch information
edolstra committed Sep 16, 2024
1 parent 09d7197 commit 71d4bb8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/libflake/flake/flake.cc
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ LockedFlake lockFlake(
{
FlakeInput input;
SourcePath sourcePath;
std::optional<InputPath> parentPath; // FIXME: rename to inputPathPrefix?
std::optional<InputPath> parentInputPath; // FIXME: rename to inputPathPrefix?
};

std::map<InputPath, Override> overrides;
Expand Down Expand Up @@ -469,7 +469,7 @@ LockedFlake lockFlake(
Override {
.input = inputOverride,
.sourcePath = sourcePath,
.parentPath = inputPathPrefix // FIXME: should this be inputPath?
.parentInputPath = inputPathPrefix // FIXME: should this be inputPath?
});
}
}
Expand Down Expand Up @@ -531,7 +531,7 @@ LockedFlake lockFlake(

auto overridenParentPath =
input.ref->input.isRelative()
? std::optional<InputPath>(hasOverride ? i->second.parentPath : inputPathPrefix)
? std::optional<InputPath>(hasOverride ? i->second.parentInputPath : inputPathPrefix)
: std::nullopt;

auto resolveRelativePath = [&]() -> std::optional<SourcePath>
Expand Down

0 comments on commit 71d4bb8

Please sign in to comment.