Skip to content

Commit 15edd45

Browse files
cjgillotcjgillot
committed
Bless rustdoc tests.
1 parent 70c520e commit 15edd45

21 files changed

+79
-94
lines changed

‎src/test/rustdoc-js/generics-multi-trait.js

+4-12
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,12 @@ const QUERY = [
99
const EXPECTED = [
1010
// check one of the generic items
1111
{
12-
'in_args': [
13-
{ 'path': 'generics_multi_trait', 'name': 'beta' },
14-
],
15-
'returned': [
16-
{ 'path': 'generics_multi_trait', 'name': 'bet' },
17-
],
12+
'in_args': [],
13+
'returned': [],
1814
},
1915
{
20-
'in_args': [
21-
{ 'path': 'generics_multi_trait', 'name': 'beta' },
22-
],
23-
'returned': [
24-
{ 'path': 'generics_multi_trait', 'name': 'bet' },
25-
],
16+
'in_args': [],
17+
'returned': [],
2618
},
2719
// ignore the name of the generic itself
2820
{

‎src/test/rustdoc-js/generics-trait.js

+4-12
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,11 @@ const QUERY = [
55

66
const EXPECTED = [
77
{
8-
'in_args': [
9-
{ 'path': 'generics_trait', 'name': 'beta' },
10-
],
11-
'returned': [
12-
{ 'path': 'generics_trait', 'name': 'bet' },
13-
],
8+
'in_args': [],
9+
'returned': [],
1410
},
1511
{
16-
'in_args': [
17-
{ 'path': 'generics_trait', 'name': 'alpha' },
18-
],
19-
'returned': [
20-
{ 'path': 'generics_trait', 'name': 'alef' },
21-
],
12+
'in_args': [],
13+
'returned': [],
2214
},
2315
];

‎src/test/rustdoc-js/generics.js

+2-6
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,11 @@ const EXPECTED = [
5050
},
5151
{
5252
// TraitCat
53-
'in_args': [
54-
{ 'path': 'generics', 'name': 'gamma' },
55-
],
53+
'in_args': [],
5654
},
5755
{
5856
// TraitDog
59-
'in_args': [
60-
{ 'path': 'generics', 'name': 'gamma' },
61-
],
57+
'in_args': [],
6258
},
6359
{
6460
// Result<String>

‎src/test/rustdoc-json/fn_pointer/generics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
// @is - "$.index[*][?(@.name=='WithHigherRankTraitBounds')].inner.type.inner.decl.output" '{ "kind": "primitive", "inner": "i32" }'
1111
// @count - "$.index[*][?(@.name=='WithHigherRankTraitBounds')].inner.type.inner.generic_params[*]" 1
1212
// @is - "$.index[*][?(@.name=='WithHigherRankTraitBounds')].inner.type.inner.generic_params[0].name" \"\'c\"
13-
// @is - "$.index[*][?(@.name=='WithHigherRankTraitBounds')].inner.type.inner.generic_params[0].kind" '{ "lifetime": { "outlives": [] } }'
13+
// @is - "$.index[*][?(@.name=='WithHigherRankTraitBounds')].inner.type.inner.generic_params[0].kind" '"lifetime"'
1414
pub type WithHigherRankTraitBounds = for<'c> fn(val: &'c i32) -> i32;

‎src/test/rustdoc-json/fns/generic_args.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,32 @@ pub trait Foo {}
99
// @set generic_foo = generic_args.json "$.index[*][?(@.name=='GenericFoo')].id"
1010
pub trait GenericFoo<'a> {}
1111

12-
// @is - "$.index[*][?(@.name=='generics')].inner.generics.where_predicates" "[]"
1312
// @count - "$.index[*][?(@.name=='generics')].inner.generics.params[*]" 1
1413
// @is - "$.index[*][?(@.name=='generics')].inner.generics.params[0].name" '"F"'
1514
// @is - "$.index[*][?(@.name=='generics')].inner.generics.params[0].kind.type.default" 'null'
16-
// @count - "$.index[*][?(@.name=='generics')].inner.generics.params[0].kind.type.bounds[*]" 1
17-
// @is - "$.index[*][?(@.name=='generics')].inner.generics.params[0].kind.type.bounds[0].trait_bound.trait.inner.id" '$foo'
1815
// @count - "$.index[*][?(@.name=='generics')].inner.decl.inputs[*]" 1
1916
// @is - "$.index[*][?(@.name=='generics')].inner.decl.inputs[0][0]" '"f"'
2017
// @is - "$.index[*][?(@.name=='generics')].inner.decl.inputs[0][1].kind" '"generic"'
2118
// @is - "$.index[*][?(@.name=='generics')].inner.decl.inputs[0][1].inner" '"F"'
19+
// @count - "$.index[*][?(@.name=='generics')].inner.generics.where_predicates" 1
20+
// @is - "$.index[*][?(@.name=='generics')].inner.generics.where_predicates[0].bound_predicate.type" '{"inner": "F", "kind": "generic"}'
21+
// @count - "$.index[*][?(@.name=='generics')].inner.generics.where_predicates[0].bound_predicate.bounds[*]" 1
22+
// @is - "$.index[*][?(@.name=='generics')].inner.generics.where_predicates[0].bound_predicate.bounds[0].trait_bound.trait.inner.id" '$foo'
2223
pub fn generics<F: Foo>(f: F) {}
2324

24-
// @is - "$.index[*][?(@.name=='impl_trait')].inner.generics.where_predicates" "[]"
2525
// @count - "$.index[*][?(@.name=='impl_trait')].inner.generics.params[*]" 1
2626
// @is - "$.index[*][?(@.name=='impl_trait')].inner.generics.params[0].name" '"impl Foo"'
27-
// @is - "$.index[*][?(@.name=='impl_trait')].inner.generics.params[0].kind.type.bounds[0].trait_bound.trait.inner.id" $foo
2827
// @count - "$.index[*][?(@.name=='impl_trait')].inner.decl.inputs[*]" 1
2928
// @is - "$.index[*][?(@.name=='impl_trait')].inner.decl.inputs[0][0]" '"f"'
3029
// @is - "$.index[*][?(@.name=='impl_trait')].inner.decl.inputs[0][1].kind" '"impl_trait"'
3130
// @count - "$.index[*][?(@.name=='impl_trait')].inner.decl.inputs[0][1].inner[*]" 1
3231
// @is - "$.index[*][?(@.name=='impl_trait')].inner.decl.inputs[0][1].inner[0].trait_bound.trait.inner.id" $foo
32+
// @is - "$.index[*][?(@.name=='impl_trait')].inner.generics.where_predicates" '[]'
3333
pub fn impl_trait(f: impl Foo) {}
3434

3535
// @count - "$.index[*][?(@.name=='where_clase')].inner.generics.params[*]" 3
3636
// @is - "$.index[*][?(@.name=='where_clase')].inner.generics.params[0].name" '"F"'
37-
// @is - "$.index[*][?(@.name=='where_clase')].inner.generics.params[0].kind" '{"type": {"bounds": [], "default": null, "synthetic": false}}'
37+
// @is - "$.index[*][?(@.name=='where_clase')].inner.generics.params[0].kind" '{"type": {"default": null, "synthetic": false}}'
3838
// @count - "$.index[*][?(@.name=='where_clase')].inner.decl.inputs[*]" 3
3939
// @is - "$.index[*][?(@.name=='where_clase')].inner.decl.inputs[0][0]" '"f"'
4040
// @is - "$.index[*][?(@.name=='where_clase')].inner.decl.inputs[0][1].kind" '"generic"'
@@ -50,7 +50,7 @@ pub fn impl_trait(f: impl Foo) {}
5050
// @is - "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[1].bound_predicate.bounds[0].trait_bound.trait.inner.id" $generic_foo
5151
// @count - "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[1].bound_predicate.bounds[0].trait_bound.generic_params[*]" 1
5252
// @is - "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[1].bound_predicate.bounds[0].trait_bound.generic_params[0].name" \"\'a\"
53-
// @is - "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[1].bound_predicate.bounds[0].trait_bound.generic_params[0].kind" '{ "lifetime": { "outlives": [] } }'
53+
// @is - "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[1].bound_predicate.bounds[0].trait_bound.generic_params[0].kind" '"lifetime"'
5454
// @is - "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[1].bound_predicate.generic_params" "[]"
5555

5656
// @is - "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[2].bound_predicate.type.kind" '"borrowed_ref"'
@@ -61,7 +61,7 @@ pub fn impl_trait(f: impl Foo) {}
6161
// @is - "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[2].bound_predicate.bounds[0].trait_bound.generic_params" "[]"
6262
// @count - "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[2].bound_predicate.generic_params[*]" 1
6363
// @is - "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[2].bound_predicate.generic_params[0].name" \"\'b\"
64-
// @is - "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[2].bound_predicate.generic_params[0].kind" '{ "lifetime": { "outlives": [] } }'
64+
// @is - "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[2].bound_predicate.generic_params[0].kind" '"lifetime"'
6565
pub fn where_clase<F, G, H>(f: F, g: G, h: H)
6666
where
6767
F: Foo,

‎src/test/rustdoc-json/fns/generics.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,18 @@
66
// @set wham_id = generics.json "$.index[*][?(@.name=='Wham')].id"
77
pub trait Wham {}
88

9-
// @is - "$.index[*][?(@.name=='one_generic_param_fn')].inner.generics.where_predicates" []
109
// @count - "$.index[*][?(@.name=='one_generic_param_fn')].inner.generics.params[*]" 1
1110
// @is - "$.index[*][?(@.name=='one_generic_param_fn')].inner.generics.params[0].name" '"T"'
1211
// @has - "$.index[*][?(@.name=='one_generic_param_fn')].inner.generics.params[0].kind.type.synthetic" false
13-
// @has - "$.index[*][?(@.name=='one_generic_param_fn')].inner.generics.params[0].kind.type.bounds[0].trait_bound.trait.inner.id" $wham_id
12+
// @is - "$.index[*][?(@.name=='one_generic_param_fn')].inner.generics.where_predicates[0].bound_predicate.type" '{"kind": "generic", "inner": "T"}'
13+
// @has - "$.index[*][?(@.name=='one_generic_param_fn')].inner.generics.where_predicates[0].bound_predicate.bounds[0].trait_bound.trait.inner.id" $wham_id
1414
// @is - "$.index[*][?(@.name=='one_generic_param_fn')].inner.decl.inputs" '[["w", {"inner": "T", "kind": "generic"}]]'
1515
pub fn one_generic_param_fn<T: Wham>(w: T) {}
1616

1717
// @is - "$.index[*][?(@.name=='one_synthetic_generic_param_fn')].inner.generics.where_predicates" []
1818
// @count - "$.index[*][?(@.name=='one_synthetic_generic_param_fn')].inner.generics.params[*]" 1
1919
// @is - "$.index[*][?(@.name=='one_synthetic_generic_param_fn')].inner.generics.params[0].name" '"impl Wham"'
2020
// @has - "$.index[*][?(@.name=='one_synthetic_generic_param_fn')].inner.generics.params[0].kind.type.synthetic" true
21-
// @has - "$.index[*][?(@.name=='one_synthetic_generic_param_fn')].inner.generics.params[0].kind.type.bounds[0].trait_bound.trait.inner.id" $wham_id
2221
// @count - "$.index[*][?(@.name=='one_synthetic_generic_param_fn')].inner.decl.inputs[*]" 1
2322
// @is - "$.index[*][?(@.name=='one_synthetic_generic_param_fn')].inner.decl.inputs[0][0]" '"w"'
2423
// @is - "$.index[*][?(@.name=='one_synthetic_generic_param_fn')].inner.decl.inputs[0][1].kind" '"impl_trait"'

‎src/test/rustdoc-json/lifetime/longest.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#![no_core]
55

66
// @is longest.json "$.index[*][?(@.name=='longest')].inner.generics.params[0].name" \"\'a\"
7-
// @is - "$.index[*][?(@.name=='longest')].inner.generics.params[0].kind" '{"lifetime": {"outlives": []}}'
8-
// @is - "$.index[*][?(@.name=='longest')].inner.generics.params[0].kind" '{"lifetime": {"outlives": []}}'
7+
// @is - "$.index[*][?(@.name=='longest')].inner.generics.params[0].kind" '"lifetime"'
8+
// @is - "$.index[*][?(@.name=='longest')].inner.generics.params[0].kind" '"lifetime"'
99
// @count - "$.index[*][?(@.name=='longest')].inner.generics.params[*]" 1
1010
// @is - "$.index[*][?(@.name=='longest')].inner.generics.where_predicates" []
1111

‎src/test/rustdoc-json/lifetime/outlives.rs

+6-5
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@
44
#![no_core]
55

66
// @count outlives.json "$.index[*][?(@.name=='foo')].inner.generics.params[*]" 3
7-
// @is - "$.index[*][?(@.name=='foo')].inner.generics.where_predicates" []
87
// @is - "$.index[*][?(@.name=='foo')].inner.generics.params[0].name" \"\'a\"
98
// @is - "$.index[*][?(@.name=='foo')].inner.generics.params[1].name" \"\'b\"
109
// @is - "$.index[*][?(@.name=='foo')].inner.generics.params[2].name" '"T"'
11-
// @is - "$.index[*][?(@.name=='foo')].inner.generics.params[0].kind.lifetime.outlives" []
12-
// @is - "$.index[*][?(@.name=='foo')].inner.generics.params[1].kind.lifetime.outlives" [\"\'a\"]
1310
// @is - "$.index[*][?(@.name=='foo')].inner.generics.params[2].kind.type.default" null
14-
// @count - "$.index[*][?(@.name=='foo')].inner.generics.params[2].kind.type.bounds[*]" 1
15-
// @is - "$.index[*][?(@.name=='foo')].inner.generics.params[2].kind.type.bounds[0].outlives" \"\'b\"
1611
// @is - "$.index[*][?(@.name=='foo')].inner.decl.inputs[0][1].kind" '"borrowed_ref"'
1712
// @is - "$.index[*][?(@.name=='foo')].inner.decl.inputs[0][1].inner.lifetime" \"\'a\"
1813
// @is - "$.index[*][?(@.name=='foo')].inner.decl.inputs[0][1].inner.mutable" false
1914
// @is - "$.index[*][?(@.name=='foo')].inner.decl.inputs[0][1].inner.type.kind" '"borrowed_ref"'
2015
// @is - "$.index[*][?(@.name=='foo')].inner.decl.inputs[0][1].inner.type.inner.lifetime" \"\'b\"
2116
// @is - "$.index[*][?(@.name=='foo')].inner.decl.inputs[0][1].inner.type.inner.mutable" false
2217
// @is - "$.index[*][?(@.name=='foo')].inner.decl.inputs[0][1].inner.type.inner.type" '{"inner": "T", "kind": "generic"}'
18+
// @count - "$.index[*][?(@.name=='foo')].inner.generics.where_predicates[*]" 2
19+
// @is - "$.index[*][?(@.name=='foo')].inner.generics.where_predicates[0].region_predicate.lifetime" \"\'b\"
20+
// @count - "$.index[*][?(@.name=='foo')].inner.generics.where_predicates[0].region_predicate.bounds[*]" 1
21+
// @is - "$.index[*][?(@.name=='foo')].inner.generics.where_predicates[0].region_predicate.bounds[0].outlives" \"\'a\"
22+
// @is - "$.index[*][?(@.name=='foo')].inner.generics.where_predicates[1].bound_predicate.type.inner" '"T"'
23+
// @is - "$.index[*][?(@.name=='foo')].inner.generics.where_predicates[1].bound_predicate.bounds[0].outlives" \"\'b\"
2324
pub fn foo<'a, 'b: 'a, T: 'b>(_: &'a &'b T) {}

‎src/test/rustdoc-json/structs/with_primitives.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// @has with_primitives.json "$.index[*][?(@.name=='WithPrimitives')].visibility" \"public\"
22
// @has - "$.index[*][?(@.name=='WithPrimitives')].kind" \"struct\"
33
// @has - "$.index[*][?(@.name=='WithPrimitives')].inner.generics.params[0].name" \"\'a\"
4-
// @has - "$.index[*][?(@.name=='WithPrimitives')].inner.generics.params[0].kind.lifetime.outlives" []
54
// @has - "$.index[*][?(@.name=='WithPrimitives')].inner.struct_type" \"plain\"
65
// @has - "$.index[*][?(@.name=='WithPrimitives')].inner.fields_stripped" true
76
pub struct WithPrimitives<'a> {

‎src/test/rustdoc-json/type/fn_lifetime.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44

55
// @count - "$.index[*][?(@.name=='GenericFn')].inner.generics.params[*]" 1
66
// @is - "$.index[*][?(@.name=='GenericFn')].inner.generics.params[*].name" \"\'a\"
7-
// @has - "$.index[*][?(@.name=='GenericFn')].inner.generics.params[*].kind.lifetime"
8-
// @count - "$.index[*][?(@.name=='GenericFn')].inner.generics.params[*].kind.lifetime.outlives[*]" 0
7+
// @is - "$.index[*][?(@.name=='GenericFn')].inner.generics.params[*].kind" \"lifetime\"
98
// @count - "$.index[*][?(@.name=='GenericFn')].inner.generics.where_predicates[*]" 0
109
// @is - "$.index[*][?(@.name=='GenericFn')].inner.type.kind" \"function_pointer\"
1110
// @count - "$.index[*][?(@.name=='GenericFn')].inner.type.inner.generic_params[*]" 0
@@ -20,8 +19,7 @@ pub type GenericFn<'a> = fn(&'a i32) -> &'a i32;
2019
// @count - "$.index[*][?(@.name=='ForAll')].inner.generics.where_predicates[*]" 0
2120
// @count - "$.index[*][?(@.name=='ForAll')].inner.type.inner.generic_params[*]" 1
2221
// @is - "$.index[*][?(@.name=='ForAll')].inner.type.inner.generic_params[*].name" \"\'a\"
23-
// @has - "$.index[*][?(@.name=='ForAll')].inner.type.inner.generic_params[*].kind.lifetime"
24-
// @count - "$.index[*][?(@.name=='ForAll')].inner.type.inner.generic_params[*].kind.lifetime.outlives[*]" 0
22+
// @is - "$.index[*][?(@.name=='ForAll')].inner.type.inner.generic_params[*].kind" \"lifetime\"
2523
// @count - "$.index[*][?(@.name=='ForAll')].inner.type.inner.decl.inputs[*]" 1
2624
// @is - "$.index[*][?(@.name=='ForAll')].inner.type.inner.decl.inputs[*][1].inner.lifetime" \"\'a\"
2725
// @is - "$.index[*][?(@.name=='ForAll')].inner.type.inner.decl.output.inner.lifetime" \"\'a\"

‎src/test/rustdoc/anonymous-lifetime.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ pub trait Stream {
1212
}
1313

1414
// @has 'foo/trait.Stream.html'
15-
// @has - '//*[@class="code-header in-band"]' 'impl<S: ?Sized + Stream + Unpin> Stream for &mut S'
15+
// @has - '//*[@class="code-header in-band"]' 'impl<S> Stream for &mut S'
16+
// @has - '//*[@class="where fmt-newline"]' 'where S: ?Sized + Stream + Unpin'
1617
impl<S: ?Sized + Stream + Unpin> Stream for &mut S {
1718
type Item = S::Item;
1819

‎src/test/rustdoc/assoc-types.rs

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
#![crate_type="lib"]
1+
#![crate_type = "lib"]
22

33
// @has assoc_types/trait.Index.html
44
pub trait Index<I: ?Sized> {
5-
// @has - '//*[@id="associatedtype.Output"]//h4[@class="code-header"]' 'type Output: ?Sized'
5+
// @has - '//*[@id="associatedtype.Output"]//h4[@class="code-header"]' 'type Output: ?Sized'
66
type Output: ?Sized;
77
// @has - '//*[@id="tymethod.index"]//h4[@class="code-header"]' \
88
// "fn index<'a>(&'a self, index: I) -> &'a Self::Output"
@@ -25,13 +25,16 @@ pub trait Feed {
2525
// @has assoc_types/fn.use_input.html
2626
// @has - '//*[@class="rust fn"]' 'T::Input'
2727
// @has - '//*[@class="rust fn"]//a[@href="trait.Feed.html#associatedtype.Input"]' 'Input'
28-
pub fn use_input<T: Feed>(_feed: &T, _element: T::Input) { }
28+
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>'
31+
// @has - '//*[@class="rust fn"]' 'where T: Feed,'
32+
// @has - '//*[@class="rust fn"]' 'U: Feed,'
33+
// @has - '//*[@class="rust fn"]' 'T::Input: PartialEq<U::Input>'
3234
// @has - '//*[@class="rust fn"]//a[@href="trait.Feed.html#associatedtype.Input"]' 'Input'
3335
pub fn cmp_input<T: Feed, U: Feed>(a: &T::Input, b: &U::Input) -> bool
34-
where T::Input: PartialEq<U::Input>
36+
where
37+
T::Input: PartialEq<U::Input>,
3538
{
3639
a == b
3740
}

‎src/test/rustdoc/doc-assoc-item.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ pub trait Bar {
88
fn foo(foo: Self::Fuu);
99
}
1010

11-
// @has doc_assoc_item/struct.Foo.html '//*[@class="impl has-srclink"]' 'impl<T: Bar<Fuu = u32>> Foo<T>'
11+
// @has doc_assoc_item/struct.Foo.html
12+
// @has - '//*[@class="impl has-srclink"]' 'impl<T> Foo<T>'
13+
// @has - '//*[@class="impl has-srclink"]' 'where T: Bar<Fuu = u32>'
1214
impl<T: Bar<Fuu = u32>> Foo<T> {
1315
pub fn new(t: T) -> Foo<T> {
14-
Foo {
15-
x: t,
16-
}
16+
Foo { x: t }
1717
}
1818
}

‎src/test/rustdoc/doc-notable_trait.rs

+7-6
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ impl<T: SomeTrait> SomeTrait for Wrapper<T> {}
99
#[doc(notable_trait)]
1010
pub trait SomeTrait {
1111
// @has doc_notable_trait/trait.SomeTrait.html
12-
// @has - '//code[@class="content"]' 'impl<T: SomeTrait> SomeTrait for Wrapper<T>'
13-
fn wrap_me(self) -> Wrapper<Self> where Self: Sized {
14-
Wrapper {
15-
inner: self,
16-
}
12+
// @has - '//code[@class="content"]' 'impl<T> SomeTrait for Wrapper<T>'
13+
fn wrap_me(self) -> Wrapper<Self>
14+
where
15+
Self: Sized,
16+
{
17+
Wrapper { inner: self }
1718
}
1819
}
1920

@@ -23,7 +24,7 @@ impl SomeTrait for SomeStruct {}
2324
impl SomeStruct {
2425
// @has doc_notable_trait/struct.SomeStruct.html
2526
// @has - '//code[@class="content"]' 'impl SomeTrait for SomeStruct'
26-
// @has - '//code[@class="content"]' 'impl<T: SomeTrait> SomeTrait for Wrapper<T>'
27+
// @has - '//code[@class="content"]' 'impl<T> SomeTrait for Wrapper<T>'
2728
pub fn new() -> SomeStruct {
2829
SomeStruct
2930
}

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

+5-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33

44
pub auto trait AnAutoTrait {}
55

6-
pub struct Foo<T> { field: T }
6+
pub struct Foo<T> {
7+
field: T,
8+
}
79

810
// @has impl_parts/struct.Foo.html '//*[@class="impl has-srclink"]//h3[@class="code-header in-band"]' \
9-
// "impl<T: Clone> !AnAutoTrait for Foo<T> where T: Sync,"
11+
// "impl<T> !AnAutoTrait for Foo<T> where T: Clone, T: Sync,"
1012
// @has impl_parts/trait.AnAutoTrait.html '//*[@class="item-list"]//h3[@class="code-header in-band"]' \
11-
// "impl<T: Clone> !AnAutoTrait for Foo<T> where T: Sync,"
13+
// "impl<T> !AnAutoTrait for Foo<T> where T: Clone, T: Sync,"
1214
impl<T: Clone> !AnAutoTrait for Foo<T> where T: Sync {}

‎src/test/rustdoc/issue-20727-4.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ extern crate issue_20727;
55

66
// @has issue_20727_4/trait.Index.html
77
pub trait Index<Idx: ?Sized> {
8-
// @has - '//*[@class="rust trait"]' 'trait Index<Idx: ?Sized> {'
8+
// @has - '//*[@class="rust trait"]' 'trait Index<Idx> where Idx: ?Sized, {'
99
// @has - '//*[@class="rust trait"]' 'type Output: ?Sized'
1010
type Output: ?Sized;
1111

@@ -17,7 +17,7 @@ pub trait Index<Idx: ?Sized> {
1717
// @has issue_20727_4/trait.IndexMut.html
1818
pub trait IndexMut<Idx: ?Sized>: Index<Idx> {
1919
// @has - '//*[@class="rust trait"]' \
20-
// 'trait IndexMut<Idx: ?Sized>: Index<Idx> {'
20+
// 'trait IndexMut<Idx>: Index<Idx> where Idx: ?Sized, {'
2121
// @has - '//*[@class="rust trait"]' \
2222
// 'fn index_mut(&mut self, index: Idx) -> &mut Self::Output;'
2323
fn index_mut(&mut self, index: Idx) -> &mut Self::Output;

‎src/test/rustdoc/normalize-assoc-item.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ impl<Inner: Trait> Trait for Generic<Inner> {
3636
// These can't be normalized because they depend on a generic parameter.
3737
// However the user can choose whether the text should be displayed as `Inner::X` or `<Inner as Trait>::X`.
3838

39-
// @has 'normalize_assoc_item/struct.Unknown.html' '//pre[@class="rust struct"]' 'pub struct Unknown<Inner: Trait>(pub <Inner as Trait>::X);'
39+
// @has 'normalize_assoc_item/struct.Unknown.html' '//pre[@class="rust struct"]' 'pub struct Unknown<Inner>(pub <Inner as Trait>::X) where Inner: Trait;'
4040
pub struct Unknown<Inner: Trait>(pub <Inner as Trait>::X);
4141

42-
// @has 'normalize_assoc_item/struct.Unknown2.html' '//pre[@class="rust struct"]' 'pub struct Unknown2<Inner: Trait>(pub Inner::X);'
42+
// @has 'normalize_assoc_item/struct.Unknown2.html' '//pre[@class="rust struct"]' 'pub struct Unknown2<Inner>(pub Inner::X) where Inner: Trait;'
4343
pub struct Unknown2<Inner: Trait>(pub Inner::X);
4444

4545
trait Lifetimes<'a> {

0 commit comments

Comments
 (0)