From f19548b76f3bafa9eb60f5a3deb2b74153ee5ffc Mon Sep 17 00:00:00 2001
From: Jacob Hoffman-Andrews <github@hoffman-andrews.com>
Date: Sun, 31 Oct 2021 10:23:35 -0700
Subject: [PATCH] Make h2 headings hyperlinks

---
 src/librustdoc/html/render/mod.rs          | 14 +++++++-------
 src/librustdoc/html/render/print_item.rs   | 11 ++++++-----
 src/librustdoc/html/static/css/rustdoc.css |  6 ++++++
 src/test/rustdoc-gui/anchors.goml          |  2 +-
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs
index 16334890da674..377818b34d79f 100644
--- a/src/librustdoc/html/render/mod.rs
+++ b/src/librustdoc/html/render/mod.rs
@@ -1054,7 +1054,7 @@ fn render_assoc_items_inner(
             AssocItemRender::All => {
                 tmp_buf.write_str(
                     "<h2 id=\"implementations\" class=\"small-section-header\">\
-                         Implementations<a href=\"#implementations\" class=\"anchor\"></a>\
+                         <a href=\"#implementations\">Implementations</a>\
                     </h2>",
                 );
                 RenderMode::Normal
@@ -1068,8 +1068,8 @@ fn render_assoc_items_inner(
                 write!(
                     tmp_buf,
                     "<h2 id=\"{id}\" class=\"small-section-header\">\
-                         <span>Methods from {trait_}&lt;Target = {type_}&gt;</span>\
                          <a href=\"#{id}\" class=\"anchor\"></a>\
+                         <span>Methods from {trait_}&lt;Target = {type_}&gt;</span>\
                      </h2>",
                     id = id,
                     trait_ = trait_.print(cx),
@@ -1131,7 +1131,7 @@ fn render_assoc_items_inner(
             write!(
                 w,
                 "<h2 id=\"trait-implementations\" class=\"small-section-header\">\
-                     Trait Implementations<a href=\"#trait-implementations\" class=\"anchor\"></a>\
+                     <a href=\"#trait-implementations\">Trait Implementations</a>\
                  </h2>\
                  <div id=\"trait-implementations-list\">{}</div>",
                 impls
@@ -1141,8 +1141,7 @@ fn render_assoc_items_inner(
         if !synthetic.is_empty() {
             w.write_str(
                 "<h2 id=\"synthetic-implementations\" class=\"small-section-header\">\
-                     Auto Trait Implementations\
-                     <a href=\"#synthetic-implementations\" class=\"anchor\"></a>\
+                     <a href=\"#synthetic-implementations\">Auto Trait Implementations</a>\
                  </h2>\
                  <div id=\"synthetic-implementations-list\">",
             );
@@ -1153,8 +1152,9 @@ fn render_assoc_items_inner(
         if !blanket_impl.is_empty() {
             w.write_str(
                 "<h2 id=\"blanket-implementations\" class=\"small-section-header\">\
-                     Blanket Implementations\
-                     <a href=\"#blanket-implementations\" class=\"anchor\"></a>\
+                     <a href=\"#blanket-implementations\">\
+                        Blanket Implementations\
+                    </a>\
                  </h2>\
                  <div id=\"blanket-implementations-list\">",
             );
diff --git a/src/librustdoc/html/render/print_item.rs b/src/librustdoc/html/render/print_item.rs
index 44a9ec5ea4210..1fd3bfe92038f 100644
--- a/src/librustdoc/html/render/print_item.rs
+++ b/src/librustdoc/html/render/print_item.rs
@@ -660,7 +660,7 @@ fn item_trait(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, t: &clean::Tra
         write!(
             w,
             "<h2 id=\"{0}\" class=\"small-section-header\">\
-                {1}<a href=\"#{0}\" class=\"anchor\"></a>\
+                <a href=\"#{0}\">{1}</a>\
              </h2>{2}",
             id, title, extra_content
         )
@@ -1001,7 +1001,7 @@ fn item_union(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, s: &clean::Uni
         write!(
             w,
             "<h2 id=\"fields\" class=\"fields small-section-header\">\
-                   Fields<a href=\"#fields\" class=\"anchor\"></a></h2>"
+                   <a href=\"#fields\">Fields</a></h2>"
         );
         for (field, ty) in fields {
             let name = field.name.as_ref().expect("union field name");
@@ -1108,7 +1108,7 @@ fn item_enum(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, e: &clean::Enum
         write!(
             w,
             "<h2 id=\"variants\" class=\"variants small-section-header\">\
-                   Variants{}<a href=\"#variants\" class=\"anchor\"></a></h2>",
+                   <a href=\"#variants\">Variants{}</a></h2>",
             document_non_exhaustive_header(it)
         );
         document_non_exhaustive(w, it);
@@ -1300,7 +1300,7 @@ fn item_struct(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, s: &clean::St
             write!(
                 w,
                 "<h2 id=\"fields\" class=\"fields small-section-header\">\
-                     {}{}<a href=\"#fields\" class=\"anchor\"></a>\
+                     <a href=\"#fields\">{}{}</a>\
                  </h2>",
                 if let CtorKind::Fictive = s.struct_type { "Fields" } else { "Tuple Fields" },
                 document_non_exhaustive_header(it)
@@ -1732,7 +1732,8 @@ fn document_type_layout(w: &mut Buffer, cx: &Context<'_>, ty_def_id: DefId) {
         return;
     }
 
-    writeln!(w, "<h2 class=\"small-section-header\">Layout</h2>");
+    writeln!(w, "<h2 id=\"layout\" class=\"small-section-header\">");
+    writeln!(w, "<a href=\"#layout\">Layout</a></h2>");
     writeln!(w, "<div class=\"docblock\">");
 
     let tcx = cx.tcx();
diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css
index e5c667a37c669..650d649dede70 100644
--- a/src/librustdoc/html/static/css/rustdoc.css
+++ b/src/librustdoc/html/static/css/rustdoc.css
@@ -1129,6 +1129,7 @@ a.test-arrow:hover{
 	text-decoration: none;
 }
 
+.small-section-header:hover > a:before,
 .section-header:hover a:before {
 	position: absolute;
 	left: -25px;
@@ -1136,6 +1137,11 @@ a.test-arrow:hover{
 	content: '\2002\00a7\2002';
 }
 
+#deref-methods-str > a.anchor:before {
+	position: relative;
+	left: -0.5em;
+}
+
 .section-header:hover a {
 	text-decoration: none;
 }
diff --git a/src/test/rustdoc-gui/anchors.goml b/src/test/rustdoc-gui/anchors.goml
index ca60be72cea46..05bf689f8c38a 100644
--- a/src/test/rustdoc-gui/anchors.goml
+++ b/src/test/rustdoc-gui/anchors.goml
@@ -23,7 +23,7 @@ assert-css: (".in-band a", {"color": "rgb(0, 0, 0)"})
 
 // We move the cursor over the "Implementations" title so the anchor is displayed.
 move-cursor-to: "h2#implementations"
-assert-css: ("h2#implementations a.anchor", {"color": "rgb(0, 0, 0)"})
+assert-css: ("h2#implementations", {"color": "rgb(0, 0, 0)"})
 
 // Same thing with the impl block title.
 move-cursor-to: "#impl"