mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't try to determine sysroot. rustc_driver will use default value.

Browse source
This commit is contained in:
O01eg 2018-10-04 10:58:09 +03:00
parent f93591294d
commit 69813d6faf
No known key found for this signature in database
GPG key ID: 8FBA74B3E78B4677
1 changed files with 6 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/driver.rs
View file

@ -23,7 +23,7 @@ use self::rustc_driver::{driver::CompileController, Compilation};
use std::convert::TryInto; use std::convert::TryInto;
use std::path::Path; use std::path::Path;
use std::process::{exit, Command}; use std::process::exit;
fn show_version() { fn show_version() {
println!(env!("CARGO_PKG_VERSION")); println!(env!("CARGO_PKG_VERSION"));
@ -40,54 +40,22 @@ pub fn main() {
exit(0); exit(0);
} }
let sys_root = option_env!("SYSROOT")
.map(String::from)
.or_else(|| std::env::var("SYSROOT").ok())
.or_else(|| {
let home = option_env!("RUSTUP_HOME").or(option_env!("MULTIRUST_HOME"));
let toolchain = option_env!("RUSTUP_TOOLCHAIN").or(option_env!("MULTIRUST_TOOLCHAIN"));
home.and_then(|home| toolchain.map(|toolchain| format!("{}/toolchains/{}", home, toolchain)))
})
.or_else(|| {
Command::new("rustc")
.arg("--print")
.arg("sysroot")
.output()
.ok()
.and_then(|out| String::from_utf8(out.stdout).ok())
.map(|s| s.trim().to_owned())
})
.expect("need to specify SYSROOT env var during clippy compilation, or use rustup or multirust");
// Setting RUSTC_WRAPPER causes Cargo to pass 'rustc' as the first argument. // Setting RUSTC_WRAPPER causes Cargo to pass 'rustc' as the first argument.
// We're invoking the compiler programmatically, so we ignore this/ // We're invoking the compiler programmatically, so we ignore this/
let mut orig_args: Vec<String> = env::args().collect(); let mut args: Vec<String> = env::args().collect();
if orig_args.len() <= 1 { if args.len() <= 1 {
std::process::exit(1); std::process::exit(1);
} }
if Path::new(&orig_args[1]).file_stem() == Some("rustc".as_ref()) { if Path::new(&args[1]).file_stem() == Some("rustc".as_ref()) {
// we still want to be able to invoke it normally though // we still want to be able to invoke it normally though
orig_args.remove(1); args.remove(1);
} }
// this conditional check for the --sysroot flag is there so users can call
// `clippy_driver` directly
// without having to pass --sysroot or anything
let mut args: Vec<String> = if orig_args.iter().any(|s| s == "--sysroot") {
orig_args.clone()
} else {
orig_args
.clone()
.into_iter()
.chain(Some("--sysroot".to_owned()))
.chain(Some(sys_root))
.collect()
};
// this check ensures that dependencies are built but not linted and the final // this check ensures that dependencies are built but not linted and the final
// crate is // crate is
// linted but not built // linted but not built
let clippy_enabled = env::var("CLIPPY_TESTS").ok().map_or(false, |val| val == "true") let clippy_enabled = env::var("CLIPPY_TESTS").ok().map_or(false, |val| val == "true")
|| orig_args.iter().any(|s| s == "--emit=dep-info,metadata"); || args.iter().any(|s| s == "--emit=dep-info,metadata");
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()]);