Skip to content

Commit

Permalink
Auto merge of #954 - RalfJung:rustup, r=RalfJung
Browse files Browse the repository at this point in the history
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?
  • Loading branch information
bors committed Sep 16, 2019
2 parents 508fdb8 + 9e2107c commit d881387
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion rust-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b35ebac96102cd12406d9d87827b0838d129c278
96d07e0ac9f0c56b95a2561c6cedac0b23a5d2a3
3 changes: 2 additions & 1 deletion src/bin/miri.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit d881387

Please sign in to comment.