diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2023-08-14 08:10:39 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2023-08-14 08:44:48 -0400 |
| commit | a04720e68ce45943ce0eae3d477f9d554b0d63a4 (patch) | |
| tree | 5f2a2d7da64e3409848b7d41098ae40a2adb33e2 /src/libexpr/eval.cc | |
| parent | 584ff408a4e2b6eb0d74989778c640a92089b6d4 (diff) | |
Rename `optOutputPath` to `optStaticOutputPath`
This choice of variable name makes it more clear what is going on.
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
Diffstat (limited to 'src/libexpr/eval.cc')
| -rw-r--r-- | src/libexpr/eval.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 3e521b732..063e34c56 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -1031,12 +1031,12 @@ void EvalState::mkOutputString( Value & value, const StorePath & drvPath, const std::string outputName, - std::optional<StorePath> optOutputPath, + std::optional<StorePath> optStaticOutputPath, const ExperimentalFeatureSettings & xpSettings) { value.mkString( - optOutputPath - ? store->printStorePath(*std::move(optOutputPath)) + optStaticOutputPath + ? store->printStorePath(*std::move(optStaticOutputPath)) /* Downstream we would substitute this for an actual path once we build the floating CA derivation */ : DownstreamPlaceholder::unknownCaOutput(drvPath, outputName, xpSettings).render(), @@ -2349,10 +2349,10 @@ SingleDerivedPath EvalState::coerceToSingleDerivedPath(const PosIdx pos, Value & auto i = drv.outputs.find(b.output); if (i == drv.outputs.end()) throw Error("derivation '%s' does not have output '%s'", b.drvPath->to_string(*store), b.output); - auto optOutputPath = i->second.path(*store, drv.name, b.output); + auto optStaticOutputPath = i->second.path(*store, drv.name, b.output); // This is testing for the case of CA derivations - return optOutputPath - ? store->printStorePath(*optOutputPath) + return optStaticOutputPath + ? store->printStorePath(*optStaticOutputPath) : DownstreamPlaceholder::fromSingleDerivedPathBuilt(b).render(); }, [&](const SingleDerivedPath::Built & o) { |