X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fdriver.rs;h=2c699998ea90e237cdb708de9eb62507f3d0c60c;hb=77c23b70897a097cadd5fdd96644384313243f14;hp=fda304afcbe184a3bc18d764e70f3ade2fc46df0;hpb=0e66a780ad8bef459e2d5bf989bb6ea68cbfa616;p=rust.git diff --git a/src/driver.rs b/src/driver.rs index fda304afcbe..2c699998ea9 100644 --- a/src/driver.rs +++ b/src/driver.rs @@ -1,24 +1,26 @@ #![cfg_attr(feature = "deny-warnings", deny(warnings))] -#![feature(result_map_or)] #![feature(rustc_private)] +#![feature(str_strip)] // FIXME: switch to something more ergonomic here, once available. // (Currently there is no way to opt into sysroot crates without `extern crate`.) #[allow(unused_extern_crates)] -extern crate rustc; -#[allow(unused_extern_crates)] extern crate rustc_driver; #[allow(unused_extern_crates)] extern crate rustc_errors; #[allow(unused_extern_crates)] extern crate rustc_interface; +#[allow(unused_extern_crates)] +extern crate rustc_middle; -use rustc::ty::TyCtxt; use rustc_interface::interface; -use rustc_tools_util::*; +use rustc_middle::ty::TyCtxt; +use rustc_tools_util::VersionInfo; use lazy_static::lazy_static; use std::borrow::Cow; +use std::env; +use std::ops::Deref; use std::panic; use std::path::{Path, PathBuf}; use std::process::{exit, Command}; @@ -27,22 +29,21 @@ /// If a command-line option matches `find_arg`, then apply the predicate `pred` on its value. If /// true, then return it. The parameter is assumed to be either `--arg=value` or `--arg value`. -fn arg_value<'a>( - args: impl IntoIterator, +fn arg_value<'a, T: Deref>( + args: &'a [T], find_arg: &str, pred: impl Fn(&str) -> bool, ) -> Option<&'a str> { - let mut args = args.into_iter().map(String::as_str); - + let mut args = args.iter().map(Deref::deref); while let Some(arg) = args.next() { - let arg: Vec<_> = arg.splitn(2, '=').collect(); - if arg.get(0) != Some(&find_arg) { + let mut arg = arg.splitn(2, '='); + if arg.next() != Some(find_arg) { continue; } - let value = arg.get(1).cloned().or_else(|| args.next()); - if value.as_ref().map_or(false, |p| pred(p)) { - return value; + match arg.next().or_else(|| args.next()) { + Some(v) if pred(v) => return Some(v), + _ => {}, } } None @@ -50,25 +51,22 @@ fn arg_value<'a>( #[test] fn test_arg_value() { - let args: Vec<_> = ["--bar=bar", "--foobar", "123", "--foo"] - .iter() - .map(std::string::ToString::to_string) - .collect(); - - assert_eq!(arg_value(None, "--foobar", |_| true), None); - assert_eq!(arg_value(&args, "--bar", |_| false), None); - assert_eq!(arg_value(&args, "--bar", |_| true), Some("bar")); - assert_eq!(arg_value(&args, "--bar", |p| p == "bar"), Some("bar")); - assert_eq!(arg_value(&args, "--bar", |p| p == "foo"), None); - assert_eq!(arg_value(&args, "--foobar", |p| p == "foo"), None); - assert_eq!(arg_value(&args, "--foobar", |p| p == "123"), Some("123")); - assert_eq!(arg_value(&args, "--foo", |_| true), None); + let args = &["--bar=bar", "--foobar", "123", "--foo"]; + + assert_eq!(arg_value(&[] as &[&str], "--foobar", |_| true), None); + assert_eq!(arg_value(args, "--bar", |_| false), None); + assert_eq!(arg_value(args, "--bar", |_| true), Some("bar")); + assert_eq!(arg_value(args, "--bar", |p| p == "bar"), Some("bar")); + assert_eq!(arg_value(args, "--bar", |p| p == "foo"), None); + assert_eq!(arg_value(args, "--foobar", |p| p == "foo"), None); + assert_eq!(arg_value(args, "--foobar", |p| p == "123"), Some("123")); + assert_eq!(arg_value(args, "--foo", |_| true), None); } -#[allow(clippy::too_many_lines)] +struct DefaultCallbacks; +impl rustc_driver::Callbacks for DefaultCallbacks {} struct ClippyCallbacks; - impl rustc_driver::Callbacks for ClippyCallbacks { fn config(&mut self, config: &mut interface::Config) { let previous = config.register_lints.take(); @@ -95,7 +93,7 @@ fn config(&mut self, config: &mut interface::Config) { #[allow(clippy::find_map, clippy::filter_map)] fn describe_lints() { - use lintlist::*; + use lintlist::{Level, Lint, ALL_LINTS, LINT_LEVELS}; use std::collections::HashSet; println!( @@ -261,7 +259,6 @@ fn report_clippy_ice(info: &panic::PanicInfo<'_>, bug_report_url: &str) { if !info.payload().is::() { let d = rustc_errors::Diagnostic::new(rustc_errors::Level::Bug, "unexpected panic"); handler.emit_diagnostic(&d); - handler.abort_if_errors_and_should_abort(); } let version_info = rustc_tools_util::get_version_info!(); @@ -277,28 +274,37 @@ fn report_clippy_ice(info: &panic::PanicInfo<'_>, bug_report_url: &str) { } // If backtraces are enabled, also print the query stack - let backtrace = std::env::var_os("RUST_BACKTRACE").map_or(false, |x| &x != "0"); + let backtrace = env::var_os("RUST_BACKTRACE").map_or(false, |x| &x != "0"); if backtrace { TyCtxt::try_print_query_stack(&handler); } } +fn toolchain_path(home: Option, toolchain: Option) -> Option { + home.and_then(|home| { + toolchain.map(|toolchain| { + let mut path = PathBuf::from(home); + path.push("toolchains"); + path.push(toolchain); + path + }) + }) +} + pub fn main() { rustc_driver::init_rustc_env_logger(); lazy_static::initialize(&ICE_HOOK); exit( rustc_driver::catch_fatal_errors(move || { - use std::env; + let mut orig_args: Vec = env::args().collect(); - if std::env::args().any(|a| a == "--version" || a == "-V") { + if orig_args.iter().any(|a| a == "--version" || a == "-V") { let version_info = rustc_tools_util::get_version_info!(); println!("{}", version_info); exit(0); } - let mut orig_args: Vec = env::args().collect(); - // Get the sysroot, looking from most specific to this invocation to the least: // - command line // - runtime environment @@ -306,22 +312,21 @@ pub fn main() { // - RUSTUP_HOME, MULTIRUST_HOME, RUSTUP_TOOLCHAIN, MULTIRUST_TOOLCHAIN // - sysroot from rustc in the path // - compile-time environment + // - SYSROOT + // - RUSTUP_HOME, MULTIRUST_HOME, RUSTUP_TOOLCHAIN, MULTIRUST_TOOLCHAIN let sys_root_arg = arg_value(&orig_args, "--sysroot", |_| true); let have_sys_root_arg = sys_root_arg.is_some(); let sys_root = sys_root_arg .map(PathBuf::from) .or_else(|| std::env::var("SYSROOT").ok().map(PathBuf::from)) .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| { - let mut path = PathBuf::from(home); - path.push("toolchains"); - path.push(toolchain); - path - }) - }) + let home = std::env::var("RUSTUP_HOME") + .or_else(|_| std::env::var("MULTIRUST_HOME")) + .ok(); + let toolchain = std::env::var("RUSTUP_TOOLCHAIN") + .or_else(|_| std::env::var("MULTIRUST_TOOLCHAIN")) + .ok(); + toolchain_path(home, toolchain) }) .or_else(|| { Command::new("rustc") @@ -333,6 +338,15 @@ pub fn main() { .map(|s| PathBuf::from(s.trim())) }) .or_else(|| option_env!("SYSROOT").map(PathBuf::from)) + .or_else(|| { + let home = option_env!("RUSTUP_HOME") + .or(option_env!("MULTIRUST_HOME")) + .map(ToString::to_string); + let toolchain = option_env!("RUSTUP_TOOLCHAIN") + .or(option_env!("MULTIRUST_TOOLCHAIN")) + .map(ToString::to_string); + toolchain_path(home, toolchain) + }) .map(|pb| pb.to_string_lossy().to_string()) .expect("need to specify SYSROOT env var during clippy compilation, or use rustup or multirust"); @@ -351,7 +365,7 @@ pub fn main() { } let should_describe_lints = || { - let args: Vec<_> = std::env::args().collect(); + let args: Vec<_> = env::args().collect(); args.windows(2).any(|args| { args[1] == "help" && match args[0].as_str() { @@ -369,15 +383,9 @@ pub fn main() { // 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 = if have_sys_root_arg { - orig_args.clone() - } else { - orig_args - .clone() - .into_iter() - .chain(Some("--sysroot".to_owned())) - .chain(Some(sys_root)) - .collect() + let mut args: Vec = orig_args.clone(); + if !have_sys_root_arg { + args.extend(vec!["--sysroot".into(), sys_root]); }; // this check ensures that dependencies are built but not linted and the final @@ -386,7 +394,7 @@ pub fn main() { || arg_value(&orig_args, "--cap-lints", |val| val == "allow").is_none(); if clippy_enabled { - args.extend_from_slice(&["--cfg".to_owned(), r#"feature="cargo-clippy""#.to_owned()]); + args.extend(vec!["--cfg".into(), r#"feature="cargo-clippy""#.into()]); if let Ok(extra_args) = env::var("CLIPPY_ARGS") { args.extend(extra_args.split("__CLIPPY_HACKERY__").filter_map(|s| { if s.is_empty() { @@ -397,12 +405,10 @@ pub fn main() { })); } } - let mut clippy = ClippyCallbacks; - let mut default = rustc_driver::DefaultCallbacks; + let mut default = DefaultCallbacks; let callbacks: &mut (dyn rustc_driver::Callbacks + Send) = if clippy_enabled { &mut clippy } else { &mut default }; - let args = args; rustc_driver::run_compiler(&args, callbacks, None, None) }) .and_then(|result| result)