functionalize

Author: bend-n

compiler/rustc_resolve/src/diagnostics.rs

@@ -2425,36 +2425,8 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             } else {
                 let suggestion = if suggestion.is_some() {
                     suggestion
-                } else if let map = self.tcx.sess.source_map()
-                    && let Some(src) = map.span_to_filename(ident.span).into_local_path()
-                    && let i = ident.as_str()
-                    // FIXME: add case where non parent using undeclared module (hard?)
-                    && let Some(dir) = src.parent()
-                    && let Some(src) = src.with_extension("").file_name().and_then(|x| x.to_str())
-                    && let Some(m) = [
-                        // …/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())
-                {
+                } else if let Some(m) = self.undeclared_module_exists(ident) {
+                    let map = self.tcx.sess.source_map();
                     let sp = map
                         .span_extend_to_prev_char(
                             map.span_extend_to_prev_char(ident.span, '\n', true),
@@ -2492,6 +2464,40 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
         }
     }
 
+    fn undeclared_module_exists(&mut self, ident: Ident) -> Option<std::path::PathBuf> {
+        let map = self.tcx.sess.source_map();
+
+        let src = map.span_to_filename(ident.span).into_local_path()?;
+        let i = ident.as_str();
+        // FIXME: add case where non parent using undeclared module (hard?)
+        let dir = src.parent()?;
+        let src = src.file_stem()?.to_str()?;
+        [
+            // …/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()
+    }
+
     /// Adds suggestions for a path that cannot be resolved.
     #[instrument(level = "debug", skip(self, parent_scope))]
     pub(crate) fn make_path_suggestion(