diff options
| author | Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com> | 2023-04-21 08:14:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-21 08:14:58 +0200 |
| commit | 7474a90db69813d051ab1bef35c7d0ab958d9ccd (patch) | |
| tree | 708acdb2945c7a9645135a04a8151686be8ecc2f /src/libcmd/repl.cc | |
| parent | ef432b2b1502c73d505d8fdb487db529601fa4ab (diff) | |
| parent | 85f0cdc370021299142be9454483403e9bac2602 (diff) | |
Merge pull request #7710 from obsidiansystems/context-not-path-set
Use `std::set<StringContextElem>` not `PathSet` for string contexts
Diffstat (limited to 'src/libcmd/repl.cc')
| -rw-r--r-- | src/libcmd/repl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcmd/repl.cc b/src/libcmd/repl.cc index 80c08bf1c..8d404b04e 100644 --- a/src/libcmd/repl.cc +++ b/src/libcmd/repl.cc @@ -596,7 +596,7 @@ bool NixRepl::processLine(std::string line) const auto [path, line] = [&] () -> std::pair<Path, uint32_t> { if (v.type() == nPath || v.type() == nString) { - PathSet context; + NixStringContext context; auto path = state->coerceToPath(noPos, v, context, "while evaluating the filename to edit"); return {path, 0}; } else if (v.isLambda()) { @@ -940,7 +940,7 @@ std::ostream & NixRepl::printValue(std::ostream & str, Value & v, unsigned int m if (isDrv) { str << "«derivation "; Bindings::iterator i = v.attrs->find(state->sDrvPath); - PathSet context; + NixStringContext context; if (i != v.attrs->end()) str << state->store->printStorePath(state->coerceToStorePath(i->pos, *i->value, context, "while evaluating the drvPath of a derivation")); else |