From 4762694e4a4d04295c578a344d217e34067c608c Mon Sep 17 00:00:00 2001
From: binarycat <binarycat@envs.net>
Date: Sat, 12 Jul 2025 15:05:30 -0500
Subject: rustdoc: never try to link to unnamable types

---
 src/librustdoc/html/format.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/librustdoc/html/format.rs')

diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs
index be8a2d511e9..f4cf819fc59 100644
--- a/src/librustdoc/html/format.rs
+++ b/src/librustdoc/html/format.rs
@@ -368,6 +368,8 @@ pub(crate) enum HrefError {
     Private,
     // Not in external cache, href link should be in same page
     NotInExternalCache,
+    /// Refers to an unnamable item, such as one defined within a function or const block.
+    UnnamableItem,
 }
 
 /// This function is to get the external macro path because they are not in the cache used in
@@ -498,7 +500,13 @@ fn url_parts(
             builder.extend(module_fqp.iter().copied());
             Ok(builder)
         }
-        ExternalLocation::Local => Ok(href_relative_parts(module_fqp, relative_to)),
+        ExternalLocation::Local => {
+            if module_fqp.iter().any(|sym| sym.as_str() == "_") {
+                Err(HrefError::UnnamableItem)
+            } else {
+                Ok(href_relative_parts(module_fqp, relative_to))
+            }
+        }
         ExternalLocation::Unknown => Err(HrefError::DocumentationNotBuilt),
     }
 }
-- 
cgit 1.4.1-3-g733a5


From f57283d6141fcc430e739fc2ad633e8997a66310 Mon Sep 17 00:00:00 2001
From: binarycat <binarycat@envs.net>
Date: Tue, 15 Jul 2025 16:06:03 -0500
Subject: rustdoc: actually never link to unnamable types

---
 src/librustdoc/html/format.rs | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

(limited to 'src/librustdoc/html/format.rs')

diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs
index f4cf819fc59..90d385aa135 100644
--- a/src/librustdoc/html/format.rs
+++ b/src/librustdoc/html/format.rs
@@ -481,6 +481,20 @@ fn generate_item_def_id_path(
     Ok((url_parts, shortty, fqp))
 }
 
+/// Checks if the given defid refers to an item that is unnamable, such as one defined in a const block.
+fn is_unnamable(tcx: TyCtxt<'_>, did: DefId) -> bool {
+    let mut cur_did = did;
+    while let Some(parent) = tcx.opt_parent(cur_did) {
+        match tcx.def_kind(parent) {
+            // items defined in these can be linked to
+            DefKind::Mod | DefKind::Impl { .. } | DefKind::ForeignMod => cur_did = parent,
+            // everything else does not have docs generated for it
+            _ => return true,
+        }
+    }
+    return false;
+}
+
 fn to_module_fqp(shortty: ItemType, fqp: &[Symbol]) -> &[Symbol] {
     if shortty == ItemType::Module { fqp } else { &fqp[..fqp.len() - 1] }
 }
@@ -500,13 +514,7 @@ fn url_parts(
             builder.extend(module_fqp.iter().copied());
             Ok(builder)
         }
-        ExternalLocation::Local => {
-            if module_fqp.iter().any(|sym| sym.as_str() == "_") {
-                Err(HrefError::UnnamableItem)
-            } else {
-                Ok(href_relative_parts(module_fqp, relative_to))
-            }
-        }
+        ExternalLocation::Local => Ok(href_relative_parts(module_fqp, relative_to)),
         ExternalLocation::Unknown => Err(HrefError::DocumentationNotBuilt),
     }
 }
@@ -560,6 +568,9 @@ pub(crate) fn href_with_root_path(
         }
         _ => original_did,
     };
+    if is_unnamable(cx.tcx(), did) {
+        return Err(HrefError::UnnamableItem);
+    }
     let cache = cx.cache();
     let relative_to = &cx.current;
 
-- 
cgit 1.4.1-3-g733a5


From 05a62c8a1172795709219aa5afc833eb1ab57c25 Mon Sep 17 00:00:00 2001
From: binarycat <binarycat@envs.net>
Date: Sat, 19 Jul 2025 14:26:47 -0500
Subject: impl items are never unnamable

---
 src/librustdoc/html/format.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/librustdoc/html/format.rs')

diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs
index 90d385aa135..457af8e994d 100644
--- a/src/librustdoc/html/format.rs
+++ b/src/librustdoc/html/format.rs
@@ -486,8 +486,14 @@ fn is_unnamable(tcx: TyCtxt<'_>, did: DefId) -> bool {
     let mut cur_did = did;
     while let Some(parent) = tcx.opt_parent(cur_did) {
         match tcx.def_kind(parent) {
-            // items defined in these can be linked to
-            DefKind::Mod | DefKind::Impl { .. } | DefKind::ForeignMod => cur_did = parent,
+            // items defined in these can be linked to, as long as they are visible
+            DefKind::Mod | DefKind::ForeignMod => cur_did = parent,
+            // items in impls can be linked to,
+            // as long as we can link to the item the impl is on.
+            // since associated traits are not a thing,
+            // it should not be possible to refer to an impl item if
+            // the base type is not namable.
+            DefKind::Impl { .. } => return false,
             // everything else does not have docs generated for it
             _ => return true,
         }
-- 
cgit 1.4.1-3-g733a5