mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Introduce DiagCtxt::treat_next_err_as_bug.

Browse source 
To fix a FIXME.
This commit is contained in:
Nicholas Nethercote 2023-12-20 10:18:08 +11:00
parent 6f147afea9
commit 1502596ca2
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
compiler/rustc_errors/src/lib.rs
View file

@ -992,13 +992,7 @@ impl DiagCtxt {
msg: impl Into<DiagnosticMessage>,
) -> ErrorGuaranteed {
let mut inner = self.inner.borrow_mut();
// This is technically `self.treat_err_as_bug()` but `span_delayed_bug` is called before
// incrementing `err_count` by one, so we need to +1 the comparing.
// FIXME: Would be nice to increment err_count in a more coherent way.
if inner.flags.treat_err_as_bug.is_some_and(|c| {
inner.err_count + inner.lint_err_count + inner.delayed_bug_count() + 1 >= c.get()
}) {
if inner.treat_next_err_as_bug() {
// FIXME: don't abort here if report_delayed_bugs is off
inner.span_bug(sp, msg);
}
@ -1519,6 +1513,13 @@ impl DiagCtxtInner {
})
}
// Use this one before incrementing `err_count`.
fn treat_next_err_as_bug(&self) -> bool {
self.flags.treat_err_as_bug.is_some_and(|c| {
self.err_count + self.lint_err_count + self.delayed_bug_count() + 1 >= c.get()
})
}
fn delayed_bug_count(&self) -> usize {
self.span_delayed_bugs.len() + self.good_path_delayed_bugs.len()
}