Simplify future breakage control flow.

nnethercote · nnethercote · commit 6d31ac2f5029 · 2024-02-02T14:38:49.000+11:00
`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.
diff --git a/compiler/rustc_errors/src/lib.rs b/compiler/rustc_errors/src/lib.rs
@@ -1038,10 +1038,6 @@ impl DiagCtxt {
         }
     }
 
-    pub fn take_future_breakage_diagnostics(&self) -> Vec<Diagnostic> {
-        std::mem::take(&mut self.inner.borrow_mut().future_breakage_diagnostics)
-    }
-
     pub fn abort_if_errors(&self) {
         let mut inner = self.inner.borrow_mut();
         inner.emit_stashed_diagnostics();
@@ -1149,8 +1145,12 @@ impl DiagCtxt {
         self.inner.borrow_mut().emitter.emit_artifact_notification(path, artifact_type);
     }
 
-    pub fn emit_future_breakage_report(&self, diags: Vec<Diagnostic>) {
-        self.inner.borrow_mut().emitter.emit_future_breakage_report(diags)
+    pub fn emit_future_breakage_report(&self) {
+        let mut inner = self.inner.borrow_mut();
+        let diags = std::mem::take(&mut inner.future_breakage_diagnostics);
+        if !diags.is_empty() {
+            inner.emitter.emit_future_breakage_report(diags);
+        }
     }
 
     pub fn emit_unused_externs(
diff --git a/compiler/rustc_session/src/session.rs b/compiler/rustc_session/src/session.rs
@@ -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;
-        }
-
-        let diags = self.dcx().take_future_breakage_diagnostics();
-        if diags.is_empty() {
-            return;
+        if self.opts.json_future_incompat {
+            self.dcx().emit_future_breakage_report();
         }
-        self.dcx().emit_future_breakage_report(diags);
     }
 
     /// Returns true if the crate is a testing one.

Original file line number	Diff line number	Diff line change
`@@ -1038,10 +1038,6 @@ impl DiagCtxt {`
`1038`	`1038`	`}`
`1039`	`1039`	`}`
`1040`	`1040`
`1041`		`- pub fn take_future_breakage_diagnostics(&self) -> Vec<Diagnostic> {`
`1042`		`- std::mem::take(&mut self.inner.borrow_mut().future_breakage_diagnostics)`
`1043`		`- }`
`1044`		`-`
`1045`	`1041`	`pub fn abort_if_errors(&self) {`
`1046`	`1042`	`let mut inner = self.inner.borrow_mut();`
`1047`	`1043`	`inner.emit_stashed_diagnostics();`
`@@ -1149,8 +1145,12 @@ impl DiagCtxt {`
`1149`	`1145`	`self.inner.borrow_mut().emitter.emit_artifact_notification(path, artifact_type);`
`1150`	`1146`	`}`
`1151`	`1147`
`1152`		`- pub fn emit_future_breakage_report(&self, diags: Vec<Diagnostic>) {`
`1153`		`- self.inner.borrow_mut().emitter.emit_future_breakage_report(diags)`
	`1148`	`+ pub fn emit_future_breakage_report(&self) {`
	`1149`	`+ let mut inner = self.inner.borrow_mut();`
	`1150`	`+ let diags = std::mem::take(&mut inner.future_breakage_diagnostics);`
	`1151`	`+ if !diags.is_empty() {`
	`1152`	`+ inner.emitter.emit_future_breakage_report(diags);`
	`1153`	`+ }`
`1154`	`1154`	`}`
`1155`	`1155`
`1156`	`1156`	`pub fn emit_unused_externs(`