Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-27 07:00:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Run rustfmt on src

Browse source
This commit is contained in:
flip1995 2018-11-27 21:12:13 +01:00
parent 2953ae0702
commit d71c871568
No known key found for this signature in database
GPG key ID: E8E897A5870E41C2
3 changed files with 111 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

218
src/driver.rs
View file

@ -7,11 +7,9 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
// error-pattern:yummy // error-pattern:yummy
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(try_from)] #![feature(try_from)]
#![allow(clippy::missing_docs_in_private_items)] #![allow(clippy::missing_docs_in_private_items)]
@ -33,126 +31,128 @@ fn show_version() {
pub fn main() { pub fn main() {
rustc_driver::init_rustc_env_logger(); rustc_driver::init_rustc_env_logger();
exit(rustc_driver::run(move || { exit(
use std::env; rustc_driver::run(move || {
use std::env;
if std::env::args().any(|a| a == "--version" || a == "-V") { if std::env::args().any(|a| a == "--version" || a == "-V") {
show_version(); show_version();
exit(0); exit(0);
} }
let sys_root = option_env!("SYSROOT") let sys_root = option_env!("SYSROOT")
.map(String::from) .map(String::from)
.or_else(|| std::env::var("SYSROOT").ok()) .or_else(|| std::env::var("SYSROOT").ok())
.or_else(|| { .or_else(|| {
let home = option_env!("RUSTUP_HOME").or(option_env!("MULTIRUST_HOME")); let home = option_env!("RUSTUP_HOME").or(option_env!("MULTIRUST_HOME"));
let toolchain = option_env!("RUSTUP_TOOLCHAIN").or(option_env!("MULTIRUST_TOOLCHAIN")); let toolchain = option_env!("RUSTUP_TOOLCHAIN").or(option_env!("MULTIRUST_TOOLCHAIN"));
home.and_then(|home| toolchain.map(|toolchain| format!("{}/toolchains/{}", home, toolchain))) home.and_then(|home| toolchain.map(|toolchain| format!("{}/toolchains/{}", home, toolchain)))
}) })
.or_else(|| { .or_else(|| {
Command::new("rustc") Command::new("rustc")
.arg("--print") .arg("--print")
.arg("sysroot") .arg("sysroot")
.output() .output()
.ok() .ok()
.and_then(|out| String::from_utf8(out.stdout).ok()) .and_then(|out| String::from_utf8(out.stdout).ok())
.map(|s| s.trim().to_owned()) .map(|s| s.trim().to_owned())
}) })
.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");
// 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 Path::new(&orig_args[1]).file_stem() == Some("rustc".as_ref()) { if Path::new(&orig_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); 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").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"); || orig_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()]);
if let Ok(extra_args) = env::var("CLIPPY_ARGS") { if let Ok(extra_args) = env::var("CLIPPY_ARGS") {
args.extend( args.extend(extra_args.split("__CLIPPY_HACKERY__").filter_map(|s| {
extra_args if s.is_empty() {
.split("__CLIPPY_HACKERY__")
.filter_map(|s| if s.is_empty() {
None None
} else { } else {
Some(s.to_string()) Some(s.to_string())
}) }
); }));
}
} }
}
let mut controller = CompileController::basic(); let mut controller = CompileController::basic();
if clippy_enabled { if clippy_enabled {
controller.after_parse.callback = Box::new(move |state| { controller.after_parse.callback = Box::new(move |state| {
let mut registry = rustc_plugin::registry::Registry::new( let mut registry = rustc_plugin::registry::Registry::new(
state.session, state.session,
state state
.krate .krate
.as_ref() .as_ref()
.expect( .expect(
"at this compilation stage \ "at this compilation stage \
the crate must be parsed", the crate must be parsed",
) )
.span, .span,
); );
registry.args_hidden = Some(Vec::new()); registry.args_hidden = Some(Vec::new());
let conf = clippy_lints::read_conf(&registry); let conf = clippy_lints::read_conf(&registry);
clippy_lints::register_plugins(&mut registry, &conf); clippy_lints::register_plugins(&mut registry, &conf);
let rustc_plugin::registry::Registry { let rustc_plugin::registry::Registry {
early_lint_passes, early_lint_passes,
late_lint_passes, late_lint_passes,
lint_groups, lint_groups,
llvm_passes, llvm_passes,
attributes, attributes,
.. ..
} = registry; } = registry;
let sess = &state.session; let sess = &state.session;
let mut ls = sess.lint_store.borrow_mut(); let mut ls = sess.lint_store.borrow_mut();
for pass in early_lint_passes { for pass in early_lint_passes {
ls.register_early_pass(Some(sess), true, pass); ls.register_early_pass(Some(sess), true, pass);
} }
for pass in late_lint_passes { for pass in late_lint_passes {
ls.register_late_pass(Some(sess), true, pass); ls.register_late_pass(Some(sess), true, pass);
} }
for (name, (to, deprecated_name)) in lint_groups { for (name, (to, deprecated_name)) in lint_groups {
ls.register_group(Some(sess), true, name, deprecated_name, to); ls.register_group(Some(sess), true, name, deprecated_name, to);
} }
clippy_lints::register_pre_expansion_lints(sess, &mut ls, &conf); clippy_lints::register_pre_expansion_lints(sess, &mut ls, &conf);
sess.plugin_llvm_passes.borrow_mut().extend(llvm_passes); sess.plugin_llvm_passes.borrow_mut().extend(llvm_passes);
sess.plugin_attributes.borrow_mut().extend(attributes); sess.plugin_attributes.borrow_mut().extend(attributes);
}); });
} }
controller.compilation_done.stop = Compilation::Stop; controller.compilation_done.stop = Compilation::Stop;
let args = args; let args = args;
rustc_driver::run_compiler(&args, Box::new(controller), None, None) rustc_driver::run_compiler(&args, Box::new(controller), None, None)
}).try_into().expect("exit code too large")) })
.try_into()
.expect("exit code too large"),
)
} }

2
src/lib.rs
View file

@ -7,11 +7,9 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
// error-pattern:cargo-clippy // error-pattern:cargo-clippy
#![feature(plugin_registrar)] #![feature(plugin_registrar)]
#![feature(rustc_private)] #![feature(rustc_private)]
#![allow(clippy::missing_docs_in_private_items)] #![allow(clippy::missing_docs_in_private_items)]
#![warn(rust_2018_idioms)] #![warn(rust_2018_idioms)]

5
src/main.rs
View file

@ -7,11 +7,9 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
// error-pattern:yummy // error-pattern:yummy
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(rustc_private)] #![feature(rustc_private)]
#![allow(clippy::missing_docs_in_private_items)] #![allow(clippy::missing_docs_in_private_items)]
use rustc_tools_util::*; use rustc_tools_util::*;
@ -106,7 +104,8 @@ where
.into_os_string() .into_os_string()
}, },
) )
}).map(|p| ("CARGO_TARGET_DIR", p)); })
.map(|p| ("CARGO_TARGET_DIR", p));
let exit_status = std::process::Command::new("cargo") let exit_status = std::process::Command::new("cargo")
.args(&args) .args(&args)