rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1299 from Manishearth/clippy-toml

Browse Source 
Search for `clippy.toml` recursively
This commit is contained in:
Oliver Schneider
2016-10-30 14:35:32 -04:00
committed by GitHub
parent 20b7559558 d52af53e04
commit 8b2e80b47b
2 changed files with 55 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
clippy_lints/src/lib.rs
View File

@@ -137,17 +137,23 @@ mod reexport {
#[cfg_attr(rustfmt, rustfmt_skip)]
pub fn register_plugins(reg: &mut rustc_plugin::Registry) {
let conf = match utils::conf::file(reg.args()) {
let conf = match utils::conf::file_from_args(reg.args()) {
Ok(file_name) => {
// if the user specified a file, it must exist, otherwise default to `clippy.toml` but
// do not require the file to exist
let (file_name, must_exist) = if let Some(ref file_name) = file_name {
(&**file_name, true)
let file_name = if let Some(file_name) = file_name {
Some(file_name)
} else {
("clippy.toml", false)
match utils::conf::lookup_conf_file() {
Ok(path) => path,
Err(error) => {
reg.sess.struct_err(&format!("error reading Clippy's configuration file: {}", error)).emit();
None
}
}
};
let (conf, errors) = utils::conf::read(file_name, must_exist);
let (conf, errors) = utils::conf::read(file_name.as_ref().map(|p| p.as_ref()));
// all conf errors are non-fatal, we just use the default conf in case of error
for error in errors {