Skip to content

Commit dc71301

Browse files
committed
Auto merge of rust-lang#134052 - matthiaskrgr:rollup-puxwqrk, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang#133567 (A bunch of cleanups) - rust-lang#133789 (Add doc alias 'then_with' for `then` method on `bool`) - rust-lang#133880 (Expand home_dir docs) - rust-lang#134036 (crash tests: use individual mir opts instead of mir-opt-level where easily possible) - rust-lang#134045 (Fix some triagebot mentions paths) - rust-lang#134046 (Remove ignored tests for hangs w/ new solver) - rust-lang#134050 (Miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 24ccb15 + 63e4979 commit dc71301

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/driver.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,8 @@ pub fn main() {
236236
let mut args: Vec<String> = orig_args.clone();
237237
pass_sysroot_env_if_given(&mut args, sys_root_env);
238238

239-
return rustc_driver::RunCompiler::new(&args, &mut DefaultCallbacks).run();
239+
rustc_driver::RunCompiler::new(&args, &mut DefaultCallbacks).run();
240+
return Ok(());
240241
}
241242

242243
if orig_args.iter().any(|a| a == "--version" || a == "-V") {
@@ -296,12 +297,13 @@ pub fn main() {
296297
args.extend(clippy_args);
297298
rustc_driver::RunCompiler::new(&args, &mut ClippyCallbacks { clippy_args_var })
298299
.set_using_internal_features(using_internal_features)
299-
.run()
300+
.run();
300301
} else {
301302
rustc_driver::RunCompiler::new(&args, &mut RustcCallbacks { clippy_args_var })
302303
.set_using_internal_features(using_internal_features)
303-
.run()
304+
.run();
304305
}
306+
return Ok(());
305307
}))
306308
}
307309

0 commit comments

Comments
 (0)