bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

In checkGenerics and checkType, don't use Array.prototype.splice so much

Browse source 
Every time splice() is called, another temporary object is created.
This version, which uses plain objects as a sort of Hash Bag,
should only produce one temporary object each time it's called.
This commit is contained in:
Michael Howell 2021-03-12 23:23:42 -07:00
parent 5fe3b87034
commit d7971e587c
1 changed files with 57 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

94
src/librustdoc/html/static/main.js
View file

@ -846,26 +846,38 @@ function defocusSearchBar() {
if (val.generics.length > 0) { if (val.generics.length > 0) {
if (obj.length > GENERICS_DATA && if (obj.length > GENERICS_DATA &&
obj[GENERICS_DATA].length >= val.generics.length) { obj[GENERICS_DATA].length >= val.generics.length) {
var elems = obj[GENERICS_DATA].slice(0); var elems = {};
var elength = object[GENERICS_DATA].length;
for (var x = 0; x < elength; ++x) {
elems[getObjectNameFromId(obj[GENERICS_DATA][x])] += 1;
}
var total = 0; var total = 0;
var done = 0; var done = 0;
// We need to find the type that matches the most to remove it in order // We need to find the type that matches the most to remove it in order
// to move forward. // to move forward.
var vlength = val.generics.length; var vlength = val.generics.length;
for (var y = 0; y < vlength; ++y) { for (var x = 0; x < vlength; ++x) {
var lev = { pos: -1, lev: MAX_LEV_DISTANCE + 1}; var lev = MAX_LEV_DISTANCE + 1;
var firstGeneric = getObjectNameFromId(val.generics[y]); var firstGeneric = getObjectNameFromId(val.generics[x]);
for (var x = 0, elength = elems.length; x < elength; ++x) { var match = undefined;
var tmp_lev = levenshtein(getObjectNameFromId(elems[x]), if (elems[firstGeneric]) {
firstGeneric); match = firstGeneric;
if (tmp_lev < lev.lev) { lev = 0;
lev.lev = tmp_lev; } else {
lev.pos = x; for (var elem_name in elems) {
var tmp_lev = levenshtein(elem_name, firstGeneric);
if (tmp_lev < lev) {
lev = tmp_lev;
match = elem_name;
}
} }
} }
if (lev.pos !== -1) { if (match !== undefined) {
elems.splice(lev.pos, 1); elems[match] -= 1;
total += lev.lev; if (elems[match] == 0) {
delete elems[match];
}
total += lev;
done += 1; done += 1;
} else { } else {
return MAX_LEV_DISTANCE + 1; return MAX_LEV_DISTANCE + 1;
@ -880,25 +892,27 @@ function defocusSearchBar() {
// Check for type name and type generics (if any). // Check for type name and type generics (if any).
function checkType(obj, val, literalSearch) { function checkType(obj, val, literalSearch) {
var lev_distance = MAX_LEV_DISTANCE + 1; var lev_distance = MAX_LEV_DISTANCE + 1;
var len, x, y, e_len, firstGeneric; var len, x, firstGeneric;
if (obj[NAME] === val.name) { if (obj[NAME] === val.name) {
if (literalSearch === true) { if (literalSearch === true) {
if (val.generics && val.generics.length !== 0) { if (val.generics && val.generics.length !== 0) {
if (obj.length > GENERICS_DATA && if (obj.length > GENERICS_DATA &&
obj[GENERICS_DATA].length >= val.generics.length) { obj[GENERICS_DATA].length >= val.generics.length) {
var elems = obj[GENERICS_DATA].slice(0); var elems = {};
var allFound = true; len = obj[GENERICS_DATA].length;
for (x = 0; x < len; ++x) {
elems[getObjectNameFromId(obj[GENERICS_DATA][x])] += 1;
}
var allFound = true;
len = val.generics.length; len = val.generics.length;
for (y = 0; allFound === true && y < len; ++y) { for (x = 0; x < len; ++x) {
allFound = false; firstGeneric = getObjectNameFromId(val.generics[x]);
firstGeneric = getObjectNameFromId(val.generics[y]); if (elems[firstGeneric]) {
e_len = elems.length; elems[firstGeneric] -= 1;
for (x = 0; allFound === false && x < e_len; ++x) { } else {
allFound = getObjectNameFromId(elems[x]) === firstGeneric; allFound = false;
} break;
if (allFound === true) {
elems.splice(x - 1, 1);
} }
} }
if (allFound === true) { if (allFound === true) {
@ -1066,13 +1080,6 @@ function defocusSearchBar() {
return false; return false;
} }
function generateId(ty) {
if (ty.parent && ty.parent.name) {
return itemTypes[ty.ty] + ty.path + ty.parent.name + ty.name;
}
return itemTypes[ty.ty] + ty.path + ty.name;
}
function createAliasFromItem(item) { function createAliasFromItem(item) {
return { return {
crate: item.crate, crate: item.crate,
@ -1158,7 +1165,7 @@ function defocusSearchBar() {
in_args = findArg(searchIndex[i], val, true, typeFilter); in_args = findArg(searchIndex[i], val, true, typeFilter);
returned = checkReturned(searchIndex[i], val, true, typeFilter); returned = checkReturned(searchIndex[i], val, true, typeFilter);
ty = searchIndex[i]; ty = searchIndex[i];
fullId = generateId(ty); fullId = ty.id;
if (searchWords[i] === val.name if (searchWords[i] === val.name
&& typePassesFilter(typeFilter, searchIndex[i].ty) && typePassesFilter(typeFilter, searchIndex[i].ty)
@ -1208,7 +1215,7 @@ function defocusSearchBar() {
if (!type) { if (!type) {
continue; continue;
} }
fullId = generateId(ty); fullId = ty.id;
returned = checkReturned(ty, output, true, NO_TYPE_FILTER); returned = checkReturned(ty, output, true, NO_TYPE_FILTER);
if (output.name === "*" || returned === true) { if (output.name === "*" || returned === true) {
@ -1292,7 +1299,7 @@ function defocusSearchBar() {
var index = -1; var index = -1;
// we want lev results to go lower than others // we want lev results to go lower than others
lev = MAX_LEV_DISTANCE + 1; lev = MAX_LEV_DISTANCE + 1;
fullId = generateId(ty); fullId = ty.id;
if (searchWords[j].indexOf(split[i]) > -1 || if (searchWords[j].indexOf(split[i]) > -1 ||
searchWords[j].indexOf(val) > -1 || searchWords[j].indexOf(val) > -1 ||
@ -1825,6 +1832,13 @@ function defocusSearchBar() {
showResults(execSearch(query, index, filterCrates)); showResults(execSearch(query, index, filterCrates));
} }
function generateId(ty) {
if (ty.parent && ty.parent.name) {
return itemTypes[ty.ty] + ty.path + ty.parent.name + ty.name;
}
return itemTypes[ty.ty] + ty.path + ty.name;
}
function buildIndex(rawSearchIndex) { function buildIndex(rawSearchIndex) {
searchIndex = []; searchIndex = [];
var searchWords = []; var searchWords = [];
@ -1837,14 +1851,18 @@ function defocusSearchBar() {
var crateSize = 0; var crateSize = 0;
searchWords.push(crate); searchWords.push(crate);
searchIndex.push({ var crateRow = {
crate: crate, crate: crate,
ty: 1, // == ExternCrate ty: 1, // == ExternCrate
name: crate, name: crate,
path: "", path: "",
desc: rawSearchIndex[crate].doc, desc: rawSearchIndex[crate].doc,
parent: undefined,
type: null, type: null,
}); id: "",
};
crateRow.id = generateId(crateRow);
searchIndex.push(crateRow);
currentIndex += 1; currentIndex += 1;
// an array of (Number) item types // an array of (Number) item types
@ -1890,7 +1908,9 @@ function defocusSearchBar() {
desc: itemDescs[i], desc: itemDescs[i],
parent: itemParentIdxs[i] > 0 ? paths[itemParentIdxs[i] - 1] : undefined, parent: itemParentIdxs[i] > 0 ? paths[itemParentIdxs[i] - 1] : undefined,
type: itemFunctionSearchTypes[i], type: itemFunctionSearchTypes[i],
id: "",
}; };
row.id = generateId(row);
searchIndex.push(row); searchIndex.push(row);
if (typeof row.name === "string") { if (typeof row.name === "string") {
var word = row.name.toLowerCase(); var word = row.name.toLowerCase();