bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #72180 - euclio:rustdoc-test-extra-space, r=Dylan-DPC

Browse source 
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
```
This commit is contained in:
Dylan DPC 2020-06-11 19:04:08 +02:00 • committed by GitHub
commit f23f6acb56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/librustdoc/test.rs
View file

@ -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) {

15
src/test/rustdoc-ui/doctest-output.rs Normal file
View file

@ -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() {}
}

7
src/test/rustdoc-ui/doctest-output.stdout Normal file
View file

@ -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