warn if we find multiple clippy configs

Fixes #8323
This commit is contained in:
Matthias Krüger 2022-01-20 23:00:50 +01:00
parent 7bb69c0ae0
commit 97e5a70f47

View File

@ -322,6 +322,9 @@ pub fn lookup_conf_file() -> io::Result<Option<PathBuf>> {
let mut current = env::var_os("CLIPPY_CONF_DIR") let mut current = env::var_os("CLIPPY_CONF_DIR")
.or_else(|| env::var_os("CARGO_MANIFEST_DIR")) .or_else(|| env::var_os("CARGO_MANIFEST_DIR"))
.map_or_else(|| PathBuf::from("."), PathBuf::from); .map_or_else(|| PathBuf::from("."), PathBuf::from);
let mut found_config: Option<PathBuf> = None;
loop { loop {
for config_file_name in &CONFIG_FILE_NAMES { for config_file_name in &CONFIG_FILE_NAMES {
if let Ok(config_file) = current.join(config_file_name).canonicalize() { if let Ok(config_file) = current.join(config_file_name).canonicalize() {
@ -329,11 +332,26 @@ pub fn lookup_conf_file() -> io::Result<Option<PathBuf>> {
Err(e) if e.kind() == io::ErrorKind::NotFound => {}, Err(e) if e.kind() == io::ErrorKind::NotFound => {},
Err(e) => return Err(e), Err(e) => return Err(e),
Ok(md) if md.is_dir() => {}, Ok(md) if md.is_dir() => {},
Ok(_) => return Ok(Some(config_file)), Ok(_) => {
// warn if we happen to find two config files
if let Some(ref found_config_) = found_config {
eprintln!(
"Warning: found two config files: {} and {}.\nUsing the first one!",
found_config_.display(),
config_file.display(),
);
} else {
found_config = Some(config_file);
}
},
} }
} }
} }
if found_config.is_some() {
return Ok(found_config);
}
// If the current directory has no parent, we're done searching. // If the current directory has no parent, we're done searching.
if !current.pop() { if !current.pop() {
return Ok(None); return Ok(None);