max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-22 22:16:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

builtins.warn: Use logWarning

Browse source 
Constructing ErrorInfo is a little awkward for now, but this does
produce a richer log entry.
This commit is contained in:
Robert Hensing 2024-04-23 18:07:45 +02:00
parent 2d4c9d8f4a
commit 923cbea2af
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/libexpr/primops.cc
View file

@ -1046,10 +1046,20 @@ static RegisterPrimOp primop_trace({
static void prim_warn(EvalState & state, const PosIdx pos, Value * * args, Value & v) static void prim_warn(EvalState & state, const PosIdx pos, Value * * args, Value & v)
{ {
state.forceValue(*args[0], pos); state.forceValue(*args[0], pos);
if (args[0]->type() == nString)
printMsg(lvlWarn, ANSI_WARNING "warning:" ANSI_NORMAL " %1%", args[0]->string_view()); {
else BaseError msg(args[0]->type() == nString
printMsg(lvlWarn, ANSI_WARNING "warning:" ANSI_NORMAL " %1%", ValuePrinter(state, *args[0])); ? std::string(args[0]->string_view())
: ({
std::stringstream s;
s << ValuePrinter(state, *args[0]);
s.str();
}));
msg.atPos(state.positions[pos]);
auto info = msg.info();
info.level = lvlWarn;
logWarning(info);
}
if (evalSettings.builtinsAbortOnWarn) { if (evalSettings.builtinsAbortOnWarn) {
state.error<Abort>("aborting to reveal stack trace of warning, as abort-on-warn is set").debugThrow(); state.error<Abort>("aborting to reveal stack trace of warning, as abort-on-warn is set").debugThrow();