aboutsummaryrefslogtreecommitdiff
path: root/src/libutil/serialise.cc
diff options
context:
space:
mode:
authorBen Burdette <bburdette@protonmail.com>2022-04-15 14:49:08 -0600
committerBen Burdette <bburdette@protonmail.com>2022-04-15 14:49:08 -0600
commit93b8d315087921b0a024bf87555ac6c3bca6882d (patch)
tree6d1215c6ed2840a71aee94bae892b1fd219bf17c /src/libutil/serialise.cc
parent8b197c492e4e2878eb58bb2994fb8d7f8044bf90 (diff)
parentb135de2b5f08aa8b549d69371823235124ef04a1 (diff)
Merge branch 'master' into debug-exploratory-PR
Diffstat (limited to 'src/libutil/serialise.cc')
-rw-r--r--src/libutil/serialise.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libutil/serialise.cc b/src/libutil/serialise.cc
index 6445b3f1b..8ff904583 100644
--- a/src/libutil/serialise.cc
+++ b/src/libutil/serialise.cc
@@ -357,7 +357,7 @@ Sink & operator << (Sink & sink, const Error & ex)
sink
<< "Error"
<< info.level
- << info.name
+ << "Error" // removed
<< info.msg.str()
<< 0 // FIXME: info.errPos
<< info.traces.size();
@@ -426,11 +426,10 @@ Error readError(Source & source)
auto type = readString(source);
assert(type == "Error");
auto level = (Verbosity) readInt(source);
- auto name = readString(source);
+ auto name = readString(source); // removed
auto msg = readString(source);
ErrorInfo info {
.level = level,
- .name = name,
.msg = hintformat(std::move(format("%s") % msg)),
};
auto havePos = readNum<size_t>(source);