aboutsummaryrefslogtreecommitdiff
path: root/src/libexpr/eval.cc
diff options
context:
space:
mode:
authoreldritch horrors <pennae@lix.systems>2024-03-08 05:06:09 +0100
committereldritch horrors <pennae@lix.systems>2024-03-09 00:05:41 -0700
commit609a8e0d94926cae460ed6f12f1f8a3d9f91246b (patch)
tree81a786aa9ca89c3953097778766ad9a3df9054b4 /src/libexpr/eval.cc
parent2f7c3fa2516a386af6c556dedc2811edb8302ffc (diff)
Merge pull request #9754 from 9999years/print-value-when-coercion-fails
Print the value in `error: cannot coerce` messages (cherry picked from commit 5b7bfd2d6b89d7dd5f54c1ca6c8072358d31a84e) === test taken from 6e8d5983143ae576e3f4b1d2954a5267f2943a49; it was added previously (and not backported because its pr was a mostly-revert), but it's useful to have around. Change-Id: Icbd14b55e3610ce7b774667bf14b82e6dc717982
Diffstat (limited to 'src/libexpr/eval.cc')
-rw-r--r--src/libexpr/eval.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 6d314463b..d3d1eb7f1 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -2279,7 +2279,9 @@ BackedStringView EvalState::coerceToString(
return std::move(*maybeString);
auto i = v.attrs->find(sOutPath);
if (i == v.attrs->end()) {
- error("cannot coerce %1% to a string", showType(v))
+ error("cannot coerce %1% to a string: %2%",
+ showType(v),
+ ValuePrinter(*this, v, errorPrintOptions))
.withTrace(pos, errorCtx)
.debugThrow<TypeError>();
}
@@ -2325,7 +2327,9 @@ BackedStringView EvalState::coerceToString(
}
}
- error("cannot coerce %1% to a string", showType(v))
+ error("cannot coerce %1% to a string: %2%",
+ showType(v),
+ ValuePrinter(*this, v, errorPrintOptions))
.withTrace(pos, errorCtx)
.debugThrow<TypeError>();
}
@@ -2657,7 +2661,7 @@ void EvalState::printStatistics()
std::string ExternalValueBase::coerceToString(const Pos & pos, NixStringContext & context, bool copyMore, bool copyToStore) const
{
throw TypeError({
- .msg = hintfmt("cannot coerce %1% to a string", showType())
+ .msg = hintfmt("cannot coerce %1% to a string: %2%", showType(), *this)
});
}