Replace "bang macro" mentions with "decl macro"

Add more typescript type annotations
Improve functions naming

Author: GuillaumeGomez

src/librustdoc/clean/types.rs

@@ -768,7 +768,7 @@ impl Item {
     }
 
     /// Returns true if this a macro declared with the `macro` keyword or with `macro_rules!.
-    pub(crate) fn is_bang_macro_or_macro_rules(&self) -> bool {
+    pub(crate) fn is_decl_macro(&self) -> bool {
         matches!(self.kind, ItemKind::MacroItem(..))
     }
 

src/librustdoc/html/render/context.rs

@@ -351,7 +351,7 @@ impl<'tcx> Context<'tcx> {
                 Some(s) => s,
             };
 
-            let is_macro_rules = item.is_bang_macro_or_macro_rules();
+            let is_macro_rules = item.is_decl_macro();
             for type_ in item.types() {
                 if inserted.entry(type_).or_default().insert(name) {
                     let type_ = type_.to_string();

src/librustdoc/html/render/print_item.rs

@@ -129,9 +129,8 @@ pub(super) fn print_item(cx: &Context<'_>, item: &clean::Item) -> impl fmt::Disp
         let item_vars = ItemVars {
             typ,
             name: item.name.as_ref().unwrap().as_str(),
-            // It's fine to use `type_` here because, even if it's a bang macro with multiple kinds,
-            // since we're generating its documentation page, we can default to the "parent" type,
-            // ie "macro".
+            // It's fine to use `type_` here because, even if it's a decl macro with multiple kinds,
+            // since we're generating its documentation page, we can default to the macro type.
             item_type: &item.type_().to_string(),
             path_components,
             stability_since_raw: &stability_since_raw,
@@ -231,7 +230,7 @@ fn item_module(cx: &Context<'_>, item: &clean::Item, items: &[clean::Item]) -> i
             FxIndexMap::default();
 
         for (index, item) in items.iter().filter(|i| !i.is_stripped()).enumerate() {
-            // To prevent having new "bang macro attribute/derive" sections in the module,
+            // To prevent having new "decl macro attribute/derive" sections in the module,
             // we cheat by turning them into their "proc-macro equivalent".
             for type_ in item.types() {
                 let type_ = match type_ {

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

@@ -732,12 +732,7 @@ function preLoadCss(cssUrl) {
             ul.className = "block " + shortty;
 
             for (const item of filtered) {
-                let name = item;
-                let isMacro = false;
-                if (Array.isArray(item)) {
-                    name = item[0];
-                    isMacro = true;
-                }
+                const [name, isMacro] = Array.isArray(item) ? [item[0], true] : [item, false];
                 let path;
                 if (shortty === "mod") {
                     path = `${modpath}${name}/index.html`;

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

@@ -27,7 +27,7 @@ declare global {
         /** Make the current theme easy to find */
         currentTheme: HTMLLinkElement|null;
         /** Generated in `render/context.rs` */
-        SIDEBAR_ITEMS?: { [key: string]: string[] };
+        SIDEBAR_ITEMS?: { [key: string]: Array<string | string[]> };
         /** Notable trait data */
         NOTABLE_TRAITS?: { [key: string]: string };
         CURRENT_TOOLTIP_ELEMENT?: HTMLElement & { TOOLTIP_BASE: HTMLElement };

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

@@ -1661,8 +1661,8 @@ class DocSearch {
             forceMacroHref: false,
         };
         if (item.ty === 28 || item.ty === 29) {
-            // "proc attribute" is 23, "proc derive" is 24 whereas "bang macro attribute" is 28 and
-            // "bang macro derive" is 29, so 5 of difference to go from the latter to the former.
+            // "proc attribute" is 23, "proc derive" is 24 whereas "decl macro attribute" is 28 and
+            // "decl macro derive" is 29, so 5 of difference to go from the latter to the former.
             item.ty -= 5;
             item.forceMacroHref = true;
         }