wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 16:51:15 +02:00
Code Activity

remove util.hh from deps

Browse source
This commit is contained in:
Ben Burdette 2020-03-27 10:55:09 -06:00
parent 00eb3fcb7a
commit 759f39800b
4 changed files with 31 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/libutil/error.hh
View file

@ -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);
}