From 09af8a667c0fa456bbe62fa462f4b0f42f2845ec Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <n.nethercote@gmail.com>
Date: Mon, 18 Dec 2023 06:21:26 +1100
Subject: Rename `Session::span_diagnostic` as `Session::dcx`.

---
 compiler/rustc_query_system/src/dep_graph/graph.rs | 2 +-
 compiler/rustc_query_system/src/query/job.rs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'compiler/rustc_query_system/src')

diff --git a/compiler/rustc_query_system/src/dep_graph/graph.rs b/compiler/rustc_query_system/src/dep_graph/graph.rs
index 3b8ccb67bbe..d11444c8dfe 100644
--- a/compiler/rustc_query_system/src/dep_graph/graph.rs
+++ b/compiler/rustc_query_system/src/dep_graph/graph.rs
@@ -924,7 +924,7 @@ impl<D: Deps> DepGraphData<D> {
             // Promote the previous diagnostics to the current session.
             qcx.store_side_effects(dep_node_index, side_effects.clone());
 
-            let handle = qcx.dep_context().sess().diagnostic();
+            let handle = qcx.dep_context().sess().dcx();
 
             for diagnostic in side_effects.diagnostics {
                 handle.emit_diagnostic(diagnostic);
diff --git a/compiler/rustc_query_system/src/query/job.rs b/compiler/rustc_query_system/src/query/job.rs
index 8847bc72974..8c63105d670 100644
--- a/compiler/rustc_query_system/src/query/job.rs
+++ b/compiler/rustc_query_system/src/query/job.rs
@@ -604,7 +604,7 @@ pub(crate) fn report_cycle<'a>(
         note_span: (),
     };
 
-    cycle_diag.into_diagnostic(sess.diagnostic())
+    cycle_diag.into_diagnostic(sess.dcx())
 }
 
 pub fn print_query_stack<Qcx: QueryContext>(
-- 
cgit 1.4.1-3-g733a5