diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-06-11 19:04:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-11 19:04:08 +0200 |
| commit | f23f6acb56fbfb4e53d7bfcae93d00cd6a116db2 (patch) | |
| tree | d31c3a966f22f193dfb96225f16f3c41066b0fd2 /src | |
| parent | 50c0192c64241d723066add22c53d472e2b9cba9 (diff) | |
| parent | c379fb5b3a351cf26dc136ee8b8bc557aa904a75 (diff) | |
| download | rust-f23f6acb56fbfb4e53d7bfcae93d00cd6a116db2.tar.gz rust-f23f6acb56fbfb4e53d7bfcae93d00cd6a116db2.zip | |
Rollup merge of #72180 - euclio:rustdoc-test-extra-space, r=Dylan-DPC
remove extra space from crate-level doctest names Before: ``` running 2 tests test src/test/rustdoc-ui/doctest-output.rs - foo::bar (line 11) ... ok test src/test/rustdoc-ui/doctest-output.rs - (line 5) ... ok test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out ``` After: ``` running 2 tests test src/test/rustdoc-ui/doctest-output.rs - foo::bar (line 11) ... ok test src/test/rustdoc-ui/doctest-output.rs - (line 5) ... ok test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out ```
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/test.rs | 6 | ||||
| -rw-r--r-- | src/test/rustdoc-ui/doctest-output.rs | 15 | ||||
| -rw-r--r-- | src/test/rustdoc-ui/doctest-output.stdout | 7 |
3 files changed, 27 insertions, 1 deletions
diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs index 4b15a591da7..21aa0ded5a4 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 00000000000..f812263c252 --- /dev/null +++ b/src/test/rustdoc-ui/doctest-output.rs @@ -0,0 +1,15 @@ +// compile-flags:--test --test-args=--test-threads=1 +// 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 00000000000..9a55bf50196 --- /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 + |