Account for changes to RunCompiler::run

rust-lang/rust#133567

Author: smoelius

driver/src/lib.rs

@@ -350,9 +350,7 @@ pub fn run<T: AsRef<OsStr>>(args: &[T]) -> Result<()> {
     // of the log messages.
     log::debug!("{:?}", rustc_args);
 
-    rustc_driver::RunCompiler::new(&rustc_args, &mut callbacks)
-        .run()
-        .map_err(|_| std::process::exit(1))
+    map_run_compiler_err(rustc_driver::RunCompiler::new(&rustc_args, &mut callbacks).run())
 }
 
 fn sysroot() -> Result<PathBuf> {
@@ -422,6 +420,16 @@ fn rustc_args<T: AsRef<OsStr>, U: AsRef<str>, V: AsRef<Path>>(
     Ok(rustc_args)
 }
 
+#[rustversion::before(2024-12-09)]
+fn map_run_compiler_err(result: Result<(), rustc_span::ErrorGuaranteed>) -> Result<()> {
+    result.map_err(|_| std::process::exit(1))
+}
+
+#[rustversion::since(2024-12-09)]
+fn map_run_compiler_err((): ()) -> Result<()> {
+    Ok(())
+}
+
 #[expect(clippy::unwrap_used)]
 #[cfg(test)]
 mod test {

expensive/tests/boundary_toolchains.rs

@@ -18,6 +18,9 @@ use tempfile::tempdir;
 // smoelius: Put recent boundaries first, since they're more likely to cause problems.
 // smoelius: The relevant PRs and merge commits appear before each boundary.
 const BOUNDARIES: &[(&str, &str)] = &[
+    // https://github.com/rust-lang/rust/pull/133567
+    // https://github.com/rust-lang/rust/commit/d2881e4eb5e0fe1591bfd8e4cab1d5abc3e3a46c
+    ("2024-12-09", "2023-12-10"),
     // https://github.com/rust-lang/rust/pull/122450
     // https://github.com/rust-lang/rust/commit/685927aae69657b46323cffbeb0062835bd7fa2b
     // smoelius: `proc-macro2` now requires library features `proc_macro_byte_character` and