mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid repetition in flush_delayed calls.

Browse Source 
There are two places that handle normal delayed bugs. This commit
factors out some repeated code.

Also, we can use `std::mem::take` instead of `std::mem::replace`.
This commit is contained in:
Nicholas Nethercote 2024-01-12 08:04:22 +11:00
parent 62d7ed4a67
commit 3330940f7f
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
compiler/rustc_errors/src/lib.rs
View File

@ -519,6 +519,11 @@ fn default_track_diagnostic(diag: Diagnostic, f: &mut dyn FnMut(Diagnostic)) {
pub static TRACK_DIAGNOSTIC: AtomicRef<fn(Diagnostic, &mut dyn FnMut(Diagnostic))> = pub static TRACK_DIAGNOSTIC: AtomicRef<fn(Diagnostic, &mut dyn FnMut(Diagnostic))> =
AtomicRef::new(&(default_track_diagnostic as _)); AtomicRef::new(&(default_track_diagnostic as _));
enum DelayedBugKind {
Normal,
GoodPath,
}
#[derive(Copy, Clone, Default)] #[derive(Copy, Clone, Default)]
pub struct DiagCtxtFlags { pub struct DiagCtxtFlags {
/// If false, warning-level lints are suppressed. /// If false, warning-level lints are suppressed.
@ -541,8 +546,7 @@ impl Drop for DiagCtxtInner {
self.emit_stashed_diagnostics(); self.emit_stashed_diagnostics();
if !self.has_errors() { if !self.has_errors() {
let bugs = std::mem::replace(&mut self.span_delayed_bugs, Vec::new()); self.flush_delayed(DelayedBugKind::Normal)
self.flush_delayed(bugs, "no errors encountered even though `span_delayed_bug` issued");
} }
// FIXME(eddyb) this explains what `good_path_delayed_bugs` are! // FIXME(eddyb) this explains what `good_path_delayed_bugs` are!
@ -551,11 +555,7 @@ impl Drop for DiagCtxtInner {
// lints can be `#[allow]`'d, potentially leading to this triggering. // lints can be `#[allow]`'d, potentially leading to this triggering.
// Also, "good path" should be replaced with a better naming. // Also, "good path" should be replaced with a better naming.
if !self.has_printed && !self.suppressed_expected_diag && !std::thread::panicking() { if !self.has_printed && !self.suppressed_expected_diag && !std::thread::panicking() {
let bugs = std::mem::replace(&mut self.good_path_delayed_bugs, Vec::new()); self.flush_delayed(DelayedBugKind::GoodPath);
self.flush_delayed(
bugs,
"no warnings or errors encountered even though `good_path_delayed_bugs` issued",
);
} }
if self.check_unstable_expect_diagnostics { if self.check_unstable_expect_diagnostics {
@ -1218,9 +1218,7 @@ impl DiagCtxt {
} }
pub fn flush_delayed(&self) { pub fn flush_delayed(&self) {
let mut inner = self.inner.borrow_mut(); self.inner.borrow_mut().flush_delayed(DelayedBugKind::Normal);
let bugs = std::mem::replace(&mut inner.span_delayed_bugs, Vec::new());
inner.flush_delayed(bugs, "no errors encountered even though `span_delayed_bug` issued");
} }
} }
@ -1396,11 +1394,18 @@ impl DiagCtxtInner {
self.emit_diagnostic(Diagnostic::new(FailureNote, msg)); self.emit_diagnostic(Diagnostic::new(FailureNote, msg));
} }
fn flush_delayed( fn flush_delayed(&mut self, kind: DelayedBugKind) {
&mut self, let (bugs, explanation) = match kind {
bugs: Vec<DelayedDiagnostic>, DelayedBugKind::Normal => (
explanation: impl Into<DiagnosticMessage> + Copy, std::mem::take(&mut self.span_delayed_bugs),
) { "no errors encountered even though `span_delayed_bug` issued",
),
DelayedBugKind::GoodPath => (
std::mem::take(&mut self.good_path_delayed_bugs),
"no warnings or errors encountered even though `good_path_delayed_bugs` issued",
),
};
if bugs.is_empty() { if bugs.is_empty() {
return; return;
} }