yshui/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Remove unused Error.name field

Browse source
This commit is contained in:
Eelco Dolstra 2022-04-06 13:02:26 +02:00
parent 8b1e328d5d
commit 168ef9f3ab
4 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/libstore/sqlite.cc
View file

@ -215,7 +215,6 @@ void handleSQLiteBusy(const SQLiteBusy & e)
if (now > lastWarned + 10) { if (now > lastWarned + 10) {
lastWarned = now; lastWarned = now;
logWarning({ logWarning({
.name = "Sqlite busy",
.msg = hintfmt(e.what()) .msg = hintfmt(e.what())
}); });
} }

3
src/libutil/error.cc
View file

@ -21,12 +21,9 @@ const std::string & BaseError::calcWhat() const
if (what_.has_value()) if (what_.has_value())
return *what_; return *what_;
else { else {
err.name = sname();
std::ostringstream oss; std::ostringstream oss;
showErrorInfo(oss, err, loggerSettings.showTrace); showErrorInfo(oss, err, loggerSettings.showTrace);
what_ = oss.str(); what_ = oss.str();
return *what_; return *what_;
} }
} }

1
src/libutil/error.hh
View file

@ -109,7 +109,6 @@ struct Trace {
struct ErrorInfo { struct ErrorInfo {
Verbosity level; Verbosity level;
std::string name; // FIXME: rename
hintformat msg; hintformat msg;
std::optional<ErrPos> errPos; std::optional<ErrPos> errPos;
std::list<Trace> traces; std::list<Trace> traces;

5
src/libutil/serialise.cc
View file

@ -357,7 +357,7 @@ Sink & operator << (Sink & sink, const Error & ex)
sink sink
<< "Error" << "Error"
<< info.level << info.level
<< info.name << "Error" // removed
<< info.msg.str() << info.msg.str()
<< 0 // FIXME: info.errPos << 0 // FIXME: info.errPos
<< info.traces.size(); << info.traces.size();
@ -426,11 +426,10 @@ Error readError(Source & source)
auto type = readString(source); auto type = readString(source);
assert(type == "Error"); assert(type == "Error");
auto level = (Verbosity) readInt(source); auto level = (Verbosity) readInt(source);
auto name = readString(source); auto name = readString(source); // removed
auto msg = readString(source); auto msg = readString(source);
ErrorInfo info { ErrorInfo info {
.level = level, .level = level,
.name = name,
.msg = hintformat(std::move(format("%s") % msg)), .msg = hintformat(std::move(format("%s") % msg)),
}; };
auto havePos = readNum<size_t>(source); auto havePos = readNum<size_t>(source);