Skip to content

Commit d881387

Browse files
committed
Auto merge of #954 - RalfJung:rustup, r=RalfJung
update for rustc changes rust-lang/rust#60584 changed some stuff around ICEs. What I am not sure about is whether we should call `install_ice_hook` or not. @jonas-schievink @oli-obk any advice?
2 parents 508fdb8 + 9e2107c commit d881387

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

rust-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
b35ebac96102cd12406d9d87827b0838d129c278
1+
96d07e0ac9f0c56b95a2561c6cedac0b23a5d2a3

src/bin/miri.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,8 @@ fn main() {
211211
seed,
212212
args: miri_args,
213213
};
214-
let result = rustc_driver::report_ices_to_stderr_if_any(move || {
214+
rustc_driver::install_ice_hook();
215+
let result = rustc_driver::catch_fatal_errors(move || {
215216
rustc_driver::run_compiler(&rustc_args, &mut MiriCompilerCalls { miri_config }, None, None)
216217
}).and_then(|result| result);
217218
std::process::exit(result.is_err() as i32);

0 commit comments

Comments
 (0)