Skip to content

Commit 973059e

Browse files
matthiaskrgrmatthiaskrgr
authored
Rollup merge of rust-lang#101634 - aDotInTheVoid:rdj-test, r=CraftSpider
Rustdoc-Json Tests: Use `@is` and `@ismany` more often.
2 parents 2566e31 + 5634b26 commit 973059e

File tree

9 files changed

+61
-55
lines changed

9 files changed

+61
-55
lines changed

‎src/test/rustdoc-json/assoc_items.rs

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,35 @@
33
pub struct Simple;
44

55
impl Simple {
6-
// @has "$.index[*][?(@.name=='CONSTANT')].kind" \"assoc_const\"
6+
// @is "$.index[*][?(@.name=='CONSTANT')].kind" \"assoc_const\"
77
pub const CONSTANT: usize = 0;
88
}
99

1010
pub trait EasyToImpl {
11-
// @has "$.index[*][?(@.name=='ToDeclare')].kind" \"assoc_type\"
12-
// @has "$.index[*][?(@.name=='ToDeclare')].inner.default" null
11+
// @is "$.index[*][?(@.docs=='ToDeclare trait')].kind" \"assoc_type\"
12+
// @is "$.index[*][?(@.docs=='ToDeclare trait')].inner.default" null
13+
// @is "$.index[*][?(@.docs=='ToDeclare trait')].inner.bounds" []
14+
/// ToDeclare trait
1315
type ToDeclare;
14-
// @has "$.index[*][?(@.name=='AN_ATTRIBUTE')].kind" \"assoc_const\"
15-
// @has "$.index[*][?(@.name=='AN_ATTRIBUTE')].inner.default" null
16+
// @is "$.index[*][?(@.docs=='AN_ATTRIBUTE trait')].kind" \"assoc_const\"
17+
// @is "$.index[*][?(@.docs=='AN_ATTRIBUTE trait')].inner.default" null
18+
// @is "$.index[*][?(@.docs=='AN_ATTRIBUTE trait')].inner.type.kind" '"primitive"'
19+
// @is "$.index[*][?(@.docs=='AN_ATTRIBUTE trait')].inner.type.inner" '"usize"'
20+
/// AN_ATTRIBUTE trait
1621
const AN_ATTRIBUTE: usize;
1722
}
1823

1924
impl EasyToImpl for Simple {
20-
// @has "$.index[*][?(@.name=='ToDeclare')].inner.default.kind" \"primitive\"
21-
// @has "$.index[*][?(@.name=='ToDeclare')].inner.default.inner" \"usize\"
25+
// @is "$.index[*][?(@.docs=='ToDeclare impl')].kind" '"assoc_type"'
26+
// @is "$.index[*][?(@.docs=='ToDeclare impl')].inner.default.kind" \"primitive\"
27+
// @is "$.index[*][?(@.docs=='ToDeclare impl')].inner.default.inner" \"usize\"
28+
/// ToDeclare impl
2229
type ToDeclare = usize;
23-
// @has "$.index[*][?(@.name=='AN_ATTRIBUTE')].inner.type.kind" \"primitive\"
24-
// @has "$.index[*][?(@.name=='AN_ATTRIBUTE')].inner.type.inner" \"usize\"
25-
// @has "$.index[*][?(@.name=='AN_ATTRIBUTE')].inner.default" \"12\"
30+
31+
// @is "$.index[*][?(@.docs=='AN_ATTRIBUTE impl')].kind" '"assoc_const"'
32+
// @is "$.index[*][?(@.docs=='AN_ATTRIBUTE impl')].inner.type.kind" \"primitive\"
33+
// @is "$.index[*][?(@.docs=='AN_ATTRIBUTE impl')].inner.type.inner" \"usize\"
34+
// @is "$.index[*][?(@.docs=='AN_ATTRIBUTE impl')].inner.default" \"12\"
35+
/// AN_ATTRIBUTE impl
2636
const AN_ATTRIBUTE: usize = 12;
2737
}

‎src/test/rustdoc-json/enums/variant_struct.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
// @has "$.index[*][?(@.name=='EnumStruct')].visibility" \"public\"
2-
// @has "$.index[*][?(@.name=='EnumStruct')].kind" \"enum\"
1+
// @is "$.index[*][?(@.name=='EnumStruct')].visibility" \"public\"
2+
// @is "$.index[*][?(@.name=='EnumStruct')].kind" \"enum\"
33
pub enum EnumStruct {
4-
// @has "$.index[*][?(@.name=='VariantS')].inner.variant_kind" \"struct\"
5-
// @has "$.index[*][?(@.name=='x')].kind" \"struct_field\"
6-
// @has "$.index[*][?(@.name=='y')].kind" \"struct_field\"
4+
// @is "$.index[*][?(@.name=='VariantS')].inner.variant_kind" \"struct\"
5+
// @is "$.index[*][?(@.name=='x')].kind" \"struct_field\"
6+
// @is "$.index[*][?(@.name=='y')].kind" \"struct_field\"
77
VariantS {
88
x: u32,
99
y: String,

‎src/test/rustdoc-json/enums/variant_tuple_struct.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
// @has "$.index[*][?(@.name=='EnumTupleStruct')].visibility" \"public\"
2-
// @has "$.index[*][?(@.name=='EnumTupleStruct')].kind" \"enum\"
1+
// @is "$.index[*][?(@.name=='EnumTupleStruct')].visibility" \"public\"
2+
// @is "$.index[*][?(@.name=='EnumTupleStruct')].kind" \"enum\"
33
pub enum EnumTupleStruct {
4-
// @has "$.index[*][?(@.name=='VariantA')].inner.variant_kind" \"tuple\"
5-
// @has "$.index[*][?(@.name=='0')].kind" \"struct_field\"
6-
// @has "$.index[*][?(@.name=='1')].kind" \"struct_field\"
4+
// @is "$.index[*][?(@.name=='VariantA')].inner.variant_kind" \"tuple\"
5+
// @is "$.index[*][?(@.name=='0')].kind" \"struct_field\"
6+
// @is "$.index[*][?(@.name=='1')].kind" \"struct_field\"
77
VariantA(u32, String),
88
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ pub trait Wham {}
99
// @is "$.index[*][?(@.name=='one_generic_param_fn')].inner.generics.where_predicates" []
1010
// @count "$.index[*][?(@.name=='one_generic_param_fn')].inner.generics.params[*]" 1
1111
// @is "$.index[*][?(@.name=='one_generic_param_fn')].inner.generics.params[0].name" '"T"'
12-
// @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.id" $wham_id
12+
// @is "$.index[*][?(@.name=='one_generic_param_fn')].inner.generics.params[0].kind.type.synthetic" false
13+
// @is "$.index[*][?(@.name=='one_generic_param_fn')].inner.generics.params[0].kind.type.bounds[0].trait_bound.trait.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"'
20-
// @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.id" $wham_id
20+
// @is "$.index[*][?(@.name=='one_synthetic_generic_param_fn')].inner.generics.params[0].kind.type.synthetic" true
21+
// @is "$.index[*][?(@.name=='one_synthetic_generic_param_fn')].inner.generics.params[0].kind.type.bounds[0].trait_bound.trait.id" $wham_id
2222
// @count "$.index[*][?(@.name=='one_synthetic_generic_param_fn')].inner.decl.inputs[*]" 1
2323
// @is "$.index[*][?(@.name=='one_synthetic_generic_param_fn')].inner.decl.inputs[0][0]" '"w"'
2424
// @is "$.index[*][?(@.name=='one_synthetic_generic_param_fn')].inner.decl.inputs[0][1].kind" '"impl_trait"'

‎src/test/rustdoc-json/impls/import_from_private.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ mod bar {
1616
// @set import = "$.index[*][?(@.kind=='import')].id"
1717
pub use bar::Baz;
1818

19-
// FIXME(adotinthevoid): Use hasexact once #99474 lands
20-
21-
// @has "$.index[*][?(@.kind=='module')].inner.items[*]" $import
22-
// @is "$.index[*][?(@.kind=='import')].inner.id" $baz
23-
// @has "$.index[*][?(@.kind=='struct')].inner.impls[*]" $impl
24-
// @has "$.index[*][?(@.kind=='impl')].inner.items[*]" $doit
19+
// @is "$.index[*][?(@.kind=='module')].inner.items[*]" $import
20+
// @is "$.index[*][?(@.kind=='import')].inner.id" $baz
21+
// @is "$.index[*][?(@.kind=='struct')].inner.impls[*]" $impl
22+
// @is "$.index[*][?(@.kind=='impl')].inner.items[*]" $doit

‎src/test/rustdoc-json/primitives.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
#![feature(never_type)]
22

3-
// @has "$.index[*][?(@.name=='PrimNever')].visibility" \"public\"
4-
// @has "$.index[*][?(@.name=='PrimNever')].inner.type.kind" \"primitive\"
5-
// @has "$.index[*][?(@.name=='PrimNever')].inner.type.inner" \"never\"
3+
// @is "$.index[*][?(@.name=='PrimNever')].visibility" \"public\"
4+
// @is "$.index[*][?(@.name=='PrimNever')].inner.type.kind" \"primitive\"
5+
// @is "$.index[*][?(@.name=='PrimNever')].inner.type.inner" \"never\"
66
pub type PrimNever = !;
77

8-
// @has "$.index[*][?(@.name=='PrimStr')].inner.type.kind" \"primitive\"
9-
// @has "$.index[*][?(@.name=='PrimStr')].inner.type.inner" \"str\"
8+
// @is "$.index[*][?(@.name=='PrimStr')].inner.type.kind" \"primitive\"
9+
// @is "$.index[*][?(@.name=='PrimStr')].inner.type.inner" \"str\"
1010
pub type PrimStr = str;
1111

12-
// @has "$.index[*][?(@.name=='PrimBool')].inner.type.kind" \"primitive\"
13-
// @has "$.index[*][?(@.name=='PrimBool')].inner.type.inner" \"bool\"
12+
// @is "$.index[*][?(@.name=='PrimBool')].inner.type.kind" \"primitive\"
13+
// @is "$.index[*][?(@.name=='PrimBool')].inner.type.inner" \"bool\"
1414
pub type PrimBool = bool;
1515

16-
// @has "$.index[*][?(@.name=='PrimChar')].inner.type.kind" \"primitive\"
17-
// @has "$.index[*][?(@.name=='PrimChar')].inner.type.inner" \"char\"
16+
// @is "$.index[*][?(@.name=='PrimChar')].inner.type.kind" \"primitive\"
17+
// @is "$.index[*][?(@.name=='PrimChar')].inner.type.inner" \"char\"
1818
pub type PrimChar = char;
1919

20-
// @has "$.index[*][?(@.name=='PrimU8')].inner.type.kind" \"primitive\"
21-
// @has "$.index[*][?(@.name=='PrimU8')].inner.type.inner" \"u8\"
20+
// @is "$.index[*][?(@.name=='PrimU8')].inner.type.kind" \"primitive\"
21+
// @is "$.index[*][?(@.name=='PrimU8')].inner.type.inner" \"u8\"
2222
pub type PrimU8 = u8;

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
// @has "$.index[*][?(@.name=='Foo')]"
22
pub trait Foo {
3-
// @has "$.index[*][?(@.name=='no_self')].inner.has_body" false
3+
// @is "$.index[*][?(@.name=='no_self')].inner.has_body" false
44
fn no_self();
5-
// @has "$.index[*][?(@.name=='move_self')].inner.has_body" false
5+
// @is "$.index[*][?(@.name=='move_self')].inner.has_body" false
66
fn move_self(self);
7-
// @has "$.index[*][?(@.name=='ref_self')].inner.has_body" false
7+
// @is "$.index[*][?(@.name=='ref_self')].inner.has_body" false
88
fn ref_self(&self);
99

10-
// @has "$.index[*][?(@.name=='no_self_def')].inner.has_body" true
10+
// @is "$.index[*][?(@.name=='no_self_def')].inner.has_body" true
1111
fn no_self_def() {}
12-
// @has "$.index[*][?(@.name=='move_self_def')].inner.has_body" true
12+
// @is "$.index[*][?(@.name=='move_self_def')].inner.has_body" true
1313
fn move_self_def(self) {}
14-
// @has "$.index[*][?(@.name=='ref_self_def')].inner.has_body" true
14+
// @is "$.index[*][?(@.name=='ref_self_def')].inner.has_body" true
1515
fn ref_self_def(&self) {}
1616
}
1717

1818
pub trait Bar: Clone {
19-
// @has "$.index[*][?(@.name=='method')].inner.has_body" false
19+
// @is "$.index[*][?(@.name=='method')].inner.has_body" false
2020
fn method(&self, param: usize);
2121
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ use std::fmt::Debug;
55
// @set sync_int_gen = "$.index[*][?(@.name=='SyncIntGen')].id"
66
// @set ref_fn = "$.index[*][?(@.name=='RefFn')].id"
77
// @set weird_order = "$.index[*][?(@.name=='WeirdOrder')].id"
8-
// @has "$.index[*][?(@.name=='dyn')].inner.items[*]" $sync_int_gen
9-
// @has "$.index[*][?(@.name=='dyn')].inner.items[*]" $ref_fn
10-
// @has "$.index[*][?(@.name=='dyn')].inner.items[*]" $weird_order
8+
// @ismany "$.index[*][?(@.name=='dyn')].inner.items[*]" $sync_int_gen $ref_fn $weird_order
119

1210
// @is "$.index[*][?(@.name=='SyncIntGen')].kind" \"typedef\"
1311
// @is "$.index[*][?(@.name=='SyncIntGen')].inner.generics" '{"params": [], "where_predicates": []}'

‎src/test/rustdoc-json/unions/impl.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#![no_std]
22

3-
// @has "$.index[*][?(@.name=='Ux')].visibility" \"public\"
4-
// @has "$.index[*][?(@.name=='Ux')].kind" \"union\"
3+
// @is "$.index[*][?(@.name=='Ux')].visibility" \"public\"
4+
// @is "$.index[*][?(@.name=='Ux')].kind" \"union\"
55
pub union Ux {
66
a: u32,
77
b: u64
88
}
99

10-
// @has "$.index[*][?(@.name=='Num')].visibility" \"public\"
11-
// @has "$.index[*][?(@.name=='Num')].kind" \"trait\"
10+
// @is "$.index[*][?(@.name=='Num')].visibility" \"public\"
11+
// @is "$.index[*][?(@.name=='Num')].kind" \"trait\"
1212
pub trait Num {}
1313

1414
// @count "$.index[*][?(@.name=='Ux')].inner.impls" 1

0 commit comments

Comments
 (0)