Skip to content

Commit 0878abd

Browse files
authored
Rollup merge of rust-lang#78727 - liketechnik:issue-55201, r=GuillaumeGomez
(rustdoc) fix test for trait impl display The test checks that parameters and return values with `impl Trait` types are correctly generated in rustdoc's output. In essence, the previous version of the test checked the absence of values that would never be generated by rustdoc, so it could basically never fail. These values were adjusted to the expected output and are now required to exist in rustdoc's output. See rust-lang#55201 (comment) for a detailed explanation of the reasoning behind the changes. Note that the output of rustdoc for `impl Trait`s in parameters and return values did not change since the inital test creation, so this PR only modifies the test. Closes rust-lang#55201
2 parents c0318b6 + 251f6da commit 0878abd

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/test/rustdoc/impl-everywhere.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@ pub struct Bar;
88
impl Foo for Bar {}
99
impl Foo2 for Bar {}
1010

11-
// @!has foo/fn.foo.html '//section[@id="main"]//pre' "x: &\'x impl Foo"
12-
// @!has foo/fn.foo.html '//section[@id="main"]//pre' "-> &\'x impl Foo {"
11+
// @has foo/fn.foo.html '//section[@id="main"]//pre' "x: &'x impl Foo"
12+
// @has foo/fn.foo.html '//section[@id="main"]//pre' "-> &'x impl Foo"
1313
pub fn foo<'x>(x: &'x impl Foo) -> &'x impl Foo {
1414
x
1515
}
1616

17-
// @!has foo/fn.foo2.html '//section[@id="main"]//pre' "x: &\'x impl Foo"
18-
// @!has foo/fn.foo2.html '//section[@id="main"]//pre' '-> impl Foo2 {'
17+
// @has foo/fn.foo2.html '//section[@id="main"]//pre' "x: &'x impl Foo"
18+
// @has foo/fn.foo2.html '//section[@id="main"]//pre' '-> impl Foo2'
1919
pub fn foo2<'x>(_x: &'x impl Foo) -> impl Foo2 {
2020
Bar
2121
}
2222

23-
// @!has foo/fn.foo_foo.html '//section[@id="main"]//pre' '-> impl Foo + Foo2 {'
23+
// @has foo/fn.foo_foo.html '//section[@id="main"]//pre' '-> impl Foo + Foo2'
2424
pub fn foo_foo() -> impl Foo + Foo2 {
2525
Bar
2626
}
2727

28-
// @!has foo/fn.foo2.html '//section[@id="main"]//pre' "x: &'x (impl Foo + Foo2)"
28+
// @has foo/fn.foo_foo_foo.html '//section[@id="main"]//pre' "x: &'x impl Foo + Foo2"
2929
pub fn foo_foo_foo<'x>(_x: &'x (impl Foo + Foo2)) {
3030
}

0 commit comments

Comments
 (0)