cleanup

Author: saethlin

compiler/rustc_driver_impl/src/lib.rs

@@ -1507,7 +1507,7 @@ pub fn init_logger(early_dcx: &EarlyDiagCtxt, cfg: rustc_log::LoggerConfig) {
 }
 
 /// Install our usual `ctrlc` handler, which sets [`rustc_const_eval::CTRL_C_RECEIVED`].
-/// Makign this handler optional lets tools can install a different handler, if they wish.
+/// Making this handler optional lets tools can install a different handler, if they wish.
 pub fn install_ctrlc_handler() {
     ctrlc::set_handler(move || {
         // Indicate that we have been signaled to stop. If we were already signaled, exit

src/tools/miri/src/bin/miri.rs

@@ -344,6 +344,10 @@ fn main() {
     let args = rustc_driver::args::raw_args(&early_dcx)
         .unwrap_or_else(|_| std::process::exit(rustc_driver::EXIT_FAILURE));
 
+    // Install the ctrlc handler that sets `rustc_const_eval::CTRL_C_RECEIVED`, even if
+    // MIRI_BE_RUSTC is set.
+    rustc_driver::install_ctrlc_handler();
+
     // If the environment asks us to actually be rustc, then do that.
     if let Some(crate_kind) = env::var_os("MIRI_BE_RUSTC") {
         // Earliest rustc setup.
@@ -372,9 +376,6 @@ fn main() {
     let using_internal_features =
         rustc_driver::install_ice_hook("https://github.com/rust-lang/miri/issues/new", |_| ());
 
-    // Install the ctrlc handler that sets `rustc_const_eval::CTRL_C_RECEIVED`.
-    rustc_driver::install_ctrlc_handler();
-
     // Init loggers the Miri way.
     init_early_loggers(&early_dcx);