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

Use rustc_driver::run (fixes #2303)

Browse source 
This internally uses monitor() which catches panics and stuff
This commit is contained in:
Manish Goregaokar 2017-12-28 17:34:11 +05:30 • committed by Oliver Schneider
parent a2fdfc05d7
commit 3c4f5bfae2
No known key found for this signature in database
GPG key ID: A69F8D225B3AD7D9
1 changed files with 38 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
src/driver.rs
View file

@ -12,7 +12,7 @@ extern crate rustc_plugin;
extern crate syntax; extern crate syntax;
use rustc_driver::{driver, Compilation, CompilerCalls, RustcDefaultCalls}; use rustc_driver::{driver, Compilation, CompilerCalls, RustcDefaultCalls};
use rustc::session::{config, CompileIncomplete, Session}; use rustc::session::{config, Session};
use rustc::session::config::{ErrorOutputType, Input}; use rustc::session::config::{ErrorOutputType, Input};
use std::path::PathBuf; use std::path::PathBuf;
use std::process::Command; use std::process::Command;
@ -153,47 +153,44 @@ pub fn main() {
}) })
.expect("need to specify SYSROOT env var during clippy compilation, or use rustup or multirust"); .expect("need to specify SYSROOT env var during clippy compilation, or use rustup or multirust");
rustc_driver::in_rustc_thread(|| { // 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 orig_args: Vec<String> = env::args().collect(); if orig_args.len() <= 1 {
if orig_args.len() <= 1 { std::process::exit(1);
std::process::exit(1); }
} if orig_args[1] == "rustc" {
if orig_args[1] == "rustc" { // 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);
orig_args.remove(1); }
} // this conditional check for the --sysroot flag is there so users can call
// this conditional check for the --sysroot flag is there so users can call // `clippy_driver` directly
// `clippy_driver` directly // without having to pass --sysroot or anything
// without having to pass --sysroot or anything let mut args: Vec<String> = if orig_args.iter().any(|s| s == "--sysroot") {
let mut args: Vec<String> = if orig_args.iter().any(|s| s == "--sysroot") { orig_args.clone()
orig_args.clone() } else {
} else { orig_args
orig_args .clone()
.clone() .into_iter()
.into_iter() .chain(Some("--sysroot".to_owned()))
.chain(Some("--sysroot".to_owned())) .chain(Some(sys_root))
.chain(Some(sys_root)) .collect()
.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") let clippy_enabled = env::var("CLIPPY_TESTS")
.ok() .ok()
.map_or(false, |val| val == "true") .map_or(false, |val| val == "true")
|| orig_args.iter().any(|s| s == "--emit=metadata"); || orig_args.iter().any(|s| s == "--emit=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()]);
} }
let mut ccc = ClippyCompilerCalls::new(clippy_enabled); let mut ccc = ClippyCompilerCalls::new(clippy_enabled);
let (result, _) = rustc_driver::run_compiler(&args, &mut ccc, None, None); rustc_driver::run(move || {
if let Err(CompileIncomplete::Errored(_)) = result { rustc_driver::run_compiler(&args, &mut ccc, None, None)
std::process::exit(1); });
}
}).expect("rustc_thread failed");
} }