rustdoc-search: address nits

2 files changed, 9 insertions, 5 deletions

diff --git a/src/librustdoc/html/static/js/main.js b/src/librustdoc/html/static/js/main.js
index eff3dc27911..940b62be0c9 100644
--- a/src/librustdoc/html/static/js/main.js
+++ b/src/librustdoc/html/static/js/main.js
@@ -333,6 +333,10 @@ function preLoadCss(cssUrl) {
         loadDesc: async function({descShard, descIndex}) {
             if (descShard.promise === null) {
                 descShard.promise = new Promise((resolve, reject) => {
+                    // The `resolve` callback is stored in the `descShard`
+                    // object, which is itself stored in `this.descShards` map.
+                    // It is called in `loadedDescShard` by the
+                    // search.desc script.
                     descShard.resolve = resolve;
                     const ds = descShard;
                     const fname = `${ds.crate}-desc-${ds.shard}-`;
diff --git a/src/librustdoc/html/static/js/search.js b/src/librustdoc/html/static/js/search.js
index e70c5bfd734..3daf1ad22de 100644
--- a/src/librustdoc/html/static/js/search.js
+++ b/src/librustdoc/html/static/js/search.js
@@ -1455,13 +1455,13 @@ function initSearch(rawSearchIndex) {
             });
 
             const transformed = transformResults(result_list);
-            for (const result of transformed) {
-                result.desc = searchIndexEmptyDesc.get(result.crate).contains(result.bitIndex) ?
+            const descs = await Promise.all(transformed.map(result => {
+                return searchIndexEmptyDesc.get(result.crate).contains(result.bitIndex) ?
                     "" :
                     searchState.loadDesc(result);
-            }
-            for (const result of transformed) {
-                result.desc = await result.desc;
+            }));
+            for (const [i, result] of transformed.entries()) {
+                result.desc = descs[i];
             }
             return transformed;
         }