Skip to content

Commit 5fe3b87

Browse files
committed
Get rid of the garbage produced by getObjectFromId
There is no reason for this function to return an object, since it is always used for getting at the name anyhow. It's used in the inner loop for some popular functions, so we want to avoid allocating in it.
1 parent 4d76b4c commit 5fe3b87

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/librustdoc/html/static/main.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -833,11 +833,11 @@ function defocusSearchBar() {
833833
};
834834
}
835835

836-
function getObjectFromId(id) {
836+
function getObjectNameFromId(id) {
837837
if (typeof id === "number") {
838-
return searchIndex[id];
838+
return searchIndex[id].name;
839839
}
840-
return {'name': id};
840+
return id;
841841
}
842842

843843
function checkGenerics(obj, val) {
@@ -854,9 +854,9 @@ function defocusSearchBar() {
854854
var vlength = val.generics.length;
855855
for (var y = 0; y < vlength; ++y) {
856856
var lev = { pos: -1, lev: MAX_LEV_DISTANCE + 1};
857-
var firstGeneric = getObjectFromId(val.generics[y]).name;
857+
var firstGeneric = getObjectNameFromId(val.generics[y]);
858858
for (var x = 0, elength = elems.length; x < elength; ++x) {
859-
var tmp_lev = levenshtein(getObjectFromId(elems[x]).name,
859+
var tmp_lev = levenshtein(getObjectNameFromId(elems[x]),
860860
firstGeneric);
861861
if (tmp_lev < lev.lev) {
862862
lev.lev = tmp_lev;
@@ -892,10 +892,10 @@ function defocusSearchBar() {
892892
len = val.generics.length;
893893
for (y = 0; allFound === true && y < len; ++y) {
894894
allFound = false;
895-
firstGeneric = getObjectFromId(val.generics[y]).name;
895+
firstGeneric = getObjectNameFromId(val.generics[y]);
896896
e_len = elems.length;
897897
for (x = 0; allFound === false && x < e_len; ++x) {
898-
allFound = getObjectFromId(elems[x]).name === firstGeneric;
898+
allFound = getObjectNameFromId(elems[x]) === firstGeneric;
899899
}
900900
if (allFound === true) {
901901
elems.splice(x - 1, 1);

0 commit comments

Comments
 (0)