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

rustup; adjust for rustc_driver changes

benches/helpers/miri_helper.rs

@@ -55,5 +55,5 @@ pub fn run(filename: &str, bencher: &mut Bencher) {
         "--sysroot".to_string(),
         find_sysroot(),
     ];
-    rustc_driver::run_compiler(args, &mut MiriCompilerCalls { bencher }, None, None).unwrap()
+    rustc_driver::run_compiler(args, &mut MiriCompilerCalls { bencher }, None, None, None).unwrap()
 }

rust-version

@@ -1 +1 @@
-1ec980d225fff2346a1a631a7ffc88b37e9e18af
+26373fb4baa9c5b8a7a1e2821fcfa930a85d327d

src/bin/miri-rustc-tests.rs

@@ -145,6 +145,7 @@ fn main() {
                 &mut MiriCompilerCalls { host_target },
                 None,
                 Some(Box::new(buf)),
+                None,
             );
         });
 

src/bin/miri.rs

@@ -157,7 +157,7 @@ fn run_compiler(mut args: Vec<String>, callbacks: &mut (dyn rustc_driver::Callba
 
     // Invoke compiler, and handle return code.
     let exit_code = rustc_driver::catch_with_exit_code(move || {
-        rustc_driver::run_compiler(&args, callbacks, None, None)
+        rustc_driver::run_compiler(&args, callbacks, None, None, None)
     });
     std::process::exit(exit_code)
 }