imperitivize

Author: bend-n

compiler/rustc_resolve/src/diagnostics.rs

@@ -1,5 +1,3 @@
-use std::ops::Not;
-
 use rustc_ast::expand::StrippedCfgItem;
 use rustc_ast::ptr::P;
 use rustc_ast::visit::{self, Visitor};
@@ -2472,30 +2470,29 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
         // FIXME: add case where non parent using undeclared module (hard?)
         let dir = src.parent()?;
         let src = src.file_stem()?.to_str()?;
-        [
+        for file in [
             // …/x.rs
             dir.join(i).with_extension("rs"),
             // …/x/mod.rs
             dir.join(i).join("mod.rs"),
-        ]
-        .iter()
-        .chain(
-            // in …/x.rs
-            matches!(src, "main" | "lib" | "mod")
-                .not()
-                .then(|| {
-                    [
-                        // …/x/y.rs
-                        dir.join(src).join(i).with_extension("rs"),
-                        // …/x/y/mod.rs
-                        dir.join(src).join(i).join("mod.rs"),
-                    ]
-                })
-                .iter()
-                .flatten(),
-        )
-        .find(|x| x.exists())
-        .cloned()
+        ] {
+            if file.exists() {
+                return Some(file);
+            }
+        }
+        if !matches!(src, "main" | "lib" | "mod") {
+            for file in [
+                // …/x/y.rs
+                dir.join(src).join(i).with_extension("rs"),
+                // …/x/y/mod.rs
+                dir.join(src).join(i).join("mod.rs"),
+            ] {
+                if file.exists() {
+                    return Some(file);
+                }
+            }
+        }
+        None
     }
 
     /// Adds suggestions for a path that cannot be resolved.