Skip to content

Clean up variables in search.js #118886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 13, 2023
Merged

Clean up variables in search.js #118886

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions src/librustdoc/html/static/js/search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2102,8 +2102,6 @@ function initSearch(rawSearchIndex) {
}

function innerRunQuery() {
let elem, i, nSearchWords, in_returned, row;

let queryLen = 0;
for (const elem of parsedQuery.elems) {
queryLen += elem.name.length;
Expand Down Expand Up @@ -2225,8 +2223,8 @@ function initSearch(rawSearchIndex) {

if (parsedQuery.foundElems === 1) {
if (parsedQuery.elems.length === 1) {
elem = parsedQuery.elems[0];
for (i = 0, nSearchWords = searchWords.length; i < nSearchWords; ++i) {
const elem = parsedQuery.elems[0];
for (let i = 0, nSearchWords = searchWords.length; i < nSearchWords; ++i) {
// It means we want to check for this element everywhere (in names, args and
// returned).
handleSingleArg(
Expand All @@ -2241,10 +2239,9 @@ function initSearch(rawSearchIndex) {
}
} else if (parsedQuery.returned.length === 1) {
// We received one returned argument to check, so looking into returned values.
elem = parsedQuery.returned[0];
for (i = 0, nSearchWords = searchWords.length; i < nSearchWords; ++i) {
row = searchIndex[i];
in_returned = row.type && unifyFunctionTypes(
for (let i = 0, nSearchWords = searchWords.length; i < nSearchWords; ++i) {
const row = searchIndex[i];
const in_returned = row.type && unifyFunctionTypes(
row.type.output,
parsedQuery.returned,
row.type.where_clause
Expand All @@ -2262,7 +2259,7 @@ function initSearch(rawSearchIndex) {
}
}
} else if (parsedQuery.foundElems > 0) {
for (i = 0, nSearchWords = searchWords.length; i < nSearchWords; ++i) {
for (let i = 0, nSearchWords = searchWords.length; i < nSearchWords; ++i) {
handleArgs(searchIndex[i], i, results_others);
}
}
Expand Down Expand Up @@ -2418,7 +2415,6 @@ function initSearch(rawSearchIndex) {
const extraClass = display ? " active" : "";

const output = document.createElement("div");
let length = 0;
if (array.length > 0) {
output.className = "search-results " + extraClass;

Expand All @@ -2428,8 +2424,6 @@ function initSearch(rawSearchIndex) {
const longType = longItemTypes[item.ty];
const typeName = longType.length !== 0 ? `${longType}` : "?";

length += 1;

const link = document.createElement("a");
link.className = "result-" + type;
link.href = item.href;
Expand Down Expand Up @@ -2477,7 +2471,7 @@ ${item.displayPath}<span class="${type}">${name}</span>\
"href=\"https://docs.rs\">Docs.rs</a> for documentation of crates released on" +
" <a href=\"https://crates.io/\">crates.io</a>.</li></ul>";
}
return [output, length];
return [output, array.length];
}

function makeTabHeader(tabNb, text, nbElems) {
Expand Down