Fix nightly breakage

Caused by rust-lang/rust#60584
rust-lang · Sep 15, 2019 · 39d617b · 39d617b
1 parent 9c534aa
commit 39d617b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/rls-rustc/src/lib.rs b/rls-rustc/src/lib.rs
@@ -72,11 +72,10 @@ pub fn run() -> Result<(), ()> {
         None => args,
     };
 
-    rustc_driver::report_ices_to_stderr_if_any(|| {
-        run_compiler(&args, &mut shim_calls, file_loader, None)
-    })
-    .map(|_| ())
-    .map_err(|_| ())
+    rustc_driver::install_ice_hook();
+    rustc_driver::catch_fatal_errors(|| run_compiler(&args, &mut shim_calls, file_loader, None))
+        .map(|_| ())
+        .map_err(|_| ())
 }
 
 #[derive(Default)]

diff --git a/rls/src/build/rustc.rs b/rls/src/build/rustc.rs
@@ -198,7 +198,7 @@ fn run_in_process(
     let result = std::panic::catch_unwind({
         let stderr = Arc::clone(&stderr);
         || {
-            rustc_driver::report_ices_to_stderr_if_any(move || {
+            rustc_driver::catch_fatal_errors(move || {
                 // Replace stderr so we catch most errors.
                 run_compiler(
                     &args,