aboutsummaryrefslogtreecommitdiff
path: root/src/libexpr/eval-inline.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/libexpr/eval-inline.hh')
-rw-r--r--src/libexpr/eval-inline.hh19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/libexpr/eval-inline.hh b/src/libexpr/eval-inline.hh
index 42cb68bbe..03320c7c9 100644
--- a/src/libexpr/eval-inline.hh
+++ b/src/libexpr/eval-inline.hh
@@ -3,6 +3,7 @@
#include "print.hh"
#include "eval.hh"
+#include "eval-error.hh"
namespace nix {
@@ -115,10 +116,11 @@ inline void EvalState::forceAttrs(Value & v, Callable getPos, std::string_view e
PosIdx pos = getPos();
forceValue(v, pos);
if (v.type() != nAttrs) {
- error("expected a set but found %1%: %2%",
- showType(v),
- ValuePrinter(*this, v, errorPrintOptions))
- .withTrace(pos, errorCtx).debugThrow<TypeError>();
+ error<TypeError>(
+ "expected a set but found %1%: %2%",
+ showType(v),
+ ValuePrinter(*this, v, errorPrintOptions)
+ ).withTrace(pos, errorCtx).debugThrow();
}
}
@@ -128,10 +130,11 @@ inline void EvalState::forceList(Value & v, const PosIdx pos, std::string_view e
{
forceValue(v, pos);
if (!v.isList()) {
- error("expected a list but found %1%: %2%",
- showType(v),
- ValuePrinter(*this, v, errorPrintOptions))
- .withTrace(pos, errorCtx).debugThrow<TypeError>();
+ error<TypeError>(
+ "expected a list but found %1%: %2%",
+ showType(v),
+ ValuePrinter(*this, v, errorPrintOptions)
+ ).withTrace(pos, errorCtx).debugThrow();
}
}