Auto merge of #6094 - ebroto:rustup, r=ebroto

Rustup

changelog: none

r? `@ghost`
This commit is contained in:
bors 2020-09-29 03:27:59 +00:00
commit ce678b9ac1

View file

@ -357,7 +357,7 @@ pub fn main() {
args.extend(vec!["--sysroot".into(), sys_root]);
};
return rustc_driver::run_compiler(&args, &mut DefaultCallbacks, None, None);
return rustc_driver::run_compiler(&args, &mut DefaultCallbacks, None, None, None);
}
if orig_args.iter().any(|a| a == "--version" || a == "-V") {
@ -420,6 +420,6 @@ pub fn main() {
let mut default = DefaultCallbacks;
let callbacks: &mut (dyn rustc_driver::Callbacks + Send) =
if clippy_enabled { &mut clippy } else { &mut default };
rustc_driver::run_compiler(&args, callbacks, None, None)
rustc_driver::run_compiler(&args, callbacks, None, None, None)
}))
}