rustdoc-search: disambiguate generics

This cleans up the Simd page. It should be sufficient, even though it can wind up showing more than necessary, but allows each item to be considered in isolation.
rust-lang · Oct 25, 2023 · a463f43 · a463f43
1 parent 8206a6c
commit a463f43
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/librustdoc/html/static/js/search.js b/src/librustdoc/html/static/js/search.js
@@ -1268,7 +1268,10 @@ function initSearch(rawSearchIndex) {
                         }
                     } else {
                         push(fnType.name, fnType.highlighted);
-                        if (fnType.generics && fnType.generics.some(isTransitivelyHighlighted)) {
+                        if (fnType.generics && fnType.generics.length > 0 &&
+                            (fnType.generics.some(isTransitivelyHighlighted)
+                                || row.implDisambiguator !== null)
+                        ) {
                             pushNotHighlighted("<");
                             formatTypeList(fnType.generics, ", ");
                             pushNotHighlighted(">");

diff --git a/tests/rustdoc-js/search-method-disambiguate.js b/tests/rustdoc-js/search-method-disambiguate.js
@@ -11,7 +11,8 @@ const EXPECTED = [
             {
                 'path': 'search_method_disambiguate::MyTy',
                 'name': 'my_method',
-                'href': '../search_method_disambiguate/struct.MyTy.html#impl-X-for-MyTy%3Cbool%3E/method.my_method'
+                'href': '../search_method_disambiguate/struct.MyTy.html#impl-X-for-MyTy%3Cbool%3E/method.my_method',
+                'displayTypeSignature': '*MyTy*<bool> -> *bool*',
             },
         ],
     },
@@ -21,7 +22,8 @@ const EXPECTED = [
             {
                 'path': 'search_method_disambiguate::MyTy',
                 'name': 'my_method',
-                'href': '../search_method_disambiguate/struct.MyTy.html#impl-X-for-MyTy%3Cu8%3E/method.my_method'
+                'href': '../search_method_disambiguate/struct.MyTy.html#impl-X-for-MyTy%3Cu8%3E/method.my_method',
+                'displayTypeSignature': '*MyTy*<u8> -> *u8*',
             },
         ],
     }