Skip to content

Commit 45c82ab

Browse files
committed
Distinguish depending on error level
Remove unnecessary comment
1 parent 70a497a commit 45c82ab

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

src/librustc_errors/emitter.rs

+14-3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use crate::{
66
Level, CodeSuggestion, DiagnosticBuilder, SubDiagnostic,
77
SuggestionStyle, SourceMapperDyn, DiagnosticId,
88
};
9+
use crate::Level::Error;
910
use crate::snippet::{Annotation, AnnotationType, Line, MultilineAnnotation, StyledString, Style};
1011
use crate::styled_buffer::StyledBuffer;
1112

@@ -72,6 +73,7 @@ impl Emitter for EmitterWriter {
7273

7374
self.fix_multispans_in_std_macros(&mut primary_span,
7475
&mut children,
76+
&db.level,
7577
db.handler.flags.external_macro_backtrace);
7678

7779
self.emit_messages_default(&db.level,
@@ -856,18 +858,27 @@ impl EmitterWriter {
856858
fn fix_multispans_in_std_macros(&mut self,
857859
span: &mut MultiSpan,
858860
children: &mut Vec<SubDiagnostic>,
861+
level: &Level,
859862
backtrace: bool) {
860863
let mut spans_updated = self.fix_multispan_in_std_macros(span, backtrace);
861864
for child in children.iter_mut() {
862865
spans_updated |= self.fix_multispan_in_std_macros(&mut child.span, backtrace);
863866
}
867+
let msg = if level == &Error {
868+
"this error originates in a macro outside of the current crate \
869+
(in Nightly builds, run with -Z external-macro-backtrace \
870+
for more info)".to_string()
871+
} else {
872+
"this warning originates in a macro outside of the current crate \
873+
(in Nightly builds, run with -Z external-macro-backtrace \
874+
for more info)".to_string()
875+
};
876+
864877
if spans_updated {
865878
children.push(SubDiagnostic {
866879
level: Level::Note,
867880
message: vec![
868-
("this error originates in a macro outside of the current crate \
869-
(in Nightly builds, run with -Z external-macro-backtrace \
870-
for more info)".to_string(),
881+
(msg,
871882
Style::NoStyle),
872883
],
873884
span: MultiSpan::new(),

src/test/ui/imports/import-crate-var.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ LL | m!();
55
| ^^^^^
66
|
77
= note: `use $crate;` was erroneously allowed and will become a hard error in a future release
8-
= note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
8+
= note: this warning originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
99

src/test/ui/macros/must-use-in-macro-55516.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ LL | write!(&mut example, "{}", 42);
66
|
77
= note: `-W unused-must-use` implied by `-W unused`
88
= note: this `Result` may be an `Err` variant, which should be handled
9-
= note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
9+
= note: this warning originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
1010

0 commit comments

Comments
 (0)