mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #118856 - notriddle:notriddle/search-js, r=GuillaumeGomez

Browse Source 
rustdoc-search: clean up parser

The `c === "="` was redundant when `isSeparatorCharacter` already checks that.

The function `isStopCharacter` and `isEndCharacter` functions did exactly the same thing and have synonymous names. There doesn't seem much point in having both.
This commit is contained in:
Matthias Krüger 2023-12-12 17:40:55 +01:00 committed by GitHub
commit 6459121a6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -298,10 +298,6 @@ function initSearch(rawSearchIndex) {
return "=,>-]".indexOf(c) !== -1; return "=,>-]".indexOf(c) !== -1;
} }
function isStopCharacter(c) {
return isEndCharacter(c);
}
function isErrorCharacter(c) { function isErrorCharacter(c) {
return "()".indexOf(c) !== -1; return "()".indexOf(c) !== -1;
} }
@ -617,8 +613,7 @@ function initSearch(rawSearchIndex) {
} }
} else if ( } else if (
c === "[" || c === "[" ||
c === "=" || isEndCharacter(c) ||
isStopCharacter(c) ||
isSpecialStartCharacter(c) || isSpecialStartCharacter(c) ||
isSeparatorCharacter(c) isSeparatorCharacter(c)
) { ) {
@ -917,7 +912,7 @@ function initSearch(rawSearchIndex) {
while (parserState.pos < parserState.length) { while (parserState.pos < parserState.length) {
const c = parserState.userQuery[parserState.pos]; const c = parserState.userQuery[parserState.pos];
if (isStopCharacter(c)) { if (isEndCharacter(c)) {
foundStopChar = true; foundStopChar = true;
if (isSeparatorCharacter(c)) { if (isSeparatorCharacter(c)) {
parserState.pos += 1; parserState.pos += 1;