From ce915f500a1743945c5bc67d133d6801dbf9b87f Mon Sep 17 00:00:00 2001
From: Andy Russell <arussell123@gmail.com>
Date: Wed, 13 May 2020 18:31:33 -0400
Subject: [PATCH] remove extra space from crate-level doctest names

---
 src/librustdoc/test.rs                    |  6 +++++-
 src/test/rustdoc-ui/doctest-output.rs     | 15 +++++++++++++++
 src/test/rustdoc-ui/doctest-output.stdout |  7 +++++++
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 src/test/rustdoc-ui/doctest-output.rs
 create mode 100644 src/test/rustdoc-ui/doctest-output.stdout

diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs
index a00c9a0bcea65..5d6ec5f09d9d3 100644
--- a/src/librustdoc/test.rs
+++ b/src/librustdoc/test.rs
@@ -676,7 +676,11 @@ impl Collector {
     }
 
     fn generate_name(&self, line: usize, filename: &FileName) -> String {
-        format!("{} - {} (line {})", filename, self.names.join("::"), line)
+        let mut item_path = self.names.join("::");
+        if !item_path.is_empty() {
+            item_path.push(' ');
+        }
+        format!("{} - {}(line {})", filename, item_path, line)
     }
 
     pub fn set_position(&mut self, position: Span) {
diff --git a/src/test/rustdoc-ui/doctest-output.rs b/src/test/rustdoc-ui/doctest-output.rs
new file mode 100644
index 0000000000000..b34cb0afd5271
--- /dev/null
+++ b/src/test/rustdoc-ui/doctest-output.rs
@@ -0,0 +1,15 @@
+// compile-flags:--test
+// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
+// check-pass
+
+//! ```
+//! assert_eq!(1 + 1, 2);
+//! ```
+
+pub mod foo {
+
+    /// ```
+    /// assert_eq!(1 + 1, 2);
+    /// ```
+    pub fn bar() {}
+}
diff --git a/src/test/rustdoc-ui/doctest-output.stdout b/src/test/rustdoc-ui/doctest-output.stdout
new file mode 100644
index 0000000000000..9a55bf5019692
--- /dev/null
+++ b/src/test/rustdoc-ui/doctest-output.stdout
@@ -0,0 +1,7 @@
+
+running 2 tests
+test $DIR/doctest-output.rs - (line 5) ... ok
+test $DIR/doctest-output.rs - foo::bar (line 11) ... ok
+
+test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+