summaryrefslogtreecommitdiff
path: root/src/span.cpp
diff options
context:
space:
mode:
authorJohn Hodge <tpg@ucc.asn.au>2019-11-02 11:07:23 +0800
committerJohn Hodge <tpg@ucc.asn.au>2019-11-02 11:07:23 +0800
commit1d02810c3cf908bfba7c15ae50eb5314603b9d85 (patch)
tree79dd5e4ef4c3ff79db0912ba546f08e61a7a8c10 /src/span.cpp
parent7111acba04d72fe4084b1a1f3209ff83efe8614d (diff)
parent8b53b38f40625ab0510f541d69db3f83332a830a (diff)
downloadmrust-1d02810c3cf908bfba7c15ae50eb5314603b9d85.tar.gz
Merge branch 'nightly-1.29' - #95 Working support for rustc 1.29
Diffstat (limited to 'src/span.cpp')
-rw-r--r--src/span.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/span.cpp b/src/span.cpp
index 34f2637e..7e3968d1 100644
--- a/src/span.cpp
+++ b/src/span.cpp
@@ -22,7 +22,7 @@ Span::Span(const Position& pos):
}
Span::Span():
outer_span(),
- filename("")/*,
+ filename(""),
start_line(0), start_ofs(0),
end_line(0), end_ofs(0) // */
{
@@ -66,10 +66,10 @@ void Span::error(ErrorType tag, ::std::function<void(::std::ostream&)> msg) cons
#endif
}
void Span::warning(WarningType tag, ::std::function<void(::std::ostream&)> msg) const {
- print_span_message(*this, [&](auto& os){os << "warning" << tag;}, msg);
+ print_span_message(*this, [&](auto& os){os << "warn:" << tag;}, msg);
}
void Span::note(::std::function<void(::std::ostream&)> msg) const {
- print_span_message(*this, [](auto& os){os << "note";}, msg);
+ print_span_message(*this, [](auto& os){os << "note:";}, msg);
}
::std::ostream& operator<<(::std::ostream& os, const Span& sp)