Fix ci check

Author: Folyd

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

@@ -7,7 +7,7 @@
 // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toSpliced
 if (!Array.prototype.toSpliced) {
     // Can't use arrow functions, because we want `this`
-    Array.prototype.toSpliced = function () {
+    Array.prototype.toSpliced = function() {
         const me = this.slice();
         Array.prototype.splice.apply(me, arguments);
         return me;
@@ -1185,6 +1185,10 @@ class DocSearch {
         this.searchIndex = this.buildIndex(rawSearchIndex);
     }
 
+    static getItemType(ty) {
+        return itemTypes[ty];
+    }
+
     /**
      * Add an item to the type Name->ID map, or, if one already exists, use it.
      * Returns the number. If name is "" or null, return null (pure generic).
@@ -3135,9 +3139,9 @@ class DocSearch {
              */
             const convertNameToId = (elem, isAssocType) => {
                 const loweredName = elem.pathLast.toLowerCase();
-                if (typeNameIdMap.has(loweredName) &&
-                    (isAssocType || !typeNameIdMap.get(loweredName).assocOnly)) {
-                    elem.id = typeNameIdMap.get(loweredName).id;
+                if (this.typeNameIdMap.has(loweredName) &&
+                    (isAssocType || !this.typeNameIdMap.get(loweredName).assocOnly)) {
+                    elem.id = this.typeNameIdMap.get(loweredName).id;
                 } else if (!parsedQuery.literalSearch) {
                     let match = null;
                     let matchDist = maxEditDistance + 1;

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

@@ -6,6 +6,8 @@
 
 
 (function() {
+    let rawSearchIndex;
+    let docSearch;
     const longItemTypes = [
         "keyword",
         "primitive type",
@@ -143,7 +145,7 @@
 
             for (const item of array) {
                 const name = item.name;
-                const type = itemTypes[item.ty];
+                const type = window.DocSearch.getItemType(item.ty);
                 const longType = longItemTypes[item.ty];
                 const typeName = longType.length !== 0 ? `${longType}` : "?";
 
@@ -247,7 +249,7 @@ ${item.displayPath}<span class="${type}">${name}</span>\
             return;
         }
         if (results.query === undefined) {
-            results.query = DocSearch.parseQuery(searchState.input.value);
+            results.query = window.DocSearch.parseQuery(searchState.input.value);
         }
 
         currentResults = results.query.userQuery;
@@ -378,7 +380,7 @@ ${item.displayPath}<span class="${type}">${name}</span>\
      * @param {boolean} [forced]
      */
     async function search(forced) {
-        const query = DocSearch.parseQuery(searchState.input.value.trim());
+        const query = window.DocSearch.parseQuery(searchState.input.value.trim());
         let filterCrates = getFilterCrates();
 
         if (!forced && query.userQuery === currentResults) {
@@ -595,8 +597,9 @@ ${item.displayPath}<span class="${type}">${name}</span>\
     }
 
     function initSearch(rawSearchIndex) {
+        rawSearchIndex = rawSearchIndex;
         if (typeof window !== "undefined") {
-            window.docSearch = new window.DocSearch(rawSearchIndex);
+            docSearch = new window.DocSearch(rawSearchIndex);
         } else if (typeof exports !== "undefined") {
             exports.docSearch = new exports.DocSearch(rawSearchIndex);
         }