Fix typescript error

Author: notriddle

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

@@ -2103,89 +2103,6 @@ class DocSearch {
             return tmp;
         }
 
-        /**
-         * Add extra data to result objects, and filter items that have been
-         * marked for removal.
-         *
-         * @param {[rustdoc.PlainResultObject, rustdoc.Row][]} results
-         * @param {"sig"|"elems"|"returned"|null} typeInfo
-         * @param {Set<string>} duplicates
-         * @returns {rustdoc.ResultObject[]}
-         */
-        const transformResults = (results, typeInfo, duplicates) => {
-            const out = [];
-
-            for (const [result, item] of results) {
-                if (item.id !== -1) {
-                    const res = buildHrefAndPath(item);
-                    // many of these properties don't strictly need to be
-                    // copied over, but copying them over satisfies tsc,
-                    // and hopefully plays nice with the shape optimization
-                    // of the browser engine.
-                    /** @type {rustdoc.ResultObject} */
-                    const obj = Object.assign({
-                        parent: item.parent ? {
-                            path: item.parent.path.modulePath,
-                            exactPath: item.parent.path.exactModulePath ||
-                                item.parent.path.modulePath,
-                            name: item.parent.name,
-                            ty: item.parent.path.ty,
-                        } : undefined,
-                        type: item.type && item.type.functionSignature ?
-                            item.type.functionSignature :
-                            undefined,
-                        paramNames: item.type && item.type.paramNames ?
-                            item.type.paramNames :
-                            undefined,
-                        dist: result.dist,
-                        path_dist: result.path_dist,
-                        index: result.index,
-                        desc: this.getDesc(result.id),
-                        item,
-                        displayPath: pathSplitter(res[0]),
-                        fullPath: "",
-                        href: "",
-                        displayTypeSignature: null,
-                    }, result);
-
-                    // To be sure than it some items aren't considered as duplicate.
-                    obj.fullPath = res[2] + "|" + obj.item.ty;
-
-                    if (duplicates.has(obj.fullPath)) {
-                        continue;
-                    }
-
-                    // Exports are specifically not shown if the items they point at
-                    // are already in the results.
-                    if (obj.item.ty === TY_IMPORT && duplicates.has(res[2])) {
-                        continue;
-                    }
-                    if (duplicates.has(res[2] + "|" + TY_IMPORT)) {
-                        continue;
-                    }
-                    duplicates.add(obj.fullPath);
-                    duplicates.add(res[2]);
-
-                    if (typeInfo !== null) {
-                        // @ts-expect-error
-                        obj.displayTypeSignature = this.formatDisplayTypeSignature(
-                            obj,
-                            typeInfo,
-                            result.elems,
-                            result.returned,
-                        );
-                    }
-
-                    obj.href = res[1];
-                    out.push(obj);
-                    if (out.length >= MAX_RESULTS) {
-                        break;
-                    }
-                }
-            }
-            return out;
-        };
-
         /**
          * Add extra data to result objects, and filter items that have been
          * marked for removal.
@@ -2199,7 +2116,7 @@ class DocSearch {
          * @param {rustdoc.QueryElement[]} returned
          * @returns {Promise<rustdoc.DisplayTypeSignature>}
          */
-        this.formatDisplayTypeSignature = async(obj, typeInfo, elems, returned) => {
+        const formatDisplayTypeSignature = async(obj, typeInfo, elems, returned) => {
             const objType = obj.type;
             if (!objType) {
                 return {type: [], mappedNames: new Map(), whereClause: new Map()};
@@ -2569,6 +2486,88 @@ class DocSearch {
             return {type, mappedNames, whereClause};
         };
 
+        /**
+         * Add extra data to result objects, and filter items that have been
+         * marked for removal.
+         *
+         * @param {[rustdoc.PlainResultObject, rustdoc.Row][]} results
+         * @param {"sig"|"elems"|"returned"|null} typeInfo
+         * @param {Set<string>} duplicates
+         * @returns {rustdoc.ResultObject[]}
+         */
+        const transformResults = (results, typeInfo, duplicates) => {
+            const out = [];
+
+            for (const [result, item] of results) {
+                if (item.id !== -1) {
+                    const res = buildHrefAndPath(item);
+                    // many of these properties don't strictly need to be
+                    // copied over, but copying them over satisfies tsc,
+                    // and hopefully plays nice with the shape optimization
+                    // of the browser engine.
+                    /** @type {rustdoc.ResultObject} */
+                    const obj = Object.assign({
+                        parent: item.parent ? {
+                            path: item.parent.path.modulePath,
+                            exactPath: item.parent.path.exactModulePath ||
+                                item.parent.path.modulePath,
+                            name: item.parent.name,
+                            ty: item.parent.path.ty,
+                        } : undefined,
+                        type: item.type && item.type.functionSignature ?
+                            item.type.functionSignature :
+                            undefined,
+                        paramNames: item.type && item.type.paramNames ?
+                            item.type.paramNames :
+                            undefined,
+                        dist: result.dist,
+                        path_dist: result.path_dist,
+                        index: result.index,
+                        desc: this.getDesc(result.id),
+                        item,
+                        displayPath: pathSplitter(res[0]),
+                        fullPath: "",
+                        href: "",
+                        displayTypeSignature: null,
+                    }, result);
+
+                    // To be sure than it some items aren't considered as duplicate.
+                    obj.fullPath = res[2] + "|" + obj.item.ty;
+
+                    if (duplicates.has(obj.fullPath)) {
+                        continue;
+                    }
+
+                    // Exports are specifically not shown if the items they point at
+                    // are already in the results.
+                    if (obj.item.ty === TY_IMPORT && duplicates.has(res[2])) {
+                        continue;
+                    }
+                    if (duplicates.has(res[2] + "|" + TY_IMPORT)) {
+                        continue;
+                    }
+                    duplicates.add(obj.fullPath);
+                    duplicates.add(res[2]);
+
+                    if (typeInfo !== null) {
+                        obj.displayTypeSignature = formatDisplayTypeSignature(
+                            obj,
+                            typeInfo,
+                            result.elems,
+                            result.returned,
+                        );
+                    }
+
+                    obj.href = res[1];
+                    out.push(obj);
+                    if (out.length >= MAX_RESULTS) {
+                        break;
+                    }
+                }
+            }
+            return out;
+        };
+
         const sortAndTransformResults =
             /**
              * @this {DocSearch}