Skip to content

Commit 39895b0

Browse files
committed
Add constructor for Diagnostic that takes Vec<(DiagnosticMessage, Style)>
1 parent 0baac88 commit 39895b0

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

Diff for: compiler/rustc_codegen_ssa/src/back/write.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1787,8 +1787,7 @@ impl SharedEmitterMain {
17871787
match message {
17881788
Ok(SharedEmitterMessage::Diagnostic(diag)) => {
17891789
let handler = sess.diagnostic();
1790-
let mut d = rustc_errors::Diagnostic::new(diag.lvl, String::new());
1791-
d.message = diag.msg;
1790+
let mut d = rustc_errors::Diagnostic::new_with_messages(diag.lvl, diag.msg);
17921791
if let Some(code) = diag.code {
17931792
d.code(code);
17941793
}

Diff for: compiler/rustc_errors/src/diagnostic.rs

+15
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,21 @@ impl Diagnostic {
213213
Diagnostic::new_with_code(level, None, message)
214214
}
215215

216+
#[track_caller]
217+
pub fn new_with_messages(level: Level, messages: Vec<(DiagnosticMessage, Style)>) -> Self {
218+
Diagnostic {
219+
level,
220+
message: messages,
221+
code: None,
222+
span: MultiSpan::new(),
223+
children: vec![],
224+
suggestions: Ok(vec![]),
225+
args: Default::default(),
226+
sort_span: DUMMY_SP,
227+
is_lint: false,
228+
}
229+
}
230+
216231
#[track_caller]
217232
pub fn new_with_code<M: Into<DiagnosticMessage>>(
218233
level: Level,

0 commit comments

Comments
 (0)