Skip to content

Commit 1232df9

Browse files
authored
Rollup merge of #87037 - notriddle:notriddle/search-cleanup-getobjectnamefromid, r=GuillaumeGomez
cleanup(rustdoc): remove unused function getObjectNameById This function was used in an earlier version, when idx's were used to serialize function inputs and outputs. That's not done any more, so removed the JS-side support for it.
2 parents a2eebfb + f6e3644 commit 1232df9

File tree

1 file changed

+8
-15
lines changed

1 file changed

+8
-15
lines changed

src/librustdoc/html/static/js/search.js

+8-15
Original file line numberDiff line numberDiff line change
@@ -289,13 +289,6 @@ window.initSearch = function(rawSearchIndex) {
289289
};
290290
}
291291

292-
function getObjectNameFromId(id) {
293-
if (typeof id === "number") {
294-
return searchIndex[id].name;
295-
}
296-
return id;
297-
}
298-
299292
function checkGenerics(obj, val) {
300293
// The names match, but we need to be sure that all generics kinda
301294
// match as well.
@@ -306,10 +299,10 @@ window.initSearch = function(rawSearchIndex) {
306299
var elems = Object.create(null);
307300
var elength = obj[GENERICS_DATA].length;
308301
for (var x = 0; x < elength; ++x) {
309-
if (!elems[getObjectNameFromId(obj[GENERICS_DATA][x])]) {
310-
elems[getObjectNameFromId(obj[GENERICS_DATA][x])] = 0;
302+
if (!elems[obj[GENERICS_DATA][x]]) {
303+
elems[obj[GENERICS_DATA][x]] = 0;
311304
}
312-
elems[getObjectNameFromId(obj[GENERICS_DATA][x])] += 1;
305+
elems[obj[GENERICS_DATA][x]] += 1;
313306
}
314307
var total = 0;
315308
var done = 0;
@@ -318,7 +311,7 @@ window.initSearch = function(rawSearchIndex) {
318311
var vlength = val.generics.length;
319312
for (x = 0; x < vlength; ++x) {
320313
var lev = MAX_LEV_DISTANCE + 1;
321-
var firstGeneric = getObjectNameFromId(val.generics[x]);
314+
var firstGeneric = val.generics[x];
322315
var match = null;
323316
if (elems[firstGeneric]) {
324317
match = firstGeneric;
@@ -361,16 +354,16 @@ window.initSearch = function(rawSearchIndex) {
361354
var elems = Object.create(null);
362355
len = obj[GENERICS_DATA].length;
363356
for (x = 0; x < len; ++x) {
364-
if (!elems[getObjectNameFromId(obj[GENERICS_DATA][x])]) {
365-
elems[getObjectNameFromId(obj[GENERICS_DATA][x])] = 0;
357+
if (!elems[obj[GENERICS_DATA][x]]) {
358+
elems[obj[GENERICS_DATA][x]] = 0;
366359
}
367-
elems[getObjectNameFromId(obj[GENERICS_DATA][x])] += 1;
360+
elems[obj[GENERICS_DATA][x]] += 1;
368361
}
369362

370363
var allFound = true;
371364
len = val.generics.length;
372365
for (x = 0; x < len; ++x) {
373-
firstGeneric = getObjectNameFromId(val.generics[x]);
366+
firstGeneric = val.generics[x];
374367
if (elems[firstGeneric]) {
375368
elems[firstGeneric] -= 1;
376369
} else {

0 commit comments

Comments
 (0)