aboutsummaryrefslogtreecommitdiff
path: root/src/libexpr/eval-error.cc
diff options
context:
space:
mode:
authoreldritch horrors <pennae@lix.systems>2024-03-08 08:10:05 +0100
committereldritch horrors <pennae@lix.systems>2024-03-09 07:00:13 -0700
commitb221a14f0a477db06f8ab705bd08404e431ec135 (patch)
tree33cab3bfa39ca17a070e1afca13e531052021eee /src/libexpr/eval-error.cc
parent3d9c7fc1e72e3471ae35c96ec418e8ac0913b099 (diff)
Merge pull request #9925 from 9999years/fmt-cleanup
Cleanup `fmt.hh` (cherry picked from commit 47a1dbb4b8e7913cbb9b4d604728b912e76e4ca0) Change-Id: Id076a45cb39652f437fe3f8bda10c310a9894777
Diffstat (limited to 'src/libexpr/eval-error.cc')
-rw-r--r--src/libexpr/eval-error.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libexpr/eval-error.cc b/src/libexpr/eval-error.cc
index 250c59a19..f4cdeec5c 100644
--- a/src/libexpr/eval-error.cc
+++ b/src/libexpr/eval-error.cc
@@ -28,7 +28,7 @@ template<class T>
EvalErrorBuilder<T> & EvalErrorBuilder<T>::withTrace(PosIdx pos, const std::string_view text)
{
error.err.traces.push_front(
- Trace{.pos = error.state.positions[pos], .hint = hintfmt(std::string(text)), .frame = false});
+ Trace{.pos = error.state.positions[pos], .hint = HintFmt(std::string(text)), .frame = false});
return *this;
}
@@ -36,7 +36,7 @@ template<class T>
EvalErrorBuilder<T> & EvalErrorBuilder<T>::withFrameTrace(PosIdx pos, const std::string_view text)
{
error.err.traces.push_front(
- Trace{.pos = error.state.positions[pos], .hint = hintformat(std::string(text)), .frame = true});
+ Trace{.pos = error.state.positions[pos], .hint = HintFmt(std::string(text)), .frame = true});
return *this;
}
@@ -57,13 +57,13 @@ EvalErrorBuilder<T> & EvalErrorBuilder<T>::withFrame(const Env & env, const Expr
.pos = error.state.positions[expr.getPos()],
.expr = expr,
.env = env,
- .hint = hintformat("Fake frame for debugging purposes"),
+ .hint = HintFmt("Fake frame for debugging purposes"),
.isError = true});
return *this;
}
template<class T>
-EvalErrorBuilder<T> & EvalErrorBuilder<T>::addTrace(PosIdx pos, hintformat hint, bool frame)
+EvalErrorBuilder<T> & EvalErrorBuilder<T>::addTrace(PosIdx pos, HintFmt hint, bool frame)
{
error.addTrace(error.state.positions[pos], hint, frame);
return *this;
@@ -75,7 +75,7 @@ EvalErrorBuilder<T> &
EvalErrorBuilder<T>::addTrace(PosIdx pos, std::string_view formatString, const Args &... formatArgs)
{
- addTrace(error.state.positions[pos], hintfmt(std::string(formatString), formatArgs...));
+ addTrace(error.state.positions[pos], HintFmt(std::string(formatString), formatArgs...));
return *this;
}