bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Simplify future breakage control flow.

Browse source 
`emit_future_breakage` calls
`self.dcx().take_future_breakage_diagnostics()` and then passes the
result to `self.dcx().emit_future_breakage_report(diags)`. This commit
removes the first of these and lets `emit_future_breakage_report` do the
taking.

It also inlines and removes what is left of `emit_future_breakage`,
which has a single call site.
This commit is contained in:
Nicholas Nethercote 2024-02-02 14:30:37 +11:00
parent b506cce579
commit 0621cd46f2
2 changed files with 8 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_session/src/session.rs
View file

@ -288,19 +288,9 @@ impl Session {
pub fn finish_diagnostics(&self, registry: &Registry) {
self.check_miri_unleashed_features();
self.dcx().print_error_count(registry);
self.emit_future_breakage();
}
fn emit_future_breakage(&self) {
if !self.opts.json_future_incompat {
return;
if self.opts.json_future_incompat {
self.dcx().emit_future_breakage_report();
}
let diags = self.dcx().take_future_breakage_diagnostics();
if diags.is_empty() {
return;
}
self.dcx().emit_future_breakage_report(diags);
}
/// Returns true if the crate is a testing one.