nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-01 15:01:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #108656 - GuillaumeGomez:rustdoc-search-unclosed-generic, r=notriddle

Browse Source 
Rustdoc search: Emit an error for unclosed generic

Now, search like `a<` will error as it should (and as written in the eBNF).

r? `@notriddle`
This commit is contained in:
Dylan DPC 2023-03-04 15:24:38 +05:30 committed by GitHub
commit 2fc4935cdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/librustdoc/html/static/js/search.js
View File

@ -469,6 +469,15 @@ function initSearch(rawSearchIndex) {
} }
const posBefore = parserState.pos; const posBefore = parserState.pos;
getNextElem(query, parserState, elems, endChar === ">"); getNextElem(query, parserState, elems, endChar === ">");
if (endChar !== "") {
if (parserState.pos >= parserState.length) {
throw ["Unclosed ", "<"];
}
const c2 = parserState.userQuery[parserState.pos];
if (!isSeparatorCharacter(c2) && c2 !== endChar) {
throw ["Expected ", endChar, ", found ", c2];
}
}
// This case can be encountered if `getNextElem` encountered a "stop character" right // This case can be encountered if `getNextElem` encountered a "stop character" right
// from the start. For example if you have `,,` or `<>`. In this case, we simply move up // from the start. For example if you have `,,` or `<>`. In this case, we simply move up
// the current position to continue the parsing. // the current position to continue the parsing.
@ -477,7 +486,10 @@ function initSearch(rawSearchIndex) {
} }
foundStopChar = false; foundStopChar = false;
} }
// We are either at the end of the string or on the `endChar`` character, let's move forward if (parserState.pos >= parserState.length && endChar !== "") {
throw ["Unclosed ", "<"];
}
// We are either at the end of the string or on the `endChar` character, let's move forward
// in any case. // in any case.
parserState.pos += 1; parserState.pos += 1;
} }

10
tests/rustdoc-js-std/parser-errors.js
View File

@ -39,6 +39,7 @@ const QUERY = [
"a!!", "a!!",
"mod:a!", "mod:a!",
"a!::a", "a!::a",
"a<",
]; ];
const PARSED = [ const PARSED = [
@ -402,4 +403,13 @@ const PARSED = [
userQuery: "a!::a", userQuery: "a!::a",
error: 'Cannot have associated items in macros', error: 'Cannot have associated items in macros',
}, },
{
elems: [],
foundElems: 0,
original: "a<",
returned: [],
typeFilter: -1,
userQuery: "a<",
error: "Unclosed `<`",
},
]; ];