Skip to content

Commit b5f8258

Browse files
Update rustdoc-js-std tests
1 parent b99bf46 commit b5f8258

7 files changed

+127
-105
lines changed

tests/rustdoc-js-std/parser-errors.js

+75-21
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,24 @@ const PARSED = [
3333
original: "\"P\" \"P\"",
3434
returned: [],
3535
userQuery: "\"p\" \"p\"",
36+
error: "Cannot have more than one element if you use quotes",
37+
},
38+
{
39+
query: '"P","P"',
40+
elems: [],
41+
foundElems: 0,
42+
original: "\"P\",\"P\"",
43+
returned: [],
44+
userQuery: "\"p\",\"p\"",
3645
error: "Cannot have more than one literal search element",
3746
},
3847
{
39-
query: 'P "P"',
48+
query: "P,\"P\"",
4049
elems: [],
4150
foundElems: 0,
42-
original: "P \"P\"",
51+
original: "P,\"P\"",
4352
returned: [],
44-
userQuery: "p \"p\"",
53+
userQuery: "p,\"p\"",
4554
error: "Cannot use literal search when there is more than one element",
4655
},
4756
{
@@ -51,7 +60,16 @@ const PARSED = [
5160
original: "\"p\" p",
5261
returned: [],
5362
userQuery: "\"p\" p",
54-
error: "You cannot have more than one element if you use quotes",
63+
error: "Cannot have more than one element if you use quotes",
64+
},
65+
{
66+
query: '"p",p',
67+
elems: [],
68+
foundElems: 0,
69+
original: "\"p\",p",
70+
returned: [],
71+
userQuery: "\"p\",p",
72+
error: "Cannot have more than one element if you use quotes",
5573
},
5674
{
5775
query: '"const": p',
@@ -60,7 +78,7 @@ const PARSED = [
6078
original: "\"const\": p",
6179
returned: [],
6280
userQuery: "\"const\": p",
63-
error: "You cannot use quotes on type filter",
81+
error: "Cannot use quotes on type filter",
6482
},
6583
{
6684
query: "a<:a>",
@@ -107,6 +125,15 @@ const PARSED = [
107125
userQuery: "::a::b",
108126
error: "Paths cannot start with `::`",
109127
},
128+
{
129+
query: " ::a::b",
130+
elems: [],
131+
foundElems: 0,
132+
original: "::a::b",
133+
returned: [],
134+
userQuery: "::a::b",
135+
error: "Paths cannot start with `::`",
136+
},
110137
{
111138
query: "a::::b",
112139
elems: [],
@@ -135,13 +162,13 @@ const PARSED = [
135162
error: "Expected type filter before `:`",
136163
},
137164
{
138-
query: "a b:",
165+
query: "a,b:",
139166
elems: [],
140167
foundElems: 0,
141-
original: "a b:",
168+
original: "a,b:",
142169
returned: [],
143-
userQuery: "a b:",
144-
error: "Unexpected `:` (expected path after type filter)",
170+
userQuery: "a,b:",
171+
error: "Unexpected `:` (expected path after type filter `b:`)",
145172
},
146173
{
147174
query: "a (b:",
@@ -159,7 +186,7 @@ const PARSED = [
159186
original: "_:",
160187
returned: [],
161188
userQuery: "_:",
162-
error: "Unexpected `:` (expected path after type filter)",
189+
error: "Unexpected `:` (expected path after type filter `_:`)",
163190
},
164191
{
165192
query: "_:a",
@@ -213,6 +240,15 @@ const PARSED = [
213240
original: '"p" <a>',
214241
returned: [],
215242
userQuery: '"p" <a>',
243+
error: "Cannot have more than one element if you use quotes",
244+
},
245+
{
246+
query: '"p",<a>',
247+
elems: [],
248+
foundElems: 0,
249+
original: '"p",<a>',
250+
returned: [],
251+
userQuery: '"p",<a>',
216252
error: "Found generics without a path",
217253
},
218254
{
@@ -222,7 +258,16 @@ const PARSED = [
222258
original: '"p" a<a>',
223259
returned: [],
224260
userQuery: '"p" a<a>',
225-
error: "You cannot have more than one element if you use quotes",
261+
error: "Cannot have more than one element if you use quotes",
262+
},
263+
{
264+
query: '"p",a<a>',
265+
elems: [],
266+
foundElems: 0,
267+
original: '"p",a<a>',
268+
returned: [],
269+
userQuery: '"p",a<a>',
270+
error: "Cannot have more than one element if you use quotes",
226271
},
227272
{
228273
query: "a,<",
@@ -240,7 +285,7 @@ const PARSED = [
240285
original: 'aaaaa<>b',
241286
returned: [],
242287
userQuery: 'aaaaa<>b',
243-
error: 'Expected `,`, ` `, `:` or `->`, found `b`',
288+
error: 'Expected `,`, `:` or `->` after `>`, found `b`',
244289
},
245290
{
246291
query: "fn:aaaaa<>b",
@@ -249,7 +294,7 @@ const PARSED = [
249294
original: 'fn:aaaaa<>b',
250295
returned: [],
251296
userQuery: 'fn:aaaaa<>b',
252-
error: 'Expected `,`, ` `, `:` or `->`, found `b`',
297+
error: 'Expected `,`, `:` or `->` after `>`, found `b`',
253298
},
254299
{
255300
query: "->a<>b",
@@ -258,7 +303,7 @@ const PARSED = [
258303
original: '->a<>b',
259304
returned: [],
260305
userQuery: '->a<>b',
261-
error: 'Expected `,` or ` `, found `b`',
306+
error: 'Expected `,` after `>`, found `b`',
262307
},
263308
{
264309
query: "a<->",
@@ -276,7 +321,7 @@ const PARSED = [
276321
original: 'a:: a',
277322
returned: [],
278323
userQuery: 'a:: a',
279-
error: 'Paths cannot end with `::`',
324+
error: 'Unexpected `:: `',
280325
},
281326
{
282327
query: "a ::a",
@@ -285,7 +330,7 @@ const PARSED = [
285330
original: 'a ::a',
286331
returned: [],
287332
userQuery: 'a ::a',
288-
error: 'Paths cannot start with `::`',
333+
error: 'Unexpected ` ::`',
289334
},
290335
{
291336
query: "a<a>:",
@@ -294,7 +339,7 @@ const PARSED = [
294339
original: "a<a>:",
295340
returned: [],
296341
userQuery: "a<a>:",
297-
error: 'Unexpected `<` in type filter',
342+
error: 'Unexpected `<` in type filter (before `:`)',
298343
},
299344
{
300345
query: "a<>:",
@@ -303,7 +348,7 @@ const PARSED = [
303348
original: "a<>:",
304349
returned: [],
305350
userQuery: "a<>:",
306-
error: 'Unexpected `<` in type filter',
351+
error: 'Unexpected `<` in type filter (before `:`)',
307352
},
308353
{
309354
query: "a,:",
@@ -312,7 +357,7 @@ const PARSED = [
312357
original: "a,:",
313358
returned: [],
314359
userQuery: "a,:",
315-
error: 'Unexpected `,` in type filter',
360+
error: 'Unexpected `,` in type filter (before `:`)',
316361
},
317362
{
318363
query: " a<> :",
@@ -321,7 +366,7 @@ const PARSED = [
321366
original: "a<> :",
322367
returned: [],
323368
userQuery: "a<> :",
324-
error: 'Unexpected `<` in type filter',
369+
error: 'Expected `,`, `:` or `->` after `>`, found ` `',
325370
},
326371
{
327372
query: "mod : :",
@@ -330,7 +375,16 @@ const PARSED = [
330375
original: "mod : :",
331376
returned: [],
332377
userQuery: "mod : :",
333-
error: 'Unexpected `:`',
378+
error: 'Unexpected `:` (expected path after type filter `mod:`)',
379+
},
380+
{
381+
query: "mod: :",
382+
elems: [],
383+
foundElems: 0,
384+
original: "mod: :",
385+
returned: [],
386+
userQuery: "mod: :",
387+
error: 'Unexpected `:` (expected path after type filter `mod:`)',
334388
},
335389
{
336390
query: "a!a",

tests/rustdoc-js-std/parser-filter.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const PARSED = [
3838
original: "macro<f>:foo",
3939
returned: [],
4040
userQuery: "macro<f>:foo",
41-
error: "Unexpected `<` in type filter",
41+
error: "Unexpected `<` in type filter (before `:`)",
4242
},
4343
{
4444
query: 'macro!',

tests/rustdoc-js-std/parser-generics.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const PARSED = [
99
error: 'Unclosed `<`',
1010
},
1111
{
12-
query: 'p<> u8',
12+
query: 'p<>,u8',
1313
elems: [
1414
{
1515
name: "p",
@@ -29,9 +29,9 @@ const PARSED = [
2929
},
3030
],
3131
foundElems: 2,
32-
original: "p<> u8",
32+
original: "p<>,u8",
3333
returned: [],
34-
userQuery: "p<> u8",
34+
userQuery: "p<>,u8",
3535
error: null,
3636
},
3737
{

tests/rustdoc-js-std/parser-quote.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const PARSED = [
3838
original: '"p" -> a',
3939
returned: [],
4040
userQuery: '"p" -> a',
41-
error: "You cannot have more than one element if you use quotes",
41+
error: "Cannot have more than one element if you use quotes",
4242
},
4343
{
4444
query: '"a" -> "p"',

0 commit comments

Comments
 (0)