about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorAriel Ben-Yehuda <arielb1@mail.tau.ac.il>2017-03-08 20:54:00 +0200
committerGitHub <noreply@github.com>2017-03-08 20:54:00 +0200
commitd4eb25cf0eb4c75c72eea8249b5dfaaabbbbf4a4 (patch)
tree55172c78cd50586625d04067260c1461e4de0360 /src
parent949eafe34aeb8fccac60e163f19eea31477f076e (diff)
parent2e5b38018089823cd9db733af37f773e29b9f9d5 (diff)
downloadrust-d4eb25cf0eb4c75c72eea8249b5dfaaabbbbf4a4.tar.gz
rust-d4eb25cf0eb4c75c72eea8249b5dfaaabbbbf4a4.zip
Rollup merge of #40293 - malbarbo:rustdoctest, r=alexcrichton
Remove extra space in test description (of a mod test)
Diffstat (limited to 'src')
-rw-r--r--src/librustdoc/test.rs7
1 files changed, 5 insertions, 2 deletions
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)
         };