Skip to content

Commit 3f5e217

Browse files
committed
Use iter::successors in find_override_from_dir_walk()
1 parent ec8b7c4 commit 3f5e217

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

src/config.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -581,9 +581,8 @@ impl Cfg {
581581
settings: &Settings,
582582
) -> Result<Option<(OverrideFile, OverrideReason)>> {
583583
let notify = self.notify_handler.as_ref();
584-
let mut dir = Some(dir);
585584

586-
while let Some(d) = dir {
585+
for d in iter::successors(Some(dir), |d| d.parent()) {
587586
// First check the override database
588587
if let Some(name) = settings.dir_override(d, notify) {
589588
let reason = OverrideReason::OverrideDB(d.to_owned());
@@ -664,8 +663,6 @@ impl Cfg {
664663
let reason = OverrideReason::ToolchainFile(toolchain_file);
665664
return Ok(Some((override_file, reason)));
666665
}
667-
668-
dir = d.parent();
669666
}
670667

671668
Ok(None)

0 commit comments

Comments
 (0)