From 72427356eb6d99a26c6596742e96df5516a8adc1 Mon Sep 17 00:00:00 2001 From: Kamal Marhubi Date: Sun, 10 Apr 2016 18:29:25 -0400 Subject: [PATCH] rustfmt: Simplify match in project file lookup loop This commit changes the match in `lookup_project_file` to use pattern guards. --- src/bin/rustfmt.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/bin/rustfmt.rs b/src/bin/rustfmt.rs index a4067f40eda..e2a2a491848 100644 --- a/src/bin/rustfmt.rs +++ b/src/bin/rustfmt.rs @@ -65,19 +65,17 @@ fn lookup_project_file(dir: &Path) -> FmtResult> { 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. -- 2.44.0