Skip to content

Commit 05e69d8

Browse files
GuillaumeGomezGuillaumeGomez
committed
Update rustdoc tests
1 parent 499e024 commit 05e69d8

10 files changed

+34
-23
lines changed

‎src/test/rustdoc-gui/implementors.goml

+10-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,16 @@ assert-attribute: ("#implementors-list .impl:nth-child(2) > a.anchor", {"href":
1616
assert: "#implementors-list .impl:nth-child(2) > .code-header.in-band"
1717

1818
goto: file://|DOC_PATH|/test_docs/struct.HasEmptyTraits.html
19-
compare-elements-position-near-false: ("#impl-EmptyTrait1", "#impl-EmptyTrait2", {"y": 30})
20-
compare-elements-position-near: ("#impl-EmptyTrait3 h3", "#impl-EmptyTrait3 .item-info", {"y": 30})
19+
compare-elements-position-near-false: (
20+
"#impl-EmptyTrait1-for-HasEmptyTraits",
21+
"#impl-EmptyTrait2-for-HasEmptyTraits",
22+
{"y": 30},
23+
)
24+
compare-elements-position-near: (
25+
"#impl-EmptyTrait3-for-HasEmptyTraits h3",
26+
"#impl-EmptyTrait3-for-HasEmptyTraits .item-info",
27+
{"y": 30},
28+
)
2129

2230
// Now check that re-exports work correctly.
2331
// There should be exactly one impl shown on both of these pages.

‎src/test/rustdoc-gui/item-info-overflow.goml

+7-4
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,17 @@ assert-text: (
1515
// Checking the "item-info" on an impl block as well:
1616
goto: file://|DOC_PATH|/lib2/struct.LongItemInfo2.html
1717
compare-elements-property: (
18-
"#impl-SimpleTrait .item-info",
19-
"#impl-SimpleTrait + .docblock",
18+
"#impl-SimpleTrait-for-LongItemInfo2 .item-info",
19+
"#impl-SimpleTrait-for-LongItemInfo2 + .docblock",
2020
["scrollWidth"],
2121
)
22-
assert-property: ("#impl-SimpleTrait .item-info", {"scrollWidth": "866"})
22+
assert-property: (
23+
"#impl-SimpleTrait-for-LongItemInfo2 .item-info",
24+
{"scrollWidth": "866"},
25+
)
2326
// Just to be sure we're comparing the correct "item-info":
2427
assert-text: (
25-
"#impl-SimpleTrait .item-info",
28+
"#impl-SimpleTrait-for-LongItemInfo2 .item-info",
2629
"Available on Android or Linux or Emscripten or DragonFly BSD",
2730
STARTS_WITH,
2831
)

‎src/test/rustdoc/auto-trait-not-send.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#![crate_name = "foo"]
22

33
// @has 'foo/struct.Foo.html'
4-
// @has - '//*[@id="impl-Send"]' 'impl !Send for Foo'
5-
// @has - '//*[@id="impl-Sync"]' 'impl !Sync for Foo'
4+
// @has - '//*[@id="impl-Send-for-Foo"]' 'impl !Send for Foo'
5+
// @has - '//*[@id="impl-Sync-for-Foo"]' 'impl !Sync for Foo'
66
pub struct Foo(*const i8);
77
pub trait Whatever: Send {}
88
impl<T: Send + ?Sized> Whatever for T {}

‎src/test/rustdoc/double-quote-escape.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
#![crate_name = "foo"]
22

3-
43
pub trait Foo<T> {
54
fn foo() {}
65
}
76

87
pub struct Bar;
98

109
// @has foo/struct.Bar.html
11-
// @has - '//*[@class="sidebar-elems"]//section//a[@href="#impl-Foo%3Cunsafe%20extern%20%22C%22%20fn()%3E"]' 'Foo<unsafe extern "C" fn()>'
10+
// @has - '//*[@class="sidebar-elems"]//section//a[@href="#impl-Foo%3Cunsafe%20extern%20%22C%22%20fn()%3E-for-Bar"]' 'Foo<unsafe extern "C" fn()>'
1211
impl Foo<unsafe extern "C" fn()> for Bar {}

‎src/test/rustdoc/generic-impl.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
use std::fmt;
44

5-
// @!has foo/struct.Bar.html '//*[@id="impl-ToString-for-Bar"]//h3[@class="code-header in-band"]' 'impl<T> ToString for T'
5+
// @!has foo/struct.Bar.html '//*[@id="impl-ToString-for-Bar"]' ''
66
pub struct Bar;
77

88
// @has foo/struct.Foo.html '//*[@id="impl-ToString-for-Foo"]//h3[@class="code-header in-band"]' 'impl<T> ToString for T'
99
pub struct Foo;
10-
// @has foo/struct.Foo.html '//*[@class="sidebar-elems"]//section//a[@href="#impl-ToString"]' 'ToString'
10+
// @has foo/struct.Foo.html '//*[@class="sidebar-elems"]//section//a[@href="#impl-ToString-for-Foo"]' 'ToString'
1111

1212
impl fmt::Display for Foo {
1313
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {

‎src/test/rustdoc/impl-box.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
pub struct MyType;
66

77
// @has 'impl_box/struct.MyType.html'
8-
// @has '-' '//*[@id="impl-Iterator"]' 'impl Iterator for Box<MyType>'
8+
// @has '-' '//*[@id="impl-Iterator-for-Box%3CMyType%3E"]' 'impl Iterator for Box<MyType>'
99

1010
impl Iterator for Box<MyType> {
1111
type Item = ();

‎src/test/rustdoc/issue-75588.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ extern crate real_gimli;
1313
// @!has foo/trait.Deref.html '//*[@id="impl-Deref-for-EndianSlice"]//h3[@class="code-header in-band"]' 'impl Deref for EndianSlice'
1414
pub use realcore::Deref;
1515

16-
// @has foo/trait.Join.html '//*[@id="impl-Join"]//h3[@class="code-header in-band"]' 'impl Join for Foo'
16+
// @has foo/trait.Join.html '//*[@id="impl-Join-for-Foo"]//h3[@class="code-header in-band"]' 'impl Join for Foo'
1717
pub use realcore::Join;

‎src/test/rustdoc/issue-78701.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
// the ID is correctly derived.
66

77
// @has 'foo/struct.AnotherStruct.html'
8-
// @count - '//*[@class="sidebar"]//a[@href="#impl-AnAmazingTrait"]' 1
9-
// @count - '//*[@class="sidebar"]//a[@href="#impl-AnAmazingTrait-1"]' 1
8+
// @count - '//*[@class="sidebar"]//a[@href="#impl-AnAmazingTrait-for-AnotherStruct%3C()%3E"]' 1
9+
// @count - '//*[@class="sidebar"]//a[@href="#impl-AnAmazingTrait-for-AnotherStruct%3CT%3E"]' 1
1010

1111
pub trait Something {}
1212

‎src/test/rustdoc/rfc-2632-const-trait-impl.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@ pub trait Tr<T> {
2929
}
3030
}
3131

32-
// @!has - '//section[@id="impl-Tr%3CT%3E"]/h3[@class="code-header in-band"]' '~const'
33-
// @has - '//section[@id="impl-Tr%3CT%3E"]/h3[@class="code-header in-band"]/a[@class="trait"]' 'Clone'
34-
// @!has - '//section[@id="impl-Tr%3CT%3E"]/h3[@class="code-header in-band"]/span[@class="where"]' '~const'
35-
// @has - '//section[@id="impl-Tr%3CT%3E"]/h3[@class="code-header in-band"]/span[@class="where fmt-newline"]' ': Clone'
32+
// @has - '//section[@id="impl-Tr%3CT%3E-for-T"]' ''
33+
// @!has - '//section[@id="impl-Tr%3CT%3E-for-T"]/h3[@class="code-header in-band"]' '~const'
34+
// @has - '//section[@id="impl-Tr%3CT%3E-for-T"]/h3[@class="code-header in-band"]/a[@class="trait"]' 'Clone'
35+
// @!has - '//section[@id="impl-Tr%3CT%3E-for-T"]/h3[@class="code-header in-band"]/span[@class="where"]' '~const'
36+
// @has - '//section[@id="impl-Tr%3CT%3E-for-T"]/h3[@class="code-header in-band"]/span[@class="where fmt-newline"]' ': Clone'
3637
impl<T: ~const Clone + ~const Destruct> const Tr<T> for T
3738
where
3839
Option<T>: ~const Clone + ~const Destruct,

‎src/test/rustdoc/src-links-auto-impls.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#![crate_name = "foo"]
22

33
// @has foo/struct.Unsized.html
4-
// @has - '//div[@id="impl-Sized-for-Unsized"]/h3[@class="code-header in-band"]' 'impl !Sized for Unsized'
5-
// @!has - '//*[@id="impl-Sized"]//a[@class="srclink"]' 'source'
4+
// @has - '//*[@id="impl-Sized-for-Unsized"]/h3[@class="code-header in-band"]' 'impl !Sized for Unsized'
5+
// @!has - '//*[@id="impl-Sized-for-Unsized"]//a[@class="srclink"]' 'source'
66
// @has - '//*[@id="impl-Sync-for-Unsized"]/h3[@class="code-header in-band"]' 'impl Sync for Unsized'
7-
// @!has - '//*[@id="impl-Sync"]//a[@class="srclink"]' 'source'
7+
// @!has - '//*[@id="impl-Sync-for-Unsized"]//a[@class="srclink"]' 'source'
88
// @has - '//*[@id="impl-Any-for-Unsized"]/h3[@class="code-header in-band"]' 'impl<T> Any for T'
99
// @has - '//*[@id="impl-Any-for-Unsized"]//a[@class="srclink"]' 'source'
1010
pub struct Unsized {

0 commit comments

Comments
 (0)