squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

rustfmt: Simplify match in project file lookup loop

Browse source 
This commit changes the match in `lookup_project_file` to use pattern
guards.
This commit is contained in:
Kamal Marhubi 2016-04-10 18:29:25 -04:00
parent fe5fa874da
commit 72427356eb
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/bin/rustfmt.rs
View file

@ -65,19 +65,17 @@ fn lookup_project_file(dir: &Path) -> FmtResult<Option<PathBuf>> {
loop {
let config_file = current.join("rustfmt.toml");
match fs::metadata(&config_file) {
Ok(md) => {
// Properly handle unlikely situation of a directory named `rustfmt.toml`.
if md.is_file() {
return Ok(Some(config_file));
}
}
// If it's not found, we continue searching; otherwise something went wrong and we
// return the error.
// Only return if it's a file to handle the unlikely situation of a directory named
// `rustfmt.toml`.
Ok(ref md) if md.is_file() => return Ok(Some(config_file)),
// Return the error if it's something other than `NotFound`; otherwise we didn't find
// the project file yet, and continue searching.
Err(e) => {
if e.kind() != ErrorKind::NotFound {
return Err(FmtError::from(e));
}
}
_ => {}
}
// If the current directory has no parent, we're done searching.