Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Commit 39d617b

Browse files
committed
Fix nightly breakage
Caused by rust-lang/rust#60584
1 parent 9c534aa commit 39d617b

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

rls-rustc/src/lib.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,10 @@ pub fn run() -> Result<(), ()> {
7272
None => args,
7373
};
7474

75-
rustc_driver::report_ices_to_stderr_if_any(|| {
76-
run_compiler(&args, &mut shim_calls, file_loader, None)
77-
})
78-
.map(|_| ())
79-
.map_err(|_| ())
75+
rustc_driver::install_ice_hook();
76+
rustc_driver::catch_fatal_errors(|| run_compiler(&args, &mut shim_calls, file_loader, None))
77+
.map(|_| ())
78+
.map_err(|_| ())
8079
}
8180

8281
#[derive(Default)]

rls/src/build/rustc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ fn run_in_process(
198198
let result = std::panic::catch_unwind({
199199
let stderr = Arc::clone(&stderr);
200200
|| {
201-
rustc_driver::report_ices_to_stderr_if_any(move || {
201+
rustc_driver::catch_fatal_errors(move || {
202202
// Replace stderr so we catch most errors.
203203
run_compiler(
204204
&args,

0 commit comments

Comments
 (0)