diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index dc52f8db7..990e98f9a 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -709,12 +709,12 @@ std::optional EvalState::getDoc(Value & v) LocalNoInlineNoReturn(void throwTypeErrorWithTrace( const Pos & pos, const char * s, - const std::string & s2, + const std::string_view & s2, const Symbol & sym, const Pos & p2, const std::string_view & s3)) { - throw TypeError({ + throw TypeError(ErrorInfo { .msg = hintfmt(s, s2, sym), .errPos = pos, }).addTrace(p2, s3); @@ -724,12 +724,12 @@ LocalNoInlineNoReturn(void throwTypeErrorWithTrace( const Pos & pos, const Suggestions & suggestions, const char * s, - const std::string & s2, + const std::string_view & s2, const Symbol & sym, const Pos & p2, const std::string_view & s3)) { - throw TypeError({ + throw TypeError(ErrorInfo { .msg = hintfmt(s, s2, sym), .errPos = pos, .suggestions = suggestions