move

Author: bend-n

compiler/rustc_resolve/src/diagnostics.rs

@@ -2424,23 +2424,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                 let suggestion = if suggestion.is_some() {
                     suggestion
                 } 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),
-                            '\n',
-                            true,
-                        )
-                        .shrink_to_lo();
-                    Some((
-                        vec![(sp, format!("mod {ident}\n"))],
-                        format!(
-                            "to make use of source file {}, use `mod {ident}` \
-                             in this file to declare the module",
-                            m.display()
-                        ),
-                        Applicability::MaybeIncorrect,
-                    ))
+                    self.undeclared_module_suggest_declare(ident, m)
                 } else if was_invoked_from_cargo() {
                     Some((
                         vec![],
@@ -2462,6 +2446,26 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
         }
     }
 
+    fn undeclared_module_suggest_declare(
+        &mut self,
+        ident: Ident,
+        path: std::path::PathBuf,
+    ) -> Option<(Vec<(Span, String)>, String, Applicability)> {
+        let map = self.tcx.sess.source_map();
+        // get the line before this line
+        let sp = map.span_extend_to_prev_char(ident.span, '\n', true);
+        let sp = map.span_extend_to_prev_char(sp, '\n', true).shrink_to_lo();
+        Some((
+            vec![(sp, format!("mod {ident};\n"))],
+            format!(
+                "to make use of source file {}, use `mod {ident}` \
+                 in this file to declare the module",
+                path.display()
+            ),
+            Applicability::MaybeIncorrect,
+        ))
+    }
+
     fn undeclared_module_exists(&mut self, ident: Ident) -> Option<std::path::PathBuf> {
         let map = self.tcx.sess.source_map();
 

tests/ui/modules_and_files_visibility/mod_file_disambig.stderr

@@ -14,7 +14,7 @@ LL |     assert_eq!(mod_file_aux::bar(), 10);
    |
 help: to make use of source file $DIR/mod_file_aux.rs, use `mod mod_file_aux` in this file to declare the module
    |
-LL + mod mod_file_aux
+LL + mod mod_file_aux;
    |
 
 error: aborting due to 2 previous errors