nrabulinski/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Rename optOutputPath to optStaticOutputPath

Browse source 
This choice of variable name makes it more clear what is going on.

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
This commit is contained in:
John Ericson 2023-08-14 08:10:39 -04:00
parent 584ff408a4
commit a04720e68c
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/libexpr/eval.cc
View file

@ -1031,12 +1031,12 @@ void EvalState::mkOutputString(
Value & value, Value & value,
const StorePath & drvPath, const StorePath & drvPath,
const std::string outputName, const std::string outputName,
std::optional<StorePath> optOutputPath, std::optional<StorePath> optStaticOutputPath,
const ExperimentalFeatureSettings & xpSettings) const ExperimentalFeatureSettings & xpSettings)
{ {
value.mkString( value.mkString(
optOutputPath optStaticOutputPath
? store->printStorePath(*std::move(optOutputPath)) ? store->printStorePath(*std::move(optStaticOutputPath))
/* Downstream we would substitute this for an actual path once /* Downstream we would substitute this for an actual path once
we build the floating CA derivation */ we build the floating CA derivation */
: DownstreamPlaceholder::unknownCaOutput(drvPath, outputName, xpSettings).render(), : DownstreamPlaceholder::unknownCaOutput(drvPath, outputName, xpSettings).render(),
@ -2349,10 +2349,10 @@ SingleDerivedPath EvalState::coerceToSingleDerivedPath(const PosIdx pos, Value &
auto i = drv.outputs.find(b.output); auto i = drv.outputs.find(b.output);
if (i == drv.outputs.end()) if (i == drv.outputs.end())
throw Error("derivation '%s' does not have output '%s'", b.drvPath->to_string(*store), b.output); 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 // This is testing for the case of CA derivations
return optOutputPath return optStaticOutputPath
? store->printStorePath(*optOutputPath) ? store->printStorePath(*optStaticOutputPath)
: DownstreamPlaceholder::fromSingleDerivedPathBuilt(b).render(); : DownstreamPlaceholder::fromSingleDerivedPathBuilt(b).render();
}, },
[&](const SingleDerivedPath::Built & o) { [&](const SingleDerivedPath::Built & o) {

4
src/libexpr/eval.hh
View file

@ -685,7 +685,7 @@ public:
* *
* @param outputName Name of the output * @param outputName Name of the output
* *
* @param optOutputPath Optional output path for that string. Must * @param optStaticOutputPath Optional output path for that string. Must
* be passed if and only if output store object is input-addressed. * be passed if and only if output store object is input-addressed.
* Will be printed to form string if passed, otherwise a placeholder * Will be printed to form string if passed, otherwise a placeholder
* will be used (see `DownstreamPlaceholder`). * will be used (see `DownstreamPlaceholder`).
@ -696,7 +696,7 @@ public:
Value & value, Value & value,
const StorePath & drvPath, const StorePath & drvPath,
const std::string outputName, const std::string outputName,
std::optional<StorePath> optOutputPath, std::optional<StorePath> optStaticOutputPath,
const ExperimentalFeatureSettings & xpSettings = experimentalFeatureSettings); const ExperimentalFeatureSettings & xpSettings = experimentalFeatureSettings);
void concatLists(Value & v, size_t nrLists, Value * * lists, const PosIdx pos, std::string_view errorCtx); void concatLists(Value & v, size_t nrLists, Value * * lists, const PosIdx pos, std::string_view errorCtx);