Skip to content

Commit d0ec770

Browse files
GuillaumeGomezGuillaumeGomez
committed
Update rustdoc ui tests
1 parent f457600 commit d0ec770

28 files changed

+135
-96
lines changed

‎tests/rustdoc-ui/2024-doctests-checks.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
//@ compile-flags: --test --test-args=--test-threads=1
44
//@ normalize-stdout: "tests/rustdoc-ui" -> "$$DIR"
55
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
6+
//@ normalize-stdout: "ran in \d+\.\d+s" -> "ran in $$TIME"
7+
//@ normalize-stdout: "compilation took \d+\.\d+s" -> "compilation took $$TIME"
68
//@ normalize-stdout: ".rs:\d+:\d+" -> ".rs:$$LINE:$$COL"
79

810
/// ```

‎tests/rustdoc-ui/2024-doctests-checks.stdout

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

22
running 1 test
3-
test $DIR/2024-doctests-checks.rs - Foo (line 8) ... ok
3+
test $DIR/2024-doctests-checks.rs - Foo (line 10) ... 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 - Foo (line 17) ... ok
1010

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

13+
all doctests ran in $TIME; merged doctests compilation took $TIME

‎tests/rustdoc-ui/2024-doctests-crate-attribute.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
//@ normalize-stdout: "tests/rustdoc-ui" -> "$$DIR"
55
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
66
//@ normalize-stdout: ".rs:\d+:\d+" -> ".rs:$$LINE:$$COL"
7+
//@ normalize-stdout: "ran in \d+\.\d+s" -> "ran in $$TIME"
8+
//@ normalize-stdout: "compilation took \d+\.\d+s" -> "compilation took $$TIME"
79

810
/// This doctest is used to ensure that if a crate attribute is present,
911
/// it will not be part of the merged doctests.

‎tests/rustdoc-ui/2024-doctests-crate-attribute.stdout

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
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 - Foo (line 22) ... 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 - Foo (line 13) ... ok
1010

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

13+
all doctests ran in $TIME; merged doctests compilation took $TIME

‎tests/rustdoc-ui/doctest/dead-code-2024.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
//@ compile-flags:--test
55
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
66
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
7+
//@ normalize-stdout: "ran in \d+\.\d+s" -> "ran in $$TIME"
8+
//@ normalize-stdout: "compilation took \d+\.\d+s" -> "compilation took $$TIME"
79
//@ failure-status: 101
810

911
#![doc(test(attr(allow(unused_variables), deny(warnings))))]

‎tests/rustdoc-ui/doctest/dead-code-2024.stdout

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11

22
running 1 test
3-
test $DIR/dead-code-2024.rs - f (line 13) - compile ... FAILED
3+
test $DIR/dead-code-2024.rs - f (line 15) - compile ... FAILED
44

55
failures:
66

7-
---- $DIR/dead-code-2024.rs - f (line 13) stdout ----
7+
---- $DIR/dead-code-2024.rs - f (line 15) stdout ----
88
error: trait `T` is never used
9-
--> $DIR/dead-code-2024.rs:14:7
9+
--> $DIR/dead-code-2024.rs:16:7
1010
|
1111
LL | trait T { fn f(); }
1212
| ^
1313
|
1414
note: the lint level is defined here
15-
--> $DIR/dead-code-2024.rs:12:9
15+
--> $DIR/dead-code-2024.rs:14:9
1616
|
1717
LL | #![deny(warnings)]
1818
| ^^^^^^^^
@@ -23,7 +23,8 @@ error: aborting due to 1 previous error
2323
Couldn't compile the test.
2424

2525
failures:
26-
$DIR/dead-code-2024.rs - f (line 13)
26+
$DIR/dead-code-2024.rs - f (line 15)
2727

2828
test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
2929

30+
all doctests ran in $TIME; merged doctests compilation took $TIME

‎tests/rustdoc-ui/doctest/dead-code-items.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
//@ compile-flags:--test --test-args=--test-threads=1
55
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
66
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
7+
//@ normalize-stdout: "ran in \d+\.\d+s" -> "ran in $$TIME"
8+
//@ normalize-stdout: "compilation took \d+\.\d+s" -> "compilation took $$TIME"
79
//@ failure-status: 101
810

911
#![doc(test(attr(deny(warnings))))]

‎tests/rustdoc-ui/doctest/dead-code-items.stdout

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11

22
running 13 tests
3-
test $DIR/dead-code-items.rs - A (line 32) - compile ... ok
4-
test $DIR/dead-code-items.rs - A (line 88) - compile ... ok
5-
test $DIR/dead-code-items.rs - A::field (line 39) - compile ... FAILED
6-
test $DIR/dead-code-items.rs - A::method (line 94) - compile ... ok
7-
test $DIR/dead-code-items.rs - C (line 22) - compile ... FAILED
8-
test $DIR/dead-code-items.rs - Enum (line 70) - compile ... FAILED
9-
test $DIR/dead-code-items.rs - Enum::Variant1 (line 77) - compile ... FAILED
10-
test $DIR/dead-code-items.rs - MyTrait (line 103) - compile ... FAILED
11-
test $DIR/dead-code-items.rs - MyTrait::my_trait_fn (line 110) - compile ... FAILED
12-
test $DIR/dead-code-items.rs - S (line 14) - compile ... ok
13-
test $DIR/dead-code-items.rs - U (line 48) - compile ... ok
14-
test $DIR/dead-code-items.rs - U::field (line 55) - compile ... FAILED
15-
test $DIR/dead-code-items.rs - U::field2 (line 61) - compile ... ok
3+
test $DIR/dead-code-items.rs - A (line 34) - compile ... ok
4+
test $DIR/dead-code-items.rs - A (line 90) - compile ... ok
5+
test $DIR/dead-code-items.rs - A::field (line 41) - compile ... FAILED
6+
test $DIR/dead-code-items.rs - A::method (line 96) - compile ... ok
7+
test $DIR/dead-code-items.rs - C (line 24) - compile ... FAILED
8+
test $DIR/dead-code-items.rs - Enum (line 72) - compile ... FAILED
9+
test $DIR/dead-code-items.rs - Enum::Variant1 (line 79) - compile ... FAILED
10+
test $DIR/dead-code-items.rs - MyTrait (line 105) - compile ... FAILED
11+
test $DIR/dead-code-items.rs - MyTrait::my_trait_fn (line 112) - compile ... FAILED
12+
test $DIR/dead-code-items.rs - S (line 16) - compile ... ok
13+
test $DIR/dead-code-items.rs - U (line 50) - compile ... ok
14+
test $DIR/dead-code-items.rs - U::field (line 57) - compile ... FAILED
15+
test $DIR/dead-code-items.rs - U::field2 (line 63) - compile ... ok
1616

1717
failures:
1818

19-
---- $DIR/dead-code-items.rs - A::field (line 39) stdout ----
19+
---- $DIR/dead-code-items.rs - A::field (line 41) stdout ----
2020
error: trait `DeadCodeInField` is never used
21-
--> $DIR/dead-code-items.rs:40:7
21+
--> $DIR/dead-code-items.rs:42:7
2222
|
2323
LL | trait DeadCodeInField {}
2424
| ^^^^^^^^^^^^^^^
2525
|
2626
note: the lint level is defined here
27-
--> $DIR/dead-code-items.rs:38:9
27+
--> $DIR/dead-code-items.rs:40:9
2828
|
2929
LL | #![deny(dead_code)]
3030
| ^^^^^^^^^
3131

3232
error: aborting due to 1 previous error
3333

3434
Couldn't compile the test.
35-
---- $DIR/dead-code-items.rs - C (line 22) stdout ----
35+
---- $DIR/dead-code-items.rs - C (line 24) stdout ----
3636
error: unused variable: `unused_error`
37-
--> $DIR/dead-code-items.rs:23:5
37+
--> $DIR/dead-code-items.rs:25:5
3838
|
3939
LL | let unused_error = 5;
4040
| ^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_unused_error`
4141
|
4242
note: the lint level is defined here
43-
--> $DIR/dead-code-items.rs:20:9
43+
--> $DIR/dead-code-items.rs:22:9
4444
|
4545
LL | #![deny(warnings)]
4646
| ^^^^^^^^
@@ -49,15 +49,15 @@ LL | #![deny(warnings)]
4949
error: aborting due to 1 previous error
5050

5151
Couldn't compile the test.
52-
---- $DIR/dead-code-items.rs - Enum (line 70) stdout ----
52+
---- $DIR/dead-code-items.rs - Enum (line 72) stdout ----
5353
error: unused variable: `not_dead_code_but_unused`
54-
--> $DIR/dead-code-items.rs:71:5
54+
--> $DIR/dead-code-items.rs:73:5
5555
|
5656
LL | let not_dead_code_but_unused = 5;
5757
| ^^^^^^^^^^^^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_not_dead_code_but_unused`
5858
|
5959
note: the lint level is defined here
60-
--> $DIR/dead-code-items.rs:68:9
60+
--> $DIR/dead-code-items.rs:70:9
6161
|
6262
LL | #![deny(warnings)]
6363
| ^^^^^^^^
@@ -66,15 +66,15 @@ LL | #![deny(warnings)]
6666
error: aborting due to 1 previous error
6767

6868
Couldn't compile the test.
69-
---- $DIR/dead-code-items.rs - Enum::Variant1 (line 77) stdout ----
69+
---- $DIR/dead-code-items.rs - Enum::Variant1 (line 79) stdout ----
7070
error: unused variable: `unused_in_variant`
71-
--> $DIR/dead-code-items.rs:80:17
71+
--> $DIR/dead-code-items.rs:82:17
7272
|
7373
LL | fn main() { let unused_in_variant = 5; }
7474
| ^^^^^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_unused_in_variant`
7575
|
7676
note: the lint level is defined here
77-
--> $DIR/dead-code-items.rs:75:9
77+
--> $DIR/dead-code-items.rs:77:9
7878
|
7979
LL | #![deny(warnings)]
8080
| ^^^^^^^^
@@ -83,31 +83,31 @@ LL | #![deny(warnings)]
8383
error: aborting due to 1 previous error
8484

8585
Couldn't compile the test.
86-
---- $DIR/dead-code-items.rs - MyTrait (line 103) stdout ----
86+
---- $DIR/dead-code-items.rs - MyTrait (line 105) stdout ----
8787
error: trait `StillDeadCodeAtMyTrait` is never used
88-
--> $DIR/dead-code-items.rs:104:7
88+
--> $DIR/dead-code-items.rs:106:7
8989
|
9090
LL | trait StillDeadCodeAtMyTrait { }
9191
| ^^^^^^^^^^^^^^^^^^^^^^
9292
|
9393
note: the lint level is defined here
94-
--> $DIR/dead-code-items.rs:102:9
94+
--> $DIR/dead-code-items.rs:104:9
9595
|
9696
LL | #![deny(dead_code)]
9797
| ^^^^^^^^^
9898

9999
error: aborting due to 1 previous error
100100

101101
Couldn't compile the test.
102-
---- $DIR/dead-code-items.rs - MyTrait::my_trait_fn (line 110) stdout ----
102+
---- $DIR/dead-code-items.rs - MyTrait::my_trait_fn (line 112) stdout ----
103103
error: unused variable: `unused_in_impl`
104-
--> $DIR/dead-code-items.rs:113:17
104+
--> $DIR/dead-code-items.rs:115:17
105105
|
106106
LL | fn main() { let unused_in_impl = 5; }
107107
| ^^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_unused_in_impl`
108108
|
109109
note: the lint level is defined here
110-
--> $DIR/dead-code-items.rs:108:9
110+
--> $DIR/dead-code-items.rs:110:9
111111
|
112112
LL | #![deny(warnings)]
113113
| ^^^^^^^^
@@ -116,15 +116,15 @@ LL | #![deny(warnings)]
116116
error: aborting due to 1 previous error
117117

118118
Couldn't compile the test.
119-
---- $DIR/dead-code-items.rs - U::field (line 55) stdout ----
119+
---- $DIR/dead-code-items.rs - U::field (line 57) stdout ----
120120
error: trait `DeadCodeInUnionField` is never used
121-
--> $DIR/dead-code-items.rs:56:7
121+
--> $DIR/dead-code-items.rs:58:7
122122
|
123123
LL | trait DeadCodeInUnionField {}
124124
| ^^^^^^^^^^^^^^^^^^^^
125125
|
126126
note: the lint level is defined here
127-
--> $DIR/dead-code-items.rs:54:9
127+
--> $DIR/dead-code-items.rs:56:9
128128
|
129129
LL | #![deny(dead_code)]
130130
| ^^^^^^^^^
@@ -134,13 +134,14 @@ error: aborting due to 1 previous error
134134
Couldn't compile the test.
135135

136136
failures:
137-
$DIR/dead-code-items.rs - A::field (line 39)
138-
$DIR/dead-code-items.rs - C (line 22)
139-
$DIR/dead-code-items.rs - Enum (line 70)
140-
$DIR/dead-code-items.rs - Enum::Variant1 (line 77)
141-
$DIR/dead-code-items.rs - MyTrait (line 103)
142-
$DIR/dead-code-items.rs - MyTrait::my_trait_fn (line 110)
143-
$DIR/dead-code-items.rs - U::field (line 55)
137+
$DIR/dead-code-items.rs - A::field (line 41)
138+
$DIR/dead-code-items.rs - C (line 24)
139+
$DIR/dead-code-items.rs - Enum (line 72)
140+
$DIR/dead-code-items.rs - Enum::Variant1 (line 79)
141+
$DIR/dead-code-items.rs - MyTrait (line 105)
142+
$DIR/dead-code-items.rs - MyTrait::my_trait_fn (line 112)
143+
$DIR/dead-code-items.rs - U::field (line 57)
144144

145145
test result: FAILED. 6 passed; 7 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
146146

147+
all doctests ran in $TIME; merged doctests compilation took $TIME

‎tests/rustdoc-ui/doctest/dead-code-module-2.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
//@ compile-flags:--test
55
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
66
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
7+
//@ normalize-stdout: "ran in \d+\.\d+s" -> "ran in $$TIME"
8+
//@ normalize-stdout: "compilation took \d+\.\d+s" -> "compilation took $$TIME"
79
//@ failure-status: 101
810

911
#![doc(test(attr(allow(unused_variables))))]

‎tests/rustdoc-ui/doctest/dead-code-module-2.stdout

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

22
running 1 test
3-
test $DIR/dead-code-module-2.rs - g (line 24) - compile ... ok
3+
test $DIR/dead-code-module-2.rs - g (line 26) - compile ... 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/dead-code-module-2.rs - my_mod::f (line 16) - compile ... FAILED
9+
test $DIR/dead-code-module-2.rs - my_mod::f (line 18) - compile ... FAILED
1010

1111
failures:
1212

13-
---- $DIR/dead-code-module-2.rs - my_mod::f (line 16) stdout ----
13+
---- $DIR/dead-code-module-2.rs - my_mod::f (line 18) stdout ----
1414
error: trait `T` is never used
15-
--> $DIR/dead-code-module-2.rs:17:7
15+
--> $DIR/dead-code-module-2.rs:19:7
1616
|
1717
LL | trait T { fn f(); }
1818
| ^
1919
|
2020
note: the lint level is defined here
21-
--> $DIR/dead-code-module-2.rs:15:9
21+
--> $DIR/dead-code-module-2.rs:17:9
2222
|
2323
LL | #![deny(warnings)]
2424
| ^^^^^^^^
@@ -29,7 +29,8 @@ error: aborting due to 1 previous error
2929
Couldn't compile the test.
3030

3131
failures:
32-
$DIR/dead-code-module-2.rs - my_mod::f (line 16)
32+
$DIR/dead-code-module-2.rs - my_mod::f (line 18)
3333

3434
test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
3535

36+
all doctests ran in $TIME; merged doctests compilation took $TIME

0 commit comments

Comments
 (0)