bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #92127 - GuillaumeGomez:search-results-duplicate-removal, r=jsha

Browse source 
Move duplicates removal when generating results instead of when displaying them

Currently, we store 200 results per tab and then display them. However, it was possible to have duplicates which is why we have this check. However, instead of doing it when displaying the results, it's much better instead to do it even before to simplify the display part a bit.

r? `@jsha`
This commit is contained in:
Matthias Krüger 2021-12-21 08:33:41 +01:00 • committed by GitHub
commit b9c3243801
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/librustdoc/html/static/js/search.js
View file

@ -152,16 +152,26 @@ window.initSearch = function(rawSearchIndex) {
removeEmptyStringsFromArray(split); removeEmptyStringsFromArray(split);
function transformResults(results) { function transformResults(results) {
var duplicates = {};
var out = []; var out = [];
for (var i = 0, len = results.length; i < len; ++i) { for (var i = 0, len = results.length; i < len; ++i) {
if (results[i].id > -1) { var result = results[i];
var obj = searchIndex[results[i].id];
obj.lev = results[i].lev; if (result.id > -1) {
var obj = searchIndex[result.id];
obj.lev = result.lev;
var res = buildHrefAndPath(obj); var res = buildHrefAndPath(obj);
obj.displayPath = pathSplitter(res[0]); obj.displayPath = pathSplitter(res[0]);
obj.fullPath = obj.displayPath + obj.name; obj.fullPath = obj.displayPath + obj.name;
// To be sure than it some items aren't considered as duplicate. // To be sure than it some items aren't considered as duplicate.
obj.fullPath += "|" + obj.ty; obj.fullPath += "|" + obj.ty;
if (duplicates[obj.fullPath]) {
continue;
}
duplicates[obj.fullPath] = true;
obj.href = res[1]; obj.href = res[1];
out.push(obj); out.push(obj);
if (out.length >= MAX_RESULTS) { if (out.length >= MAX_RESULTS) {
@ -971,19 +981,11 @@ window.initSearch = function(rawSearchIndex) {
} }
var output = document.createElement("div"); var output = document.createElement("div");
var duplicates = {};
var length = 0; var length = 0;
if (array.length > 0) { if (array.length > 0) {
output.className = "search-results " + extraClass; output.className = "search-results " + extraClass;
array.forEach(function(item) { array.forEach(function(item) {
if (item.is_alias !== true) {
if (duplicates[item.fullPath]) {
return;
}
duplicates[item.fullPath] = true;
}
var name = item.name; var name = item.name;
var type = itemTypes[item.ty]; var type = itemTypes[item.ty];