wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-26 15:51:15 +02:00
Code Activity

don't include errpos for addErrorContext

Browse source
This commit is contained in:
Ben Burdette 2020-07-01 11:49:01 -06:00
parent 2a39c083dc
commit 3629b0585a
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libutil/error.cc
View file

@ -305,7 +305,7 @@ std::ostream& showErrorInfo(std::ostream &out, const ErrorInfo &einfo, bool show
nl = true;
}
if (einfo.errPos.has_value()) {
if (einfo.errPos.has_value() && (*einfo.errPos)) {
auto loc = getCodeLines(*einfo.errPos);
// lines of code.
@ -359,9 +359,10 @@ std::ostream& showErrorInfo(std::ostream &out, const ErrorInfo &einfo, bool show
out << ANSI_BLUE << "trace: " << ANSI_NORMAL << iter->hint.str();
nl = true;
auto pos = *iter->pos;
if (pos) {
if (*iter->pos) {
auto pos = iter->pos.value();
out << std::endl << prefix;
printAtPos(prefix, pos, out);
auto loc = getCodeLines(pos);
if (loc.has_value())