diff options
| author | Ben Burdette <bburdette@gmail.com> | 2020-03-27 10:55:09 -0600 |
|---|---|---|
| committer | Ben Burdette <bburdette@gmail.com> | 2020-03-27 10:55:09 -0600 |
| commit | 759f39800bb80eaa297ea2532b1640959487ed9c (patch) | |
| tree | 40843336cd4ca3cc39f05dfb6c0ef750fac6e930 /src/libutil/error.hh | |
| parent | 00eb3fcb7a19a38d5ca94f4dcbda149f16e73a6e (diff) | |
remove util.hh from deps
Diffstat (limited to 'src/libutil/error.hh')
| -rw-r--r-- | src/libutil/error.hh | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/src/libutil/error.hh b/src/libutil/error.hh index f02d7288a..88980afb7 100644 --- a/src/libutil/error.hh +++ b/src/libutil/error.hh @@ -1,11 +1,13 @@ #pragma once -#include "util.hh" +#include "ansicolor.hh" #include <string> #include <optional> #include <iostream> #include <iomanip> +#include <boost/format.hpp> + using std::string; using std::optional; using boost::format; @@ -251,8 +253,14 @@ class AddHint : private T // -------------------------------------------------------- // error types -typedef AddName<AddDescription<AddHint<EIError>>> StandardError; -typedef AddName<AddDescription<AddHint<EIWarning>>> StandardWarning; +typedef AddName< + AddDescription< + AddHint< + EIError>>> StandardError; +typedef AddName< + AddDescription< + AddHint< + EIWarning>>> StandardWarning; typedef AddName< AddDescription< @@ -260,13 +268,16 @@ typedef AddName< AddLineNumber< AddColumnRange< AddLOC< - AddHint<EIError>>>>>>> MkNixError; + AddHint< + EIError>>>>>>> MkNixError; typedef AddName< AddDescription< AddNixFile< AddLineNumber< AddColumnRange< - AddLOC<EIWarning>>>>>> MkNixWarning; + AddLOC< + AddHint< + EIWarning>>>>>>> MkNixWarning; // -------------------------------------------------------- @@ -274,9 +285,5 @@ typedef AddName< void printErrorInfo(ErrorInfo &einfo); -string showErrLine(ErrLine &errLine); - -void printCodeLines(string &prefix, NixCode &nixCode); - } |