main.js: typecheck things related to window.register_type_impls

Author: lolbinarycat

src/librustdoc/html/static/js/main.js

@@ -800,16 +800,14 @@ function preLoadCss(cssUrl) {
      *
      * - After processing all of the impls, it sorts the sidebar items by name.
      *
-     * @param {{[cratename: string]: Array<Array<string|0>>}} imp
+     * @param {rustdoc.TypeImpls} imp
      */
-    // @ts-expect-error
     window.register_type_impls = imp => {
         // @ts-expect-error
         if (!imp || !imp[window.currentCrate]) {
             return;
         }
-        // @ts-expect-error
-        window.pending_type_impls = null;
+        window.pending_type_impls = undefined;
         const idMap = new Map();
 
         let implementations = document.getElementById("implementations-list");
@@ -995,9 +993,7 @@ function preLoadCss(cssUrl) {
             list.replaceChildren(...newChildren);
         }
     };
-    // @ts-expect-error
     if (window.pending_type_impls) {
-        // @ts-expect-error
         window.register_type_impls(window.pending_type_impls);
     }
 

src/librustdoc/html/static/js/rustdoc.d.ts

@@ -48,11 +48,13 @@ declare global {
          * register trait implementors, called by code generated in
          * `write_shared.rs`
          */
-        register_implementors?: function(Implementors): void,
+        register_implementors?: function(rustdoc.Implementors): void,
         /**
          * fallback in case `register_implementors` isn't defined yet.
          */
-        pending_implementors?: Implementors,
+        pending_implementors?: rustdoc.Implementors,
+        register_type_impls?: function(rustdoc.TypeImpls): void,
+        pending_type_impls?: rustdoc.TypeImpls,
     }
     interface HTMLElement {
         /** Used by the popover tooltip code. */
@@ -432,4 +434,8 @@ declare namespace rustdoc {
     type Implementors = {
         [key: string]: Array<[string, number, Array<string>]>
     }
+
+    type TypeImpls = {
+        [cratename: string]: Array<Array<string|0>>
+    }
 }