Skip to content

Commit 7592663

Browse files
committed
rustc_errors: add downgrade_to_delayed_bug to Diagnostic itself.
1 parent 3572c54 commit 7592663

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

src/parse/session.rs

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ impl Emitter for SilentOnIgnoredFilesEmitter {
6060
None
6161
}
6262
fn emit_diagnostic(&mut self, db: &Diagnostic) {
63-
if db.level == DiagnosticLevel::Fatal {
63+
if db.level() == DiagnosticLevel::Fatal {
6464
return self.handle_non_ignoreable_error(db);
6565
}
6666
if let Some(primary_span) = &db.span.primary_span() {
@@ -292,7 +292,7 @@ mod tests {
292292
use super::*;
293293
use crate::config::IgnoreList;
294294
use crate::utils::mk_sp;
295-
use rustc_span::{FileName as SourceMapFileName, MultiSpan, RealFileName, DUMMY_SP};
295+
use rustc_span::{FileName as SourceMapFileName, MultiSpan, RealFileName};
296296
use std::path::PathBuf;
297297
use std::sync::atomic::AtomicU32;
298298

@@ -310,16 +310,12 @@ mod tests {
310310
}
311311

312312
fn build_diagnostic(level: DiagnosticLevel, span: Option<MultiSpan>) -> Diagnostic {
313-
Diagnostic {
314-
level,
315-
code: None,
316-
message: vec![],
317-
children: vec![],
318-
suggestions: Ok(vec![]),
319-
span: span.unwrap_or_else(MultiSpan::new),
320-
sort_span: DUMMY_SP,
321-
is_lint: false,
313+
let mut diag = Diagnostic::new(level, "");
314+
diag.message.clear();
315+
if let Some(span) = span {
316+
diag.span = span;
322317
}
318+
diag
323319
}
324320

325321
fn build_emitter(

0 commit comments

Comments
 (0)