Auto merge of #3241 - rust-lang:rustup-2023-12-26, r=RalfJung

Automatic Rustup

1 files changed, 8 insertions, 6 deletions

diff --git a/compiler/rustc_driver_impl/src/lib.rs b/compiler/rustc_driver_impl/src/lib.rs
index c277304fb22..ca6b0afc76a 100644
--- a/compiler/rustc_driver_impl/src/lib.rs
+++ b/compiler/rustc_driver_impl/src/lib.rs
@@ -150,7 +150,7 @@ pub const DEFAULT_BUG_REPORT_URL: &str = "https://github.com/rust-lang/rust/issu
 pub fn abort_on_err<T>(result: Result<T, ErrorGuaranteed>, sess: &Session) -> T {
     match result {
         Err(..) => {
-            sess.abort_if_errors();
+            sess.dcx().abort_if_errors();
             panic!("error reported but abort_if_errors didn't abort???");
         }
         Ok(x) => x,
@@ -640,20 +640,22 @@ fn show_md_content_with_pager(content: &str, color: ColorConfig) {
 
 fn process_rlink(sess: &Session, compiler: &interface::Compiler) {
     assert!(sess.opts.unstable_opts.link_only);
+    let dcx = sess.dcx();
     if let Input::File(file) = &sess.io.input {
         let rlink_data = fs::read(file).unwrap_or_else(|err| {
-            sess.emit_fatal(RlinkUnableToRead { err });
+            dcx.emit_fatal(RlinkUnableToRead { err });
         });
         let (codegen_results, outputs) = match CodegenResults::deserialize_rlink(sess, rlink_data) {
             Ok((codegen, outputs)) => (codegen, outputs),
             Err(err) => {
                 match err {
-                    CodegenErrors::WrongFileType => sess.emit_fatal(RLinkWrongFileType),
-                    CodegenErrors::EmptyVersionNumber => sess.emit_fatal(RLinkEmptyVersionNumber),
+                    CodegenErrors::WrongFileType => dcx.emit_fatal(RLinkWrongFileType),
+                    CodegenErrors::EmptyVersionNumber => dcx.emit_fatal(RLinkEmptyVersionNumber),
                     CodegenErrors::EncodingVersionMismatch { version_array, rlink_version } => sess
+                        .dcx()
                         .emit_fatal(RLinkEncodingVersionMismatch { version_array, rlink_version }),
                     CodegenErrors::RustcVersionMismatch { rustc_version } => {
-                        sess.emit_fatal(RLinkRustcVersionMismatch {
+                        dcx.emit_fatal(RLinkRustcVersionMismatch {
                             rustc_version,
                             current_version: sess.cfg_version,
                         })
@@ -664,7 +666,7 @@ fn process_rlink(sess: &Session, compiler: &interface::Compiler) {
         let result = compiler.codegen_backend.link(sess, codegen_results, &outputs);
         abort_on_err(result, sess);
     } else {
-        sess.emit_fatal(RlinkNotAFile {})
+        dcx.emit_fatal(RlinkNotAFile {})
     }
 }