Skip to content

Commit

Permalink
Auto merge of rust-lang#134052 - matthiaskrgr:rollup-puxwqrk, r=matth…
Browse files Browse the repository at this point in the history
…iaskrgr

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
  • Loading branch information
bors committed Dec 9, 2024
2 parents 24ccb15 + 63e4979 commit dc71301
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/driver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,8 @@ pub fn main() {
let mut args: Vec<String> = orig_args.clone();
pass_sysroot_env_if_given(&mut args, sys_root_env);

return rustc_driver::RunCompiler::new(&args, &mut DefaultCallbacks).run();
rustc_driver::RunCompiler::new(&args, &mut DefaultCallbacks).run();
return Ok(());
}

if orig_args.iter().any(|a| a == "--version" || a == "-V") {
Expand Down Expand Up @@ -296,12 +297,13 @@ pub fn main() {
args.extend(clippy_args);
rustc_driver::RunCompiler::new(&args, &mut ClippyCallbacks { clippy_args_var })
.set_using_internal_features(using_internal_features)
.run()
.run();
} else {
rustc_driver::RunCompiler::new(&args, &mut RustcCallbacks { clippy_args_var })
.set_using_internal_features(using_internal_features)
.run()
.run();
}
return Ok(());
}))
}

Expand Down

0 comments on commit dc71301

Please sign in to comment.