Skip to content

Commit af446e1

Browse files
borsbors
committed
Auto merge of rust-lang#94861 - aDotInTheVoid:rdj-trait-tests, r=CraftSpider
rustdoc-json: More tests, and better jsondocck errors Helps with rust-lang#81359 r? `@CraftSpider` `@rustbot` modify labels: +A-rustdoc-json +T-rustdoc +A-testsuite
2 parents f21488a + 26829c0 commit af446e1

File tree

6 files changed

+155
-2
lines changed

6 files changed

+155
-2
lines changed

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

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
// ignore-tidy-linelength
2+
3+
#![feature(no_core)]
4+
#![no_core]
5+
6+
// @set foo = generic_args.json "$.index[*][?(@.name=='Foo')].id"
7+
pub trait Foo {}
8+
9+
// @is - "$.index[*][?(@.name=='generics')].inner.generics.where_predicates" "[]"
10+
// @count - "$.index[*][?(@.name=='generics')].inner.generics.params[*]" 1
11+
// @is - "$.index[*][?(@.name=='generics')].inner.generics.params[0].name" '"F"'
12+
// @is - "$.index[*][?(@.name=='generics')].inner.generics.params[0].kind.type.default" 'null'
13+
// @count - "$.index[*][?(@.name=='generics')].inner.generics.params[0].kind.type.bounds[*]" 1
14+
// @is - "$.index[*][?(@.name=='generics')].inner.generics.params[0].kind.type.bounds[0].trait_bound.trait.inner.id" '$foo'
15+
// @count - "$.index[*][?(@.name=='generics')].inner.decl.inputs[*]" 1
16+
// @is - "$.index[*][?(@.name=='generics')].inner.decl.inputs[0][0]" '"f"'
17+
// @is - "$.index[*][?(@.name=='generics')].inner.decl.inputs[0][1].kind" '"generic"'
18+
// @is - "$.index[*][?(@.name=='generics')].inner.decl.inputs[0][1].inner" '"F"'
19+
pub fn generics<F: Foo>(f: F) {}
20+
21+
// @is - "$.index[*][?(@.name=='impl_trait')].inner.generics.where_predicates" "[]"
22+
// @count - "$.index[*][?(@.name=='impl_trait')].inner.generics.params[*]" 1
23+
// @is - "$.index[*][?(@.name=='impl_trait')].inner.generics.params[0].name" '"impl Foo"'
24+
// @is - "$.index[*][?(@.name=='impl_trait')].inner.generics.params[0].kind.type.bounds[0].trait_bound.trait.inner.id" $foo
25+
// @count - "$.index[*][?(@.name=='impl_trait')].inner.decl.inputs[*]" 1
26+
// @is - "$.index[*][?(@.name=='impl_trait')].inner.decl.inputs[0][0]" '"f"'
27+
// @is - "$.index[*][?(@.name=='impl_trait')].inner.decl.inputs[0][1].kind" '"impl_trait"'
28+
// @count - "$.index[*][?(@.name=='impl_trait')].inner.decl.inputs[0][1].inner[*]" 1
29+
// @is - "$.index[*][?(@.name=='impl_trait')].inner.decl.inputs[0][1].inner[0].trait_bound.trait.inner.id" $foo
30+
pub fn impl_trait(f: impl Foo) {}
31+
32+
// @count - "$.index[*][?(@.name=='where_clase')].inner.generics.params[*]" 1
33+
// @is - "$.index[*][?(@.name=='where_clase')].inner.generics.params[0].name" '"F"'
34+
// @is - "$.index[*][?(@.name=='where_clase')].inner.generics.params[0].kind" '{"type": {"bounds": [], "default": null, "synthetic": false}}'
35+
// @count - "$.index[*][?(@.name=='where_clase')].inner.decl.inputs[*]" 1
36+
// @is - "$.index[*][?(@.name=='where_clase')].inner.decl.inputs[0][0]" '"f"'
37+
// @is - "$.index[*][?(@.name=='where_clase')].inner.decl.inputs[0][1].kind" '"generic"'
38+
// @is - "$.index[*][?(@.name=='where_clase')].inner.decl.inputs[0][1].inner" '"F"'
39+
// @count - "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[*]" 1
40+
// @is - "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[0].bound_predicate.type" '{"inner": "F", "kind": "generic"}'
41+
// @count - "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[0].bound_predicate.bounds[*]" 1
42+
// @is - "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[0].bound_predicate.bounds[0].trait_bound.trait.inner.id" $foo
43+
pub fn where_clase<F>(f: F)
44+
where
45+
F: Foo,
46+
{
47+
}

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// ignore-tidy-linelength
2+
3+
#![feature(no_core)]
4+
#![no_core]
5+
6+
// @count generic_returns.json "$.index[*][?(@.name=='generic_returns')].inner.items[*]" 2
7+
8+
// @set foo = - "$.index[*][?(@.name=='Foo')].id"
9+
pub trait Foo {}
10+
11+
// @is - "$.index[*][?(@.name=='get_foo')].inner.decl.inputs" []
12+
// @is - "$.index[*][?(@.name=='get_foo')].inner.decl.output.kind" '"impl_trait"'
13+
// @count - "$.index[*][?(@.name=='get_foo')].inner.decl.output.inner[*]" 1
14+
// @is - "$.index[*][?(@.name=='get_foo')].inner.decl.output.inner[0].trait_bound.trait.inner.id" $foo
15+
pub fn get_foo() -> impl Foo {
16+
Fooer {}
17+
}
18+
19+
struct Fooer {}
20+
21+
impl Foo for Fooer {}

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// ignore-tidy-linelength
2+
3+
#![feature(no_core)]
4+
#![no_core]
5+
6+
// @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": []}}'
9+
// @count - "$.index[*][?(@.name=='longest')].inner.generics.params[*]" 1
10+
// @is - "$.index[*][?(@.name=='longest')].inner.generics.where_predicates" []
11+
12+
// @count - "$.index[*][?(@.name=='longest')].inner.decl.inputs[*]" 2
13+
// @is - "$.index[*][?(@.name=='longest')].inner.decl.inputs[0][0]" '"l"'
14+
// @is - "$.index[*][?(@.name=='longest')].inner.decl.inputs[1][0]" '"r"'
15+
16+
// @is - "$.index[*][?(@.name=='longest')].inner.decl.inputs[0][1].kind" '"borrowed_ref"'
17+
// @is - "$.index[*][?(@.name=='longest')].inner.decl.inputs[0][1].inner.lifetime" \"\'a\"
18+
// @is - "$.index[*][?(@.name=='longest')].inner.decl.inputs[0][1].inner.mutable" false
19+
// @is - "$.index[*][?(@.name=='longest')].inner.decl.inputs[0][1].inner.type" '{"inner": "str", "kind": "primitive"}'
20+
21+
// @is - "$.index[*][?(@.name=='longest')].inner.decl.inputs[1][1].kind" '"borrowed_ref"'
22+
// @is - "$.index[*][?(@.name=='longest')].inner.decl.inputs[1][1].inner.lifetime" \"\'a\"
23+
// @is - "$.index[*][?(@.name=='longest')].inner.decl.inputs[1][1].inner.mutable" false
24+
// @is - "$.index[*][?(@.name=='longest')].inner.decl.inputs[1][1].inner.type" '{"inner": "str", "kind": "primitive"}'
25+
26+
// @is - "$.index[*][?(@.name=='longest')].inner.decl.output.kind" '"borrowed_ref"'
27+
// @is - "$.index[*][?(@.name=='longest')].inner.decl.output.inner.lifetime" \"\'a\"
28+
// @is - "$.index[*][?(@.name=='longest')].inner.decl.output.inner.mutable" false
29+
// @is - "$.index[*][?(@.name=='longest')].inner.decl.output.inner.type" '{"inner": "str", "kind": "primitive"}'
30+
31+
pub fn longest<'a>(l: &'a str, r: &'a str) -> &'a str {
32+
if l.len() > r.len() { l } else { r }
33+
}

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// ignore-tidy-linelength
2+
3+
#![feature(no_core)]
4+
#![no_core]
5+
6+
// @count outlives.json "$.index[*][?(@.name=='foo')].inner.generics.params[*]" 3
7+
// @is - "$.index[*][?(@.name=='foo')].inner.generics.where_predicates" []
8+
// @is - "$.index[*][?(@.name=='foo')].inner.generics.params[0].name" \"\'a\"
9+
// @is - "$.index[*][?(@.name=='foo')].inner.generics.params[1].name" \"\'b\"
10+
// @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\"]
13+
// @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\"
16+
// @is - "$.index[*][?(@.name=='foo')].inner.decl.inputs[0][1].kind" '"borrowed_ref"'
17+
// @is - "$.index[*][?(@.name=='foo')].inner.decl.inputs[0][1].inner.lifetime" \"\'a\"
18+
// @is - "$.index[*][?(@.name=='foo')].inner.decl.inputs[0][1].inner.mutable" false
19+
// @is - "$.index[*][?(@.name=='foo')].inner.decl.inputs[0][1].inner.type.kind" '"borrowed_ref"'
20+
// @is - "$.index[*][?(@.name=='foo')].inner.decl.inputs[0][1].inner.type.inner.lifetime" \"\'b\"
21+
// @is - "$.index[*][?(@.name=='foo')].inner.decl.inputs[0][1].inner.type.inner.mutable" false
22+
// @is - "$.index[*][?(@.name=='foo')].inner.decl.inputs[0][1].inner.type.inner.type" '{"inner": "T", "kind": "generic"}'
23+
pub fn foo<'a, 'b: 'a, T: 'b>(_: &'a &'b T) {}

‎src/test/rustdoc-json/traits/supertrait.rs‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// ignore-tidy-linelength
2+
3+
#![feature(no_core)]
4+
#![feature(lang_items)]
5+
#![no_core]
6+
7+
// @set loud_id = supertrait.json "$.index[*][?(@.name=='Loud')].id"
8+
pub trait Loud {}
9+
10+
// @set very_loud_id = - "$.index[*][?(@.name=='VeryLoud')].id"
11+
// @count - "$.index[*][?(@.name=='VeryLoud')].inner.bounds[*]" 1
12+
// @is - "$.index[*][?(@.name=='VeryLoud')].inner.bounds[0].trait_bound.trait.inner.id" $loud_id
13+
pub trait VeryLoud: Loud {}
14+
15+
// @set sounds_good_id = - "$.index[*][?(@.name=='SoundsGood')].id"
16+
pub trait SoundsGood {}
17+
18+
// @count - "$.index[*][?(@.name=='MetalBand')].inner.bounds[*]" 2
19+
// @is - "$.index[*][?(@.name=='MetalBand')].inner.bounds[0].trait_bound.trait.inner.id" $very_loud_id
20+
// @is - "$.index[*][?(@.name=='MetalBand')].inner.bounds[1].trait_bound.trait.inner.id" $sounds_good_id
21+
pub trait MetalBand: VeryLoud + SoundsGood {}
22+
23+
// @count - "$.index[*][?(@.name=='DnabLatem')].inner.bounds[*]" 2
24+
// @is - "$.index[*][?(@.name=='DnabLatem')].inner.bounds[1].trait_bound.trait.inner.id" $very_loud_id
25+
// @is - "$.index[*][?(@.name=='DnabLatem')].inner.bounds[0].trait_bound.trait.inner.id" $sounds_good_id
26+
pub trait DnabLatem: SoundsGood + VeryLoud {}

‎src/tools/jsondocck/src/main.rs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,10 @@ impl CommandKind {
7373

7474
if let CommandKind::Count = self {
7575
if args[2].parse::<usize>().is_err() {
76-
print_err(&format!("Third argument to @count must be a valid usize"), lineno);
76+
print_err(
77+
&format!("Third argument to @count must be a valid usize (got `{}`)", args[2]),
78+
lineno,
79+
);
7780
return false;
7881
}
7982
}
@@ -277,7 +280,7 @@ fn check_command(command: Command, cache: &mut Cache) -> Result<(), CkError> {
277280
assert_eq!(
278281
results.len(),
279282
1,
280-
"Didn't get 1 result for `{}`: got {:?}",
283+
"Expected 1 match for `{}` (because of @set): matched to {:?}",
281284
command.args[3],
282285
results
283286
);

0 commit comments

Comments
 (0)