Skip to content

Commit 7586820

Browse files
committed
Update doctests to use new format
1 parent c1af240 commit 7586820

File tree

69 files changed

+278
-277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+278
-277
lines changed

src/tools/compiletest/src/runtest.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2274,6 +2274,7 @@ impl<'test> TestCx<'test> {
22742274
for _ in res.stdout.split('\n').filter(|s| s.starts_with("test ")).inspect(|s| {
22752275
if let Some((left, right)) = s.split_once(" - ") {
22762276
let path = left.rsplit("test ").next().unwrap();
2277+
println!("Checking doctest: {}", path);
22772278
let path = fs::canonicalize(&path).expect("failed to canonicalize");
22782279
let path = path.to_str().unwrap().replace('\\', "/");
22792280
if let Some(ref mut v) = files.get_mut(&path) {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
running 2 tests
3-
test doctest.rs - (line 4) ... ok
4-
test doctest.rs - init (line 8) ... ok
3+
test doctest.rs:4 ... ok
4+
test doctest.rs:8 - init ... ok
55

66
test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
77

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
running 2 tests
3-
test doctest.rs - (line 4) ... ok
4-
test doctest.rs - init (line 8) ... ok
3+
test doctest.rs:4 ... ok
4+
test doctest.rs:8 - init ... ok
55

66
test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
77

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
running 2 tests
3-
test doctest-standalone.rs - (line 4) ... ok
4-
test doctest-standalone.rs - init (line 8) ... ok
3+
test doctest-standalone.rs:4 ... ok
4+
test doctest-standalone.rs:8 - init ... ok
55

66
test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
77

tests/run-make/rustdoc-cfgspec-parsing/rmake.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ fn main() {
1717
.library_search_path(cwd())
1818
.input("foo.rs")
1919
.run()
20-
.assert_stdout_contains("foo.rs - foo (line 1) ... ok");
20+
.assert_stdout_contains("foo.rs:1 - foo ... ok");
2121
}

tests/run-make/rustdoc-error-lines/rmake.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ fn main() {
99
let output = rustdoc().input("input.rs").arg("--test").run_fail().stdout_utf8();
1010

1111
let should_contain = &[
12-
"input.rs - foo (line 5)",
12+
"input.rs:5 - foo",
1313
"input.rs:8:15",
14-
"input.rs - bar (line 13)",
14+
"input.rs:13 - bar",
1515
"input.rs:16:15",
16-
"input.rs - bar (line 22)",
16+
"input.rs:22 - bar",
1717
"input.rs:25:15",
1818
];
1919
for text in should_contain {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11

22
running 1 test
3-
test $DIR/2024-doctests-checks.rs - Foo (line 8) ... ok
3+
test $DIR/2024-doctests-checks.rs:8 - Foo ... ok
44

55
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
66

77

88
running 1 test
9-
test $DIR/2024-doctests-checks.rs - Foo (line 15) ... ok
9+
test $DIR/2024-doctests-checks.rs:15 - Foo ... ok
1010

1111
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
1212

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11

22
running 1 test
3-
test $DIR/2024-doctests-crate-attribute.rs - Foo (line 20) ... ok
3+
test $DIR/2024-doctests-crate-attribute.rs:20 - Foo ... ok
44

55
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
66

77

88
running 1 test
9-
test $DIR/2024-doctests-crate-attribute.rs - Foo (line 11) ... ok
9+
test $DIR/2024-doctests-crate-attribute.rs:11 - Foo ... ok
1010

1111
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
1212

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
running 2 tests
3-
test $DIR/cfg-test.rs - Bar (line 27) ... ok
4-
test $DIR/cfg-test.rs - Foo (line 19) ... ok
3+
test $DIR/cfg-test.rs:19 - Foo ... ok
4+
test $DIR/cfg-test.rs:27 - Bar ... ok
55

66
test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
77

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
running 1 test
3-
test $DIR/check-cfg-test.rs - Foo (line 8) ... ok
3+
test $DIR/check-cfg-test.rs:8 - Foo ... ok
44

55
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
66

0 commit comments

Comments
 (0)