Skip to content

Commit ceaa42b

Browse files
committed
Update tests
1 parent 5a23111 commit ceaa42b

File tree

3 files changed

+20
-10
lines changed

3 files changed

+20
-10
lines changed

src/librustdoc/html/static/js/search.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -671,9 +671,10 @@ function initSearch(rawSearchIndex) {
671671
) {
672672
break;
673673
} else if (parserState.pos > 0) {
674-
throw ["Unexpected ", c, " after ", parserState.userQuery[parserState.pos - 1]];
674+
throw ["Unexpected ", c, " after ", parserState.userQuery[parserState.pos - 1],
675+
" (not a valid identifier)"];
675676
} else {
676-
throw ["Unexpected ", c];
677+
throw ["Unexpected ", c, " (not a valid identifier)"];
677678
}
678679
parserState.pos += 1;
679680
afterIdent = consumeIdent(parserState);

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

+16-7
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const PARSED = [
2424
original: "-> *",
2525
returned: [],
2626
userQuery: "-> *",
27-
error: "Unexpected `*` after ` `",
27+
error: "Unexpected `*` after ` ` (not a valid identifier)",
2828
},
2929
{
3030
query: 'a<"P">',
@@ -204,16 +204,25 @@ const PARSED = [
204204
original: "_:",
205205
returned: [],
206206
userQuery: "_:",
207-
error: "Unexpected `:` (expected path after type filter `_:`)",
207+
error: "Unexpected `_` (not a valid identifier)",
208208
},
209209
{
210-
query: "_:a",
210+
query: "ab:",
211211
elems: [],
212212
foundElems: 0,
213-
original: "_:a",
213+
original: "ab:",
214214
returned: [],
215-
userQuery: "_:a",
216-
error: "Unknown type filter `_`",
215+
userQuery: "ab:",
216+
error: "Unexpected `:` (expected path after type filter `ab:`)",
217+
},
218+
{
219+
query: "a:b",
220+
elems: [],
221+
foundElems: 0,
222+
original: "a:b",
223+
returned: [],
224+
userQuery: "a:b",
225+
error: "Unknown type filter `a`",
217226
},
218227
{
219228
query: "a-bb",
@@ -240,7 +249,7 @@ const PARSED = [
240249
original: "ab'",
241250
returned: [],
242251
userQuery: "ab'",
243-
error: "Unexpected `'` after `b`",
252+
error: "Unexpected `'` after `b` (not a valid identifier)",
244253
},
245254
{
246255
query: "a->",

tests/rustdoc-js/non-english-identifier.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ const PARSED = [
105105
original: "非法符号——",
106106
returned: [],
107107
userQuery: "非法符号——",
108-
error: "Unexpected `—` after `号`",
108+
error: "Unexpected `—` after `号` (not a valid identifier)",
109109
}
110110
]
111111
const EXPECTED = [

0 commit comments

Comments
 (0)