Auto merge of #40368 - arielb1:rollup, r=arielb1

Rollup of 20 pull requests

- Successful merges: #40154, #40222, #40226, #40237, #40254, #40258, #40265, #40268, #40279, #40283, #40292, #40293, #40296, #40316, #40321, #40325, #40326, #40327, #40333, #40335
- Failed merges:

3 files changed, 25 insertions, 4 deletions

diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css
index b0bf69b0181..6bd9cf6620b 100644
--- a/src/librustdoc/html/static/rustdoc.css
+++ b/src/librustdoc/html/static/rustdoc.css
@@ -167,7 +167,11 @@ nav.sub {
 	position: absolute;
 	left: 0;
 	top: 0;
-	min-height: 100%;
+	min-height: 100vh;
+}
+
+.sidebar .current {
+	margin-right: -20px;
 }
 
 .content, nav { max-width: 960px; }
@@ -185,11 +189,16 @@ nav.sub {
 }
 
 .sidebar .location {
+	border: 1px solid;
 	font-size: 17px;
 	margin: 30px 0 20px 0;
 	text-align: center;
 }
 
+.location:empty {
+	border: none;
+}
+
 .location a:first-child { font-weight: 500; }
 
 .block {
diff --git a/src/librustdoc/html/static/styles/main.css b/src/librustdoc/html/static/styles/main.css
index 862d6d12b9a..f1e81900d1e 100644
--- a/src/librustdoc/html/static/styles/main.css
+++ b/src/librustdoc/html/static/styles/main.css
@@ -37,8 +37,17 @@ pre {
     background-color: #F5F5F5;
 }
 
+.sidebar {
+    background-color: #F1F1F1;
+}
+
+.sidebar .current {
+    background-color: #fff;
+}
+
 .sidebar .location {
-    background: #e1e1e1;
+    border-color: #000;
+    background-color: #fff;
     color: #333;
 }
 
diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs
index c7000ee1e40..c1ecc241b7b 100644
--- a/src/librustdoc/test.rs
+++ b/src/librustdoc/test.rs
@@ -422,8 +422,11 @@ impl Collector {
                     as_test_harness: bool, compile_fail: bool, error_codes: Vec<String>,
                     line: usize, filename: String) {
         let name = if self.use_headers {
-            let s = self.current_header.as_ref().map(|s| &**s).unwrap_or("");
-            format!("{} - {} (line {})", filename, s, line)
+            if let Some(ref header) = self.current_header {
+                format!("{} - {} (line {})", filename, header, line)
+            } else {
+                format!("{} - (line {})", filename, line)
+            }
         } else {
             format!("{} - {} (line {})", filename, self.names.join("::"), line)
         };