Fix test cases and hide-sidebar mode

Author: notriddle

src/librustdoc/html/static/css/rustdoc.css

@@ -1867,15 +1867,19 @@ a.tooltip:hover::after {
 	display: flex;
 	margin-right: 4px;
 	position: fixed;
+	margin-top: 25px;
 	left: 6px;
 	height: 34px;
 	width: 34px;
 	background-color: var(--main-background-color);
 	z-index: 1;
 }
 .src #sidebar-button {
+	margin-top: 0;
+	top: 8px;
 	left: 8px;
 	z-index: calc(var(--desktop-sidebar-z-index) + 1);
+	border-color: var(--border-color);
 }
 .hide-sidebar .src #sidebar-button {
 	position: static;
@@ -1902,14 +1906,14 @@ button#toggle-all-docs {
 }
 #sidebar-button > a {
 	background-color: var(--button-background-color);
-	border-color: var(--border-color);
 	width: 33px;
 }
 
 #search-button > a:hover, #search-button > a:focus-visible,
 .settings-menu > a:hover, .settings-menu > a:focus-visible,
 .help-menu > a:hover, #help-menu > a:focus-visible,
 #sidebar-button > a:hover, #sidebar-button > a:focus-visible,
+#copy-path:hover, #copy-path:focus-visible,
 button#toggle-all-docs:hover, button#toggle-all-docs:focus-visible {
 	border-color: var(--settings-button-border-focus);
 	text-decoration: none;
@@ -2023,7 +2027,8 @@ rustdoc-toolbar span.label {
 	margin-left: 10px;
 	padding: 0;
 	padding-left: 2px;
-	border: 0;
+	border: solid 1px transparent;
+	border-radius: var(--button-border-radius);
 	font-size: 0;
 }
 #copy-path::before {
@@ -2549,6 +2554,9 @@ in src-script.js and main.js
 	}
 
 	/* sidebar button becomes topbar button */
+	.hide-sidebar #sidebar-button {
+		margin-top: 0;
+	}
 	#sidebar-button > a:before {
 		content: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" \
 			viewBox="0 0 22 22" fill="none" stroke="black">\

src/librustdoc/html/static/js/main.js

@@ -220,14 +220,9 @@ function preLoadCss(cssUrl) {
                 const out = searchState.outputElement().parentElement;
                 const hdr = document.createElement("div");
                 hdr.className = "main-heading search-results-main-heading";
-                const rootPath = getVar("root-path");
-                const currentCrate = getVar("current-crate");
                 hdr.innerHTML = `<nav class="sub">
                     <form class="search-form">
                         <span></span> <!-- This empty span is a hacky fix for Safari: see #93184 -->
-                        <div id="sidebar-button" tabindex="-1">
-                            <a href="${rootPath}${currentCrate}/all.html" title="show sidebar"></a>
-                        </div>
                         <input
                             class="search-input"
                             name="search"
@@ -1599,7 +1594,15 @@ href="https://doc.rust-lang.org/${channel}/rustdoc/read-documentation/search.htm
     // On larger, "desktop-sized" viewports (though that includes many
     // tablets), it's fixed-position, appears in the left side margin,
     // and it can be activated by resizing the sidebar into nothing.
-    const sidebarButton = document.getElementById("sidebar-button");
+    let sidebarButton = document.getElementById("sidebar-button");
+    if (!sidebarButton) {
+        sidebarButton = document.createElement("div");
+        sidebarButton.id = "sidebar-button";
+        const path = `${window.rootPath}${window.currentCrate}/all.html`;
+        sidebarButton.innerHTML = `<a href="${path}" title="show sidebar"></a>`;
+        const body = document.querySelector(".main-heading");
+        body.insertBefore(sidebarButton, body.firstChild);
+    }
     if (sidebarButton) {
         sidebarButton.addEventListener("click", e => {
             removeClass(document.documentElement, "hide-sidebar");