diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-04-19 19:30:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-19 19:30:49 +0200 |
| commit | f8afb6314b3a092c727125a77c00a49459da045d (patch) | |
| tree | 55b6f96db2a4cd24c19523485e48fbc01989724b /src | |
| parent | 26d4b1bfbae5d3e752359cd1367e16271c5f36e1 (diff) | |
| parent | 2e7d9e9acbdb48620e347529796bf1e35fd97c19 (diff) | |
| download | rust-f8afb6314b3a092c727125a77c00a49459da045d.tar.gz rust-f8afb6314b3a092c727125a77c00a49459da045d.zip | |
Rollup merge of #124149 - notriddle:notriddle/desc-alias, r=GuillaumeGomez
rustdoc-search: fix description on aliases in results This needs to start downloading the descriptions after aliases have been added to the result set.
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/html/static/js/search.js | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/librustdoc/html/static/js/search.js b/src/librustdoc/html/static/js/search.js index 0a43e9765e2..41a9897de6d 100644 --- a/src/librustdoc/html/static/js/search.js +++ b/src/librustdoc/html/static/js/search.js @@ -1464,16 +1464,7 @@ function initSearch(rawSearchIndex) { return 0; }); - const transformed = transformResults(result_list); - const descs = await Promise.all(transformed.map(result => { - return searchIndexEmptyDesc.get(result.crate).contains(result.bitIndex) ? - "" : - searchState.loadDesc(result); - })); - for (const [i, result] of transformed.entries()) { - result.desc = descs[i]; - } - return transformed; + return transformResults(result_list); } /** @@ -2517,6 +2508,16 @@ function initSearch(rawSearchIndex) { sorted_others, parsedQuery); handleAliases(ret, parsedQuery.original.replace(/"/g, ""), filterCrates, currentCrate); + await Promise.all([ret.others, ret.returned, ret.in_args].map(async list => { + const descs = await Promise.all(list.map(result => { + return searchIndexEmptyDesc.get(result.crate).contains(result.bitIndex) ? + "" : + searchState.loadDesc(result); + })); + for (const [i, result] of list.entries()) { + result.desc = descs[i]; + } + })); if (parsedQuery.error !== null && ret.others.length !== 0) { // It means some doc aliases were found so let's "remove" the error! ret.query.error = null; |
