Avoid a couple of unnecessary EarlyDiagCtxt uses

bjorn3 · bjorn3 · commit 8d1f5b30efc2 · 2024-06-22T17:06:47.000Z
diff --git a/compiler/rustc_driver_impl/src/lib.rs b/compiler/rustc_driver_impl/src/lib.rs
@@ -367,18 +367,17 @@ fn run_compiler(
             return early_exit();
         }
 
-        let early_dcx = EarlyDiagCtxt::new(sess.opts.error_format);
-
-        if print_crate_info(&early_dcx, codegen_backend, sess, has_input) == Compilation::Stop {
+        if print_crate_info(codegen_backend, sess, has_input) == Compilation::Stop {
             return early_exit();
         }
 
         if !has_input {
-            early_dcx.early_fatal("no input filename given"); // this is fatal
+            #[allow(rustc::diagnostic_outside_of_impl)]
+            sess.dcx().fatal("no input filename given"); // this is fatal
         }
 
         if !sess.opts.unstable_opts.ls.is_empty() {
-            list_metadata(&early_dcx, sess, &*codegen_backend.metadata_loader());
+            list_metadata(sess, &*codegen_backend.metadata_loader());
             return early_exit();
         }
 
@@ -674,7 +673,7 @@ fn process_rlink(sess: &Session, compiler: &interface::Compiler) {
     }
 }
 
-fn list_metadata(early_dcx: &EarlyDiagCtxt, sess: &Session, metadata_loader: &dyn MetadataLoader) {
+fn list_metadata(sess: &Session, metadata_loader: &dyn MetadataLoader) {
     match sess.io.input {
         Input::File(ref ifile) => {
             let path = &(*ifile);
@@ -691,13 +690,13 @@ fn list_metadata(early_dcx: &EarlyDiagCtxt, sess: &Session, metadata_loader: &dy
             safe_println!("{}", String::from_utf8(v).unwrap());
         }
         Input::Str { .. } => {
-            early_dcx.early_fatal("cannot list metadata for stdin");
+            #[allow(rustc::diagnostic_outside_of_impl)]
+            sess.dcx().fatal("cannot list metadata for stdin");
         }
     }
 }
 
 fn print_crate_info(
-    early_dcx: &EarlyDiagCtxt,
     codegen_backend: &dyn CodegenBackend,
     sess: &Session,
     parse_attrs: bool,
@@ -881,8 +880,8 @@ fn print_crate_info(
                         .expect("unknown Apple target OS");
                     println_info!("deployment_target={}", format!("{major}.{minor}"))
                 } else {
-                    early_dcx
-                        .early_fatal("only Apple targets currently support deployment version info")
+                    #[allow(rustc::diagnostic_outside_of_impl)]
+                    sess.dcx().fatal("only Apple targets currently support deployment version info")
                 }
             }
         }
diff --git a/tests/run-make/jobserver-error/cannot_open_fd.stderr b/tests/run-make/jobserver-error/cannot_open_fd.stderr
@@ -4,3 +4,5 @@ warning: failed to connect to jobserver from environment variable `MAKEFLAGS="--
 
 error: no input filename given
 
+error: aborting due to 1 previous error
+
diff --git a/tests/run-make/no-input-file/rmake.rs b/tests/run-make/no-input-file/rmake.rs
@@ -1,9 +1,9 @@
 use run_make_support::rustc;
 
 fn main() {
-    rustc()
-        .print("crate-name")
-        .run_fail()
-        .assert_exit_code(1)
-        .assert_stderr_equals("error: no input filename given");
+    rustc().print("crate-name").run_fail().assert_exit_code(1).assert_stderr_equals(
+        "error: no input filename given
+
+error: aborting due to 1 previous error",
+    );
 }
diff --git a/tests/ui/deployment-target/invalid-target.stderr b/tests/ui/deployment-target/invalid-target.stderr
@@ -1,2 +1,4 @@
 error: only Apple targets currently support deployment version info
 
+error: aborting due to 1 previous error
+

Original file line number	Diff line number	Diff line change
`@@ -367,18 +367,17 @@ fn run_compiler(`
`367`	`367`	`return early_exit();`
`368`	`368`	`}`
`369`	`369`
`370`		`- let early_dcx = EarlyDiagCtxt::new(sess.opts.error_format);`
`371`		`-`
`372`		`- if print_crate_info(&early_dcx, codegen_backend, sess, has_input) == Compilation::Stop {`
	`370`	`+ if print_crate_info(codegen_backend, sess, has_input) == Compilation::Stop {`
`373`	`371`	`return early_exit();`
`374`	`372`	`}`
`375`	`373`
`376`	`374`	`if !has_input {`
`377`		`- early_dcx.early_fatal("no input filename given"); // this is fatal`
	`375`	`+ #[allow(rustc::diagnostic_outside_of_impl)]`
	`376`	`+ sess.dcx().fatal("no input filename given"); // this is fatal`
`378`	`377`	`}`
`379`	`378`
`380`	`379`	`if !sess.opts.unstable_opts.ls.is_empty() {`
`381`		`- list_metadata(&early_dcx, sess, &*codegen_backend.metadata_loader());`
	`380`	`+ list_metadata(sess, &*codegen_backend.metadata_loader());`
`382`	`381`	`return early_exit();`
`383`	`382`	`}`
`384`	`383`
`@@ -674,7 +673,7 @@ fn process_rlink(sess: &Session, compiler: &interface::Compiler) {`
`674`	`673`	`}`
`675`	`674`	`}`
`676`	`675`
`677`		`-fn list_metadata(early_dcx: &EarlyDiagCtxt, sess: &Session, metadata_loader: &dyn MetadataLoader) {`
	`676`	`+fn list_metadata(sess: &Session, metadata_loader: &dyn MetadataLoader) {`
`678`	`677`	`match sess.io.input {`
`679`	`678`	`Input::File(ref ifile) => {`
`680`	`679`	`let path = &(*ifile);`
`@@ -691,13 +690,13 @@ fn list_metadata(early_dcx: &EarlyDiagCtxt, sess: &Session, metadata_loader: &dy`
`691`	`690`	`safe_println!("{}", String::from_utf8(v).unwrap());`
`692`	`691`	`}`
`693`	`692`	`Input::Str { .. } => {`
`694`		`- early_dcx.early_fatal("cannot list metadata for stdin");`
	`693`	`+ #[allow(rustc::diagnostic_outside_of_impl)]`
	`694`	`+ sess.dcx().fatal("cannot list metadata for stdin");`
`695`	`695`	`}`
`696`	`696`	`}`
`697`	`697`	`}`
`698`	`698`
`699`	`699`	`fn print_crate_info(`
`700`		`- early_dcx: &EarlyDiagCtxt,`
`701`	`700`	`codegen_backend: &dyn CodegenBackend,`
`702`	`701`	`sess: &Session,`
`703`	`702`	`parse_attrs: bool,`
`@@ -881,8 +880,8 @@ fn print_crate_info(`
`881`	`880`	`.expect("unknown Apple target OS");`
`882`	`881`	`println_info!("deployment_target={}", format!("{major}.{minor}"))`
`883`	`882`	`} else {`
`884`		`- early_dcx`
`885`		`- .early_fatal("only Apple targets currently support deployment version info")`
	`883`	`+ #[allow(rustc::diagnostic_outside_of_impl)]`
	`884`	`+ sess.dcx().fatal("only Apple targets currently support deployment version info")`
`886`	`885`	`}`
`887`	`886`	`}`
`888`	`887`	`}`
Original file line number	Diff line number	Diff line change
@@ -4,3 +4,5 @@ warning: failed to connect to jobserver from environment variable `MAKEFLAGS="--
`4`	`4`
`5`	`5`	`error: no input filename given`
`6`	`6`
	`7`	`+error: aborting due to 1 previous error`
	`8`	`+`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,4 @@`
`1`	`1`	`error: only Apple targets currently support deployment version info`
`2`	`2`
	`3`	`+error: aborting due to 1 previous error`
	`4`	`+`