Auto merge of #954 - RalfJung:rustup, r=RalfJung

update for rustc changes

https://github.com/rust-lang/rust/pull/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?
This commit is contained in:
bors 2019-09-16 07:32:21 +00:00
commit d881387237
2 changed files with 3 additions and 2 deletions

View file

@ -1 +1 @@
b35ebac96102cd12406d9d87827b0838d129c278
96d07e0ac9f0c56b95a2561c6cedac0b23a5d2a3

View file

@ -211,7 +211,8 @@ fn main() {
seed,
args: miri_args,
};
let result = rustc_driver::report_ices_to_stderr_if_any(move || {
rustc_driver::install_ice_hook();
let result = rustc_driver::catch_fatal_errors(move || {
rustc_driver::run_compiler(&rustc_args, &mut MiriCompilerCalls { miri_config }, None, None)
}).and_then(|result| result);
std::process::exit(result.is_err() as i32);