nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-26 05:44:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve warnings on incompatible options involving -Zinstrument-coverage

Browse Source 
Adds checks for:

* `no_core` attribute
* explicitly-enabled `legacy` symbol mangling
* mir_opt_level > 1 (which enables inlining)

I removed code from the `Inline` MIR pass that forcibly disabled
inlining if `-Zinstrument-coverage` was set. The default `mir_opt_level`
does not enable inlining anyway. But if the level is explicitly set and
is greater than 1, I issue a warning.

The new warnings show up in tests, which is much better for diagnosing
potential option conflicts in these cases.
This commit is contained in:
Rich Kadel 2020-12-14 00:25:29 -08:00
parent 0e527baf77
commit 3043a7b5d9
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/driver.rs
View File

@ -41,7 +41,7 @@ fn arg_value<'a, T: Deref<Target = str>>(
match arg.next().or_else(|| args.next()) { match arg.next().or_else(|| args.next()) {
Some(v) if pred(v) => return Some(v), Some(v) if pred(v) => return Some(v),
_ => {}, _ => {}
} }
} }
None None
@ -85,7 +85,7 @@ impl rustc_driver::Callbacks for ClippyCallbacks {
// run on the unoptimized MIR. On the other hand this results in some false negatives. If // run on the unoptimized MIR. On the other hand this results in some false negatives. If
// MIR passes can be enabled / disabled separately, we should figure out, what passes to // MIR passes can be enabled / disabled separately, we should figure out, what passes to
// use for Clippy. // use for Clippy.
config.opts.debugging_opts.mir_opt_level = 0; config.opts.debugging_opts.mir_opt_level = Some(0);
} }
} }
@ -121,11 +121,12 @@ You can use tool lints to allow or deny lints from your code, eg.:
const BUG_REPORT_URL: &str = "https://github.com/rust-lang/rust-clippy/issues/new"; const BUG_REPORT_URL: &str = "https://github.com/rust-lang/rust-clippy/issues/new";
static ICE_HOOK: SyncLazy<Box<dyn Fn(&panic::PanicInfo<'_>) + Sync + Send + 'static>> = SyncLazy::new(|| { static ICE_HOOK: SyncLazy<Box<dyn Fn(&panic::PanicInfo<'_>) + Sync + Send + 'static>> =
SyncLazy::new(|| {
let hook = panic::take_hook(); let hook = panic::take_hook();
panic::set_hook(Box::new(|info| report_clippy_ice(info, BUG_REPORT_URL))); panic::set_hook(Box::new(|info| report_clippy_ice(info, BUG_REPORT_URL)));
hook hook
}); });
fn report_clippy_ice(info: &panic::PanicInfo<'_>, bug_report_url: &str) { fn report_clippy_ice(info: &panic::PanicInfo<'_>, bug_report_url: &str) {
// Invoke our ICE handler, which prints the actual panic message and optionally a backtrace // Invoke our ICE handler, which prints the actual panic message and optionally a backtrace
@ -257,14 +258,17 @@ pub fn main() {
// 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 wrapper_mode = orig_args.get(1).map(Path::new).and_then(Path::file_stem) == Some("rustc".as_ref()); let wrapper_mode =
orig_args.get(1).map(Path::new).and_then(Path::file_stem) == Some("rustc".as_ref());
if wrapper_mode { if wrapper_mode {
// 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);
} }
if !wrapper_mode && (orig_args.iter().any(|a| a == "--help" || a == "-h") || orig_args.len() == 1) { if !wrapper_mode
&& (orig_args.iter().any(|a| a == "--help" || a == "-h") || orig_args.len() == 1)
{
display_help(); display_help();
exit(0); exit(0);
} }
@ -285,13 +289,11 @@ pub fn main() {
if clippy_enabled { if clippy_enabled {
args.extend(vec!["--cfg".into(), r#"feature="cargo-clippy""#.into()]); args.extend(vec!["--cfg".into(), r#"feature="cargo-clippy""#.into()]);
if let Ok(extra_args) = env::var("CLIPPY_ARGS") { if let Ok(extra_args) = env::var("CLIPPY_ARGS") {
args.extend(extra_args.split("__CLIPPY_HACKERY__").filter_map(|s| { args.extend(
if s.is_empty() { extra_args
None .split("__CLIPPY_HACKERY__")
} else { .filter_map(|s| if s.is_empty() { None } else { Some(s.to_string()) }),
Some(s.to_string()) );
}
}));
} }
} }
let mut clippy = ClippyCallbacks; let mut clippy = ClippyCallbacks;