bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Run rustfmt

Browse source
This commit is contained in:
Oliver Schneider 2017-02-28 14:29:06 +01:00
parent e53575b871
commit a78ca9e955
1 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/main.rs
View file

@ -245,30 +245,31 @@ pub fn main() {
}; };
rustc_driver::in_rustc_thread(|| { rustc_driver::in_rustc_thread(|| {
// this conditional check for the --sysroot flag is there so users can call `cargo-clippy` directly // this conditional check for the --sysroot flag is there so users can call `cargo-clippy` directly
// without having to pass --sysroot or anything // without having to pass --sysroot or anything
let mut args: Vec<String> = if env::args().any(|s| s == "--sysroot") { let mut args: Vec<String> = if env::args().any(|s| s == "--sysroot") {
env::args().collect() env::args().collect()
} else { } else {
env::args().chain(Some("--sysroot".to_owned())).chain(Some(sys_root)).collect() env::args().chain(Some("--sysroot".to_owned())).chain(Some(sys_root)).collect()
}; };
// this check ensures that dependencies are built but not linted and the final crate is // this check ensures that dependencies are built but not linted and the final crate is
// linted but not built // linted but not built
let clippy_enabled = env::args().any(|s| s == "-Zno-trans"); let clippy_enabled = env::args().any(|s| s == "-Zno-trans");
if clippy_enabled { if clippy_enabled {
args.extend_from_slice(&["--cfg".to_owned(), r#"feature="cargo-clippy""#.to_owned()]); args.extend_from_slice(&["--cfg".to_owned(), r#"feature="cargo-clippy""#.to_owned()]);
}
let mut ccc = ClippyCompilerCalls::new(clippy_enabled);
let (result, _) = rustc_driver::run_compiler(&args, &mut ccc, None, None);
if let Err(err_count) = result {
if err_count > 0 {
std::process::exit(1);
} }
}
}).expect("rustc_thread failed"); let mut ccc = ClippyCompilerCalls::new(clippy_enabled);
let (result, _) = rustc_driver::run_compiler(&args, &mut ccc, None, None);
if let Err(err_count) = result {
if err_count > 0 {
std::process::exit(1);
}
}
})
.expect("rustc_thread failed");
} }
} }