Skip to content

Commit b90f629

Browse files
matthiaskrgrmatthiaskrgr
authored
Rollup merge of #106869 - notriddle:notriddle/item-decl-pre-rust, r=GuillaumeGomez
rustdoc: remove redundant item kind class from `.item-decl > pre` This class originated in the very first commit of `rustdoc_ng`, and was used to add a color border around the item decl based on its kind. https://github.com/rust-lang/rust/blob/4fd061c426902b0904c65e64a3780b21f9ab3afb/src/rustdoc_ng/html/static/main.css#L102-L106 The item decl no longer has a border, and there aren't any kind-specific styles in modern rustdoc's rendering of this UI item. Most of this PR is updating test cases so that they use `item-decl` to find the `<pre>` tag instead of relying on the fact that the class name had `rust {kind}` in it while other `<pre>` tags only had class `rust`.
2 parents 6b49435 + 3a3f70c commit b90f629

Some content is hidden

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

63 files changed

+218
-218
lines changed

‎src/librustdoc/html/render/print_item.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ fn item_function(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, f: &cle
531531
f.decl.output.as_return().and_then(|output| notable_traits_button(output, cx));
532532

533533
wrap_into_item_decl(w, |w| {
534-
wrap_item(w, "fn", |w| {
534+
wrap_item(w, |w| {
535535
render_attributes_in_pre(w, it, "");
536536
w.reserve(header_len);
537537
write!(
@@ -570,7 +570,7 @@ fn item_trait(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, t: &clean:
570570

571571
// Output the trait definition
572572
wrap_into_item_decl(w, |w| {
573-
wrap_item(w, "trait", |w| {
573+
wrap_item(w, |w| {
574574
render_attributes_in_pre(w, it, "");
575575
write!(
576576
w,
@@ -1051,7 +1051,7 @@ fn item_trait(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, t: &clean:
10511051

10521052
fn item_trait_alias(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, t: &clean::TraitAlias) {
10531053
wrap_into_item_decl(w, |w| {
1054-
wrap_item(w, "trait-alias", |w| {
1054+
wrap_item(w, |w| {
10551055
render_attributes_in_pre(w, it, "");
10561056
write!(
10571057
w,
@@ -1075,7 +1075,7 @@ fn item_trait_alias(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, t: &
10751075

10761076
fn item_opaque_ty(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, t: &clean::OpaqueTy) {
10771077
wrap_into_item_decl(w, |w| {
1078-
wrap_item(w, "opaque", |w| {
1078+
wrap_item(w, |w| {
10791079
render_attributes_in_pre(w, it, "");
10801080
write!(
10811081
w,
@@ -1099,7 +1099,7 @@ fn item_opaque_ty(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, t: &cl
10991099

11001100
fn item_typedef(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, t: &clean::Typedef) {
11011101
fn write_content(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, t: &clean::Typedef) {
1102-
wrap_item(w, "typedef", |w| {
1102+
wrap_item(w, |w| {
11031103
render_attributes_in_pre(w, it, "");
11041104
write!(w, "{}", visibility_print_with_space(it.visibility(cx.tcx()), it.item_id, cx));
11051105
write!(
@@ -1128,7 +1128,7 @@ fn item_typedef(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, t: &clea
11281128

11291129
fn item_union(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, s: &clean::Union) {
11301130
wrap_into_item_decl(w, |w| {
1131-
wrap_item(w, "union", |w| {
1131+
wrap_item(w, |w| {
11321132
render_attributes_in_pre(w, it, "");
11331133
render_union(w, it, Some(&s.generics), &s.fields, "", cx);
11341134
});
@@ -1193,7 +1193,7 @@ fn item_enum(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, e: &clean::
11931193
let tcx = cx.tcx();
11941194
let count_variants = e.variants().count();
11951195
wrap_into_item_decl(w, |w| {
1196-
wrap_item(w, "enum", |w| {
1196+
wrap_item(w, |w| {
11971197
render_attributes_in_pre(w, it, "");
11981198
write!(
11991199
w,
@@ -1357,17 +1357,17 @@ fn item_proc_macro(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, m: &c
13571357
let name = it.name.expect("proc-macros always have names");
13581358
match m.kind {
13591359
MacroKind::Bang => {
1360-
wrap_item(w, "macro", |w| {
1360+
wrap_item(w, |w| {
13611361
write!(w, "{}!() {{ /* proc-macro */ }}", name);
13621362
});
13631363
}
13641364
MacroKind::Attr => {
1365-
wrap_item(w, "attr", |w| {
1365+
wrap_item(w, |w| {
13661366
write!(w, "#[{}]", name);
13671367
});
13681368
}
13691369
MacroKind::Derive => {
1370-
wrap_item(w, "derive", |w| {
1370+
wrap_item(w, |w| {
13711371
write!(w, "#[derive({})]", name);
13721372
if !m.helpers.is_empty() {
13731373
w.push_str("\n{\n");
@@ -1401,7 +1401,7 @@ fn item_primitive(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item) {
14011401

14021402
fn item_constant(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, c: &clean::Constant) {
14031403
wrap_into_item_decl(w, |w| {
1404-
wrap_item(w, "const", |w| {
1404+
wrap_item(w, |w| {
14051405
let tcx = cx.tcx();
14061406
render_attributes_in_code(w, it);
14071407

@@ -1451,7 +1451,7 @@ fn item_constant(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, c: &cle
14511451

14521452
fn item_struct(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, s: &clean::Struct) {
14531453
wrap_into_item_decl(w, |w| {
1454-
wrap_item(w, "struct", |w| {
1454+
wrap_item(w, |w| {
14551455
render_attributes_in_code(w, it);
14561456
render_struct(w, it, Some(&s.generics), s.ctor_kind, &s.fields, "", true, cx);
14571457
});
@@ -1504,7 +1504,7 @@ fn item_struct(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, s: &clean
15041504

15051505
fn item_static(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, s: &clean::Static) {
15061506
wrap_into_item_decl(w, |w| {
1507-
wrap_item(w, "static", |w| {
1507+
wrap_item(w, |w| {
15081508
render_attributes_in_code(w, it);
15091509
write!(
15101510
w,
@@ -1521,7 +1521,7 @@ fn item_static(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, s: &clean
15211521

15221522
fn item_foreign_type(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item) {
15231523
wrap_into_item_decl(w, |w| {
1524-
wrap_item(w, "foreigntype", |w| {
1524+
wrap_item(w, |w| {
15251525
w.write_str("extern {\n");
15261526
render_attributes_in_code(w, it);
15271527
write!(
@@ -1618,11 +1618,11 @@ where
16181618
w.write_str("</div>")
16191619
}
16201620

1621-
fn wrap_item<F>(w: &mut Buffer, item_name: &str, f: F)
1621+
fn wrap_item<F>(w: &mut Buffer, f: F)
16221622
where
16231623
F: FnOnce(&mut Buffer),
16241624
{
1625-
w.write_fmt(format_args!("<pre class=\"rust {}\"><code>", item_name));
1625+
w.write_str(r#"<pre class="rust"><code>"#);
16261626
f(w);
16271627
w.write_str("</code></pre>");
16281628
}

‎tests/rustdoc-gui/code-tags.goml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ size: (1080, 600)
99
// Check that their content is inside <pre><code>
1010
assert-count: (".example-wrap pre > code", 4)
1111
// Check that function signature is inside <pre><code>
12-
assert: "pre.rust.fn > code"
12+
assert: ".item-decl pre.rust > code"
1313

1414
goto: "file://" + |DOC_PATH| + "/test_docs/struct.Foo.html"
15-
assert: "pre.rust.struct > code"
15+
assert: ".item-decl pre.rust > code"
1616

1717
goto: "file://" + |DOC_PATH| + "/test_docs/enum.AnEnum.html"
18-
assert: "pre.rust.enum > code"
18+
assert: ".item-decl pre.rust > code"
1919

2020
goto: "file://" + |DOC_PATH| + "/test_docs/trait.AnotherOne.html"
21-
assert: "pre.rust.trait > code"
21+
assert: ".item-decl pre.rust > code"
2222

2323
goto: "file://" + |DOC_PATH| + "/test_docs/type.SomeType.html"
24-
assert: "pre.rust.typedef > code"
24+
assert: ".item-decl pre.rust > code"

‎tests/rustdoc-gui/font-weight.goml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ goto: "file://" + |DOC_PATH| + "/lib2/trait.Trait.html"
2020
// This is a complex selector, so here's how it works:
2121
//
2222
// * //*[@class='item-decl'] — selects element of any tag with classes docblock and item-decl
23-
// * /pre[@class='rust trait'] — selects immediate child with tag pre and classes rust and trait
23+
// * /pre[@class='rust'] — selects immediate child with tag pre and class rust
2424
// * /code — selects immediate child with tag code
2525
// * /a[@class='constant'] — selects immediate child with tag a and class constant
2626
// * //text() — selects child that is text node
@@ -29,11 +29,11 @@ goto: "file://" + |DOC_PATH| + "/lib2/trait.Trait.html"
2929
// This uses '/parent::*' as a proxy for the style of the text node.
3030
// We can't just select the '<a>' because intermediate tags could be added.
3131
assert-count: (
32-
"//*[@class='item-decl']/pre[@class='rust trait']/code/a[@class='constant']//text()/parent::*",
32+
"//*[@class='item-decl']/pre[@class='rust']/code/a[@class='constant']//text()/parent::*",
3333
1,
3434
)
3535
assert-css: (
36-
"//*[@class='item-decl']/pre[@class='rust trait']/code/a[@class='constant']//text()/parent::*",
36+
"//*[@class='item-decl']/pre[@class='rust']/code/a[@class='constant']//text()/parent::*",
3737
{"font-weight": "400"},
3838
)
3939

‎tests/rustdoc-gui/list_code_block.goml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// This test checks that code blocks in list are supported.
22
goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
33
goto: "./fn.check_list_code_block.html"
4-
assert: ("pre.rust.fn")
4+
assert: (".item-decl pre.rust")

‎tests/rustdoc/array-links.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
pub struct MyBox<T: ?Sized>(*const T);
55

66
// @has 'foo/fn.alpha.html'
7-
// @snapshot link_slice_u32 - '//pre[@class="rust fn"]/code'
7+
// @snapshot link_slice_u32 - '//div[@class="item-decl"]/pre[@class="rust"]/code'
88
pub fn alpha() -> &'static [u32; 1] {
99
loop {}
1010
}
1111

1212
// @has 'foo/fn.beta.html'
13-
// @snapshot link_slice_generic - '//pre[@class="rust fn"]/code'
13+
// @snapshot link_slice_generic - '//div[@class="item-decl"]/pre[@class="rust"]/code'
1414
pub fn beta<T>() -> &'static [T; 1] {
1515
loop {}
1616
}
1717

1818
// @has 'foo/fn.gamma.html'
19-
// @snapshot link_box_u32 - '//pre[@class="rust fn"]/code'
19+
// @snapshot link_box_u32 - '//div[@class="item-decl"]/pre[@class="rust"]/code'
2020
pub fn gamma() -> MyBox<[u32; 1]> {
2121
loop {}
2222
}
2323

2424
// @has 'foo/fn.delta.html'
25-
// @snapshot link_box_generic - '//pre[@class="rust fn"]/code'
25+
// @snapshot link_box_generic - '//div[@class="item-decl"]/pre[@class="rust"]/code'
2626
pub fn delta<T>() -> MyBox<[T; 1]> {
2727
loop {}
2828
}

‎tests/rustdoc/assoc-consts.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pub trait Foo {
2-
// @has assoc_consts/trait.Foo.html '//*[@class="rust trait"]' \
2+
// @has assoc_consts/trait.Foo.html '//div[@class="item-decl"]/pre[@class="rust"]' \
33
// 'const FOO: usize = 13usize;'
44
// @has - '//*[@id="associatedconstant.FOO"]' 'const FOO: usize'
55
const FOO: usize = 12 + 1;

‎tests/rustdoc/assoc-item-cast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ pub trait AsExpression<T> {
1010
}
1111

1212
// @has foo/type.AsExprOf.html
13-
// @has - '//pre[@class="rust typedef"]' 'type AsExprOf<Item, Type> = <Item as AsExpression<Type>>::Expression;'
13+
// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'type AsExprOf<Item, Type> = <Item as AsExpression<Type>>::Expression;'
1414
pub type AsExprOf<Item, Type> = <Item as AsExpression<Type>>::Expression;

‎tests/rustdoc/assoc-types.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ pub trait Index<I: ?Sized> {
1212
}
1313

1414
// @has assoc_types/fn.use_output.html
15-
// @has - '//*[@class="rust fn"]' '-> &T::Output'
16-
// @has - '//*[@class="rust fn"]//a[@href="trait.Index.html#associatedtype.Output"]' 'Output'
15+
// @has - '//div[@class="item-decl"]/pre[@class="rust"]' '-> &T::Output'
16+
// @has - '//div[@class="item-decl"]/pre[@class="rust"]//a[@href="trait.Index.html#associatedtype.Output"]' 'Output'
1717
pub fn use_output<T: Index<usize>>(obj: &T, index: usize) -> &T::Output {
1818
obj.index(index)
1919
}
@@ -23,13 +23,13 @@ pub trait Feed {
2323
}
2424

2525
// @has assoc_types/fn.use_input.html
26-
// @has - '//*[@class="rust fn"]' 'T::Input'
27-
// @has - '//*[@class="rust fn"]//a[@href="trait.Feed.html#associatedtype.Input"]' 'Input'
26+
// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'T::Input'
27+
// @has - '//div[@class="item-decl"]/pre[@class="rust"]//a[@href="trait.Feed.html#associatedtype.Input"]' 'Input'
2828
pub fn use_input<T: Feed>(_feed: &T, _element: T::Input) { }
2929

3030
// @has assoc_types/fn.cmp_input.html
31-
// @has - '//*[@class="rust fn"]' 'where T::Input: PartialEq<U::Input>'
32-
// @has - '//*[@class="rust fn"]//a[@href="trait.Feed.html#associatedtype.Input"]' 'Input'
31+
// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'where T::Input: PartialEq<U::Input>'
32+
// @has - '//div[@class="item-decl"]/pre[@class="rust"]//a[@href="trait.Feed.html#associatedtype.Input"]' 'Input'
3333
pub fn cmp_input<T: Feed, U: Feed>(a: &T::Input, b: &U::Input) -> bool
3434
where T::Input: PartialEq<U::Input>
3535
{

‎tests/rustdoc/async-fn.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
// edition:2018
2-
// @has async_fn/fn.foo.html '//pre[@class="rust fn"]' 'pub async fn foo() -> Option<Foo>'
2+
// @has async_fn/fn.foo.html '//div[@class="item-decl"]/pre[@class="rust"]' 'pub async fn foo() -> Option<Foo>'
33
pub async fn foo() -> Option<Foo> {
44
None
55
}
66

7-
// @has async_fn/fn.bar.html '//pre[@class="rust fn"]' 'pub async fn bar(a: i32, b: i32) -> i32'
7+
// @has async_fn/fn.bar.html '//div[@class="item-decl"]/pre[@class="rust"]' 'pub async fn bar(a: i32, b: i32) -> i32'
88
pub async fn bar(a: i32, b: i32) -> i32 {
99
0
1010
}
1111

12-
// @has async_fn/fn.baz.html '//pre[@class="rust fn"]' 'pub async fn baz<T>(a: T) -> T'
12+
// @has async_fn/fn.baz.html '//div[@class="item-decl"]/pre[@class="rust"]' 'pub async fn baz<T>(a: T) -> T'
1313
pub async fn baz<T>(a: T) -> T {
1414
a
1515
}
1616

17-
// @has async_fn/fn.qux.html '//pre[@class="rust fn"]' 'pub async unsafe fn qux() -> char'
17+
// @has async_fn/fn.qux.html '//div[@class="item-decl"]/pre[@class="rust"]' 'pub async unsafe fn qux() -> char'
1818
pub async unsafe fn qux() -> char {
1919
'⚠'
2020
}
2121

22-
// @has async_fn/fn.mut_args.html '//pre[@class="rust fn"]' 'pub async fn mut_args(a: usize)'
22+
// @has async_fn/fn.mut_args.html '//div[@class="item-decl"]/pre[@class="rust"]' 'pub async fn mut_args(a: usize)'
2323
pub async fn mut_args(mut a: usize) {}
2424

25-
// @has async_fn/fn.mut_ref.html '//pre[@class="rust fn"]' 'pub async fn mut_ref(x: i32)'
25+
// @has async_fn/fn.mut_ref.html '//div[@class="item-decl"]/pre[@class="rust"]' 'pub async fn mut_ref(x: i32)'
2626
pub async fn mut_ref(ref mut x: i32) {}
2727

2828
trait Bar {}
2929

3030
impl Bar for () {}
3131

32-
// @has async_fn/fn.quux.html '//pre[@class="rust fn"]' 'pub async fn quux() -> impl Bar'
32+
// @has async_fn/fn.quux.html '//div[@class="item-decl"]/pre[@class="rust"]' 'pub async fn quux() -> impl Bar'
3333
pub async fn quux() -> impl Bar {
3434
()
3535
}
@@ -50,27 +50,27 @@ pub trait Pattern<'a> {}
5050

5151
pub trait Trait<const N: usize> {}
5252
// @has async_fn/fn.const_generics.html
53-
// @has - '//pre[@class="rust fn"]' 'pub async fn const_generics<const N: usize>(_: impl Trait<N>)'
53+
// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'pub async fn const_generics<const N: usize>(_: impl Trait<N>)'
5454
pub async fn const_generics<const N: usize>(_: impl Trait<N>) {}
5555

5656
// test that elided lifetimes are properly elided and not displayed as `'_`
5757
// regression test for #63037
5858
// @has async_fn/fn.elided.html
59-
// @has - '//pre[@class="rust fn"]' 'pub async fn elided(foo: &str) -> &str'
59+
// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'pub async fn elided(foo: &str) -> &str'
6060
pub async fn elided(foo: &str) -> &str {}
6161
// This should really be shown as written, but for implementation reasons it's difficult.
6262
// See `impl Clean for TyKind::Ref`.
6363
// @has async_fn/fn.user_elided.html
64-
// @has - '//pre[@class="rust fn"]' 'pub async fn user_elided(foo: &str) -> &str'
64+
// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'pub async fn user_elided(foo: &str) -> &str'
6565
pub async fn user_elided(foo: &'_ str) -> &str {}
6666
// @has async_fn/fn.static_trait.html
67-
// @has - '//pre[@class="rust fn"]' 'pub async fn static_trait(foo: &str) -> Box<dyn Bar>'
67+
// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'pub async fn static_trait(foo: &str) -> Box<dyn Bar>'
6868
pub async fn static_trait(foo: &str) -> Box<dyn Bar> {}
6969
// @has async_fn/fn.lifetime_for_trait.html
70-
// @has - '//pre[@class="rust fn"]' "pub async fn lifetime_for_trait(foo: &str) -> Box<dyn Bar + '_>"
70+
// @has - '//div[@class="item-decl"]/pre[@class="rust"]' "pub async fn lifetime_for_trait(foo: &str) -> Box<dyn Bar + '_>"
7171
pub async fn lifetime_for_trait(foo: &str) -> Box<dyn Bar + '_> {}
7272
// @has async_fn/fn.elided_in_input_trait.html
73-
// @has - '//pre[@class="rust fn"]' "pub async fn elided_in_input_trait(t: impl Pattern<'_>)"
73+
// @has - '//div[@class="item-decl"]/pre[@class="rust"]' "pub async fn elided_in_input_trait(t: impl Pattern<'_>)"
7474
pub async fn elided_in_input_trait(t: impl Pattern<'_>) {}
7575

7676
struct AsyncFdReadyGuard<'a, T> { x: &'a T }
@@ -88,8 +88,8 @@ impl Foo {
8888

8989
// test named lifetimes, just in case
9090
// @has async_fn/fn.named.html
91-
// @has - '//pre[@class="rust fn"]' "pub async fn named<'a, 'b>(foo: &'a str) -> &'b str"
91+
// @has - '//div[@class="item-decl"]/pre[@class="rust"]' "pub async fn named<'a, 'b>(foo: &'a str) -> &'b str"
9292
pub async fn named<'a, 'b>(foo: &'a str) -> &'b str {}
9393
// @has async_fn/fn.named_trait.html
94-
// @has - '//pre[@class="rust fn"]' "pub async fn named_trait<'a, 'b>(foo: impl Pattern<'a>) -> impl Pattern<'b>"
94+
// @has - '//div[@class="item-decl"]/pre[@class="rust"]' "pub async fn named_trait<'a, 'b>(foo: impl Pattern<'a>) -> impl Pattern<'b>"
9595
pub async fn named_trait<'a, 'b>(foo: impl Pattern<'a>) -> impl Pattern<'b> {}

‎tests/rustdoc/attributes.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#![crate_name = "foo"]
22

3-
// @has foo/fn.f.html '//*[@class="rust fn"]' '#[no_mangle]'
3+
// @has foo/fn.f.html '//div[@class="item-decl"]/pre[@class="rust"]' '#[no_mangle]'
44
#[no_mangle]
55
pub extern "C" fn f() {}
66

7-
// @has foo/fn.g.html '//*[@class="rust fn"]' '#[export_name = "bar"]'
7+
// @has foo/fn.g.html '//div[@class="item-decl"]/pre[@class="rust"]' '#[export_name = "bar"]'
88
#[export_name = "bar"]
99
pub extern "C" fn g() {}
1010

11-
// @has foo/struct.Repr.html '//*[@class="item-decl"]' '#[repr(C, align(8))]'
11+
// @has foo/struct.Repr.html '//div[@class="item-decl"]' '#[repr(C, align(8))]'
1212
#[repr(C, align(8))]
1313
pub struct Repr;

‎tests/rustdoc/auxiliary/issue-85454.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// @has issue_85454/trait.FromResidual.html
2-
// @has - '//pre[@class="rust trait"]' 'pub trait FromResidual<R = <Self as Try>::Residual> { fn from_residual(residual: R) -> Self; }'
2+
// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'pub trait FromResidual<R = <Self as Try>::Residual> { fn from_residual(residual: R) -> Self; }'
33
pub trait FromResidual<R = <Self as Try>::Residual> {
44
fn from_residual(residual: R) -> Self;
55
}

‎tests/rustdoc/const-fn.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#![crate_name = "foo"]
22

33
// @has foo/fn.bar.html
4-
// @has - '//*[@class="rust fn"]' 'pub const fn bar() -> '
4+
// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'pub const fn bar() -> '
55
/// foo
66
pub const fn bar() -> usize {
77
2

‎tests/rustdoc/const-generics/add-impl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
use std::ops::Add;
44

5-
// @has foo/struct.Simd.html '//pre[@class="rust struct"]' 'pub struct Simd<T, const WIDTH: usize>'
5+
// @has foo/struct.Simd.html '//div[@class="item-decl"]/pre[@class="rust"]' 'pub struct Simd<T, const WIDTH: usize>'
66
pub struct Simd<T, const WIDTH: usize> {
77
inner: T,
88
}

‎tests/rustdoc/const-generics/const-generic-defaults.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![crate_name = "foo"]
22

3-
// @has foo/struct.Foo.html '//pre[@class="rust struct"]' \
3+
// @has foo/struct.Foo.html '//div[@class="item-decl"]/pre[@class="rust"]' \
44
// 'pub struct Foo<const M: usize = 10, const N: usize = M, T = i32>(_);'
55
pub struct Foo<const M: usize = 10, const N: usize = M, T = i32>(T);

0 commit comments

Comments
 (0)