Move intra-doc link to current crate into rustc_resolve directly

Author: GuillaumeGomez

compiler/rustc_resolve/src/late.rs

@@ -4951,10 +4951,26 @@ impl<'a, 'ast, 'ra: 'ast, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
                     path = &path[..idx];
                     need_traits_in_scope = true;
                     for ns in [TypeNS, ValueNS, MacroNS] {
-                        self.resolve_and_cache_rustdoc_path(path, ns);
+                        if let Some(res) = self.resolve_and_cache_rustdoc_path(path, ns) {
+                            // Rustdoc ignores tool attribute resolutions and attempts
+                            // to resolve their prefixes for diagnostics.
+                            any_resolved |=
+                                !matches!(res, Res::NonMacroAttr(NonMacroAttrKind::Tool));
+                        }
                     }
                 }
             }
+            // Only link to current crate if nothing else matched.
+            if !any_resolved && &*path_str == self.r.tcx.crate_name(LOCAL_CRATE).as_str() {
+                self.r
+                    .doc_link_resolutions
+                    .entry(self.parent_scope.module.nearest_parent_mod().expect_local())
+                    .or_default()
+                    .insert(
+                        (Symbol::intern(&path_str), ValueNS),
+                        Some(Res::Def(DefKind::Mod, CRATE_DEF_ID.to_def_id())),
+                    );
+            }
         }
 
         if need_traits_in_scope {

src/librustdoc/passes/collect_intra_doc_links.rs

@@ -455,14 +455,7 @@ impl<'tcx> LinkCollector<'_, 'tcx> {
                 )
             })
             .and_then(|res| res.try_into().ok())
-            .or_else(|| resolve_primitive(path_str, ns))
-            .or_else(|| {
-                if self.cx.tcx.crate_name(LOCAL_CRATE).as_str() == path_str {
-                    Some(Res::from_def_id(self.cx.tcx, CRATE_DEF_ID.to_def_id()))
-                } else {
-                    None
-                }
-            });
+            .or_else(|| resolve_primitive(path_str, ns));
         debug!("{path_str} resolved to {result:?} in namespace {ns:?}");
         result
     }

tests/rustdoc/intra-doc/module-scope-name-resolution-55364.rs

@@ -1,30 +1,30 @@
 // https://github.com/rust-lang/rust/issues/55364
-#![crate_name="foofoo"]
+#![crate_name="foo"]
 
 // First a module with inner documentation
 
-//@ has foofoo/subone/index.html
-// These foofoo/bar links in the module's documentation should refer inside `subone`
+//@ has foo/subone/index.html
+// These foo/bar links in the module's documentation should refer inside `subone`
 //@ has - '//section[@id="main-content"]/details[@open=""]/div[@class="docblock"]//a[@href="fn.foo.html"]' 'foo'
 //@ has - '//section[@id="main-content"]/details[@open=""]/div[@class="docblock"]//a[@href="fn.bar.html"]' 'bar'
 pub mod subone {
     //! See either [foo] or [bar].
 
     // This should refer to subone's `bar`
-    //@ has foofoo/subone/fn.foo.html
+    //@ has foo/subone/fn.foo.html
     //@ has - '//section[@id="main-content"]/details/div[@class="docblock"]//a[@href="fn.bar.html"]' 'bar'
     /// See [bar]
     pub fn foo() {}
     // This should refer to subone's `foo`
-    //@ has foofoo/subone/fn.bar.html
+    //@ has foo/subone/fn.bar.html
     //@ has - '//section[@id="main-content"]/details/div[@class="docblock"]//a[@href="fn.foo.html"]' 'foo'
     /// See [foo]
     pub fn bar() {}
 }
 
 // A module with outer documentation
 
-//@ has foofoo/subtwo/index.html
+//@ has foo/subtwo/index.html
 // These foo/bar links in the module's documentation should not reference inside `subtwo`
 //@ !has - '//section[@id="main-content"]/div[@class="docblock"]//a[@href="fn.foo.html"]' 'foo'
 //@ !has - '//section[@id="main-content"]/div[@class="docblock"]//a[@href="fn.bar.html"]' 'bar'
@@ -39,13 +39,13 @@ pub mod subtwo {
 
     // Despite the module's docs referring to the top level foo/bar,
     // this should refer to subtwo's `bar`
-    //@ has foofoo/subtwo/fn.foo.html
+    //@ has foo/subtwo/fn.foo.html
     //@ has - '//section[@id="main-content"]/details/div[@class="docblock"]//a[@href="fn.bar.html"]' 'bar'
     /// See [bar]
     pub fn foo() {}
     // Despite the module's docs referring to the top level foo/bar,
     // this should refer to subtwo's `foo`
-    //@ has foofoo/subtwo/fn.bar.html
+    //@ has foo/subtwo/fn.bar.html
     //@ has - '//section[@id="main-content"]/details/div[@class="docblock"]//a[@href="fn.foo.html"]' 'foo'
     /// See [foo]
     pub fn bar() {}
@@ -60,7 +60,7 @@ pub fn bar() {}
 
 // This module refers to the outer foo/bar by means of `super::`
 
-//@ has foofoo/subthree/index.html
+//@ has foo/subthree/index.html
 // This module should also refer to the top level foo/bar
 //@ has - '//section[@id="main-content"]/details/div[@class="docblock"]//a[@href="../fn.foo.html"]' 'foo'
 //@ has - '//section[@id="main-content"]/details/div[@class="docblock"]//a[@href="../fn.bar.html"]' 'bar'
@@ -70,7 +70,7 @@ pub mod subthree {
 
 // Next we go *deeper* - In order to ensure it's not just "this or parent"
 // we test `crate::` and a `super::super::...` chain
-//@ has foofoo/subfour/subfive/subsix/subseven/subeight/index.html
+//@ has foo/subfour/subfive/subsix/subseven/subeight/index.html
 //@ has - '//section[@id="main-content"]/dl[@class="item-table"]/dd//a[@href="../../../../../subone/fn.foo.html"]' 'other foo'
 //@ has - '//section[@id="main-content"]/dl[@class="item-table"]/dd//a[@href="../../../../../subtwo/fn.bar.html"]' 'other bar'
 pub mod subfour {