* Greatly improve the rustdoc search parser source code

* Move all functions outside parseQuery

13 files changed, 56 insertions, 106 deletions

diff --git a/src/test/rustdoc-gui/search-result-color.goml b/src/test/rustdoc-gui/search-result-color.goml
index 828c20860a6..901634fe0e6 100644
--- a/src/test/rustdoc-gui/search-result-color.goml
+++ b/src/test/rustdoc-gui/search-result-color.goml
@@ -1,5 +1,5 @@
 // The goal of this test is to ensure the color of the text is the one expected.
-goto: file://|DOC_PATH|/test_docs/index.html?search=cook
+goto: file://|DOC_PATH|/test_docs/index.html?search=coo
 
 // This is needed so that the text color is computed.
 show-text: true
diff --git a/src/test/rustdoc-js-std/parser-errors.js b/src/test/rustdoc-js-std/parser-errors.js
index c5d106120ad..887ac38f417 100644
--- a/src/test/rustdoc-js-std/parser-errors.js
+++ b/src/test/rustdoc-js-std/parser-errors.js
@@ -3,66 +3,51 @@ const QUERY = ['<"P">', '"P" "P"', 'P "P"', '"p" p', '"const": p'];
 const PARSED = [
     {
         args: [],
-        elemName: null,
         elems: [],
         foundElems: 0,
-        id: "<\"P\">",
-        nameSplit: null,
         original: "<\"P\">",
         returned: [],
-        typeFilter: null,
+        typeFilter: -1,
         userQuery: "<\"p\">",
         error: "`\"` cannot be used in generics",
     },
     {
         args: [],
-        elemName: null,
         elems: [],
         foundElems: 0,
-        id: "\"P\" \"P\"",
-        nameSplit: null,
         original: "\"P\" \"P\"",
         returned: [],
-        typeFilter: null,
+        typeFilter: -1,
         userQuery: "\"p\" \"p\"",
         error: "Cannot have more than one literal search element",
     },
     {
         args: [],
-        elemName: null,
         elems: [],
         foundElems: 0,
-        id: "P \"P\"",
-        nameSplit: null,
         original: "P \"P\"",
         returned: [],
-        typeFilter: null,
+        typeFilter: -1,
         userQuery: "p \"p\"",
         error: "Cannot use literal search when there is more than one element",
     },
     {
         args: [],
-        elemName: null,
         elems: [],
         foundElems: 0,
-        id: "\"p\" p",
-        nameSplit: null,
         original: "\"p\" p",
         returned: [],
-        typeFilter: null,
+        typeFilter: -1,
         userQuery: "\"p\" p",
         error: "You cannot have more than one element if you use quotes",
     },
     {
         args: [],
-        elemName: null,
         elems: [],
         foundElems: 0,
-        id: "\"const\": p",
-        nameSplit: null,
         original: "\"const\": p",
         returned: [],
-        typeFilter: null,
+        typeFilter: -1,
         userQuery: "\"const\": p",
         error: "You cannot use quotes on type filter",
     },
diff --git a/src/test/rustdoc-js-std/parser-filter.js b/src/test/rustdoc-js-std/parser-filter.js
index 60eb8aa92b2..49fa66b5bb3 100644
--- a/src/test/rustdoc-js-std/parser-filter.js
+++ b/src/test/rustdoc-js-std/parser-filter.js
@@ -3,7 +3,6 @@ const QUERY = ['fn:foo', 'enum : foo', 'macro<f>:foo'];
 const PARSED = [
     {
         args: [],
-        elemName: null,
         elems: [{
             name: "foo",
             fullPath: ["foo"],
@@ -12,8 +11,6 @@ const PARSED = [
             generics: [],
         }],
         foundElems: 1,
-        id: "fn:foo",
-        nameSplit: null,
         original: "fn:foo",
         returned: [],
         typeFilter: 5,
@@ -22,7 +19,6 @@ const PARSED = [
     },
     {
         args: [],
-        elemName: null,
         elems: [{
             name: "foo",
             fullPath: ["foo"],
@@ -31,8 +27,6 @@ const PARSED = [
             generics: [],
         }],
         foundElems: 1,
-        id: "enum : foo",
-        nameSplit: null,
         original: "enum : foo",
         returned: [],
         typeFilter: 4,
@@ -41,7 +35,6 @@ const PARSED = [
     },
     {
         args: [],
-        elemName: null,
         elems: [{
             name: "foo",
             fullPath: ["foo"],
@@ -50,8 +43,6 @@ const PARSED = [
             generics: [],
         }],
         foundElems: 1,
-        id: "macro<f>:foo",
-        nameSplit: null,
         original: "macro<f>:foo",
         returned: [],
         typeFilter: 14,
diff --git a/src/test/rustdoc-js-std/parser-generics.js b/src/test/rustdoc-js-std/parser-generics.js
index d21adf767de..34d33ed4d67 100644
--- a/src/test/rustdoc-js-std/parser-generics.js
+++ b/src/test/rustdoc-js-std/parser-generics.js
@@ -1,9 +1,8 @@
-const QUERY = ['<P>', 'A<B<C<D>, E>'];
+const QUERY = ['<P>', 'A<B<C<D>, E>', 'p<> u8'];
 
 const PARSED = [
     {
         args: [],
-        elemName: null,
         elems: [{
             name: "",
             fullPath: [""],
@@ -20,8 +19,6 @@ const PARSED = [
             ],
         }],
         foundElems: 1,
-        id: "<P>",
-        nameSplit: null,
         original: "<P>",
         returned: [],
         typeFilter: -1,
@@ -30,7 +27,6 @@ const PARSED = [
     },
     {
         args: [],
-        elemName: null,
         elems: [{
             name: "a",
             fullPath: ["a"],
@@ -70,12 +66,35 @@ const PARSED = [
             ],
         }],
         foundElems: 1,
-        id: 'A<B<C<D>, E>',
-        nameSplit: null,
         original: 'A<B<C<D>, E>',
         returned: [],
         typeFilter: -1,
         userQuery: 'a<b<c<d>, e>',
         error: null,
-    }
+    },
+    {
+        args: [],
+        elems: [
+            {
+                name: "p",
+                fullPath: ["p"],
+                pathWithoutLast: [],
+                pathLast: "p",
+                generics: [],
+            },
+            {
+                name: "u8",
+                fullPath: ["u8"],
+                pathWithoutLast: [],
+                pathLast: "u8",
+                generics: [],
+            },
+        ],
+        foundElems: 2,
+        original: "p<> u8",
+        returned: [],
+        typeFilter: -1,
+        userQuery: "p<> u8",
+        error: null,
+    },
 ];
diff --git a/src/test/rustdoc-js-std/parser-in_args.js b/src/test/rustdoc-js-std/parser-in_args.js
index 88761771d9d..e74e423ceed 100644
--- a/src/test/rustdoc-js-std/parser-in_args.js
+++ b/src/test/rustdoc-js-std/parser-in_args.js
@@ -9,11 +9,8 @@ const PARSED = [
             pathLast: "whatever",
             generics: [],
         }],
-        elemName: null,
         elems: [],
         foundElems: 1,
-        id: "(whatever)",
-        nameSplit: null,
         original: "(whatever)",
         returned: [],
         typeFilter: -1,
@@ -36,11 +33,8 @@ const PARSED = [
                 },
             ],
         }],
-        elemName: null,
         elems: [],
         foundElems: 1,
-        id: "(<P>)",
-        nameSplit: null,
         original: "(<P>)",
         returned: [],
         typeFilter: -1,
diff --git a/src/test/rustdoc-js-std/parser-invalid.js b/src/test/rustdoc-js-std/parser-invalid.js
index b5d96e9f507..5e7be3c73b0 100644
--- a/src/test/rustdoc-js-std/parser-invalid.js
+++ b/src/test/rustdoc-js-std/parser-invalid.js
@@ -6,11 +6,8 @@ const QUERY = ['-> <P> (p2)', '(p -> p2', 'a b', 'a,b(c)'];
 const PARSED = [
     {
         args: [],
-        elemName: null,
         elems: [],
         foundElems: 2,
-        id: "-> <P> (p2)",
-        nameSplit: null,
         original: "-> <P> (p2)",
         returned: [
             {
@@ -57,11 +54,8 @@ const PARSED = [
                 generics: [],
             },
         ],
-        elemName: null,
         elems: [],
         foundElems: 2,
-        id: "(p -> p2",
-        nameSplit: null,
         original: "(p -> p2",
         returned: [],
         typeFilter: -1,
@@ -70,7 +64,6 @@ const PARSED = [
     },
     {
         args: [],
-        elemName: null,
         elems: [
             {
                 name: "a b",
@@ -81,8 +74,6 @@ const PARSED = [
             },
         ],
         foundElems: 1,
-        id: "a b",
-        nameSplit: null,
         original: "a b",
         returned: [],
         typeFilter: -1,
@@ -99,7 +90,6 @@ const PARSED = [
                 generics: [],
             },
         ],
-        elemName: null,
         elems: [
             {
                 name: "a",
@@ -117,8 +107,6 @@ const PARSED = [
             },
         ],
         foundElems: 3,
-        id: "a,b(c)",
-        nameSplit: null,
         original: "a,b(c)",
         returned: [],
         typeFilter: -1,
diff --git a/src/test/rustdoc-js-std/parser-literal.js b/src/test/rustdoc-js-std/parser-literal.js
index f1713fbaf88..f8c73672922 100644
--- a/src/test/rustdoc-js-std/parser-literal.js
+++ b/src/test/rustdoc-js-std/parser-literal.js
@@ -3,7 +3,6 @@ const QUERY = ['R<P>'];
 const PARSED = [
     {
         args: [],
-        elemName: null,
         elems: [{
             name: "r",
             fullPath: ["r"],
@@ -20,8 +19,6 @@ const PARSED = [
             ],
         }],
         foundElems: 1,
-        id: "R<P>",
-        nameSplit: null,
         original: "R<P>",
         returned: [],
         typeFilter: -1,
diff --git a/src/test/rustdoc-js-std/parser-paths.js b/src/test/rustdoc-js-std/parser-paths.js
index 980a396ba7f..1bd3bb61dc9 100644
--- a/src/test/rustdoc-js-std/parser-paths.js
+++ b/src/test/rustdoc-js-std/parser-paths.js
@@ -3,7 +3,6 @@ const QUERY = ['A::B', '::A::B', 'A::B::,C',  'A::B::<f>,C'];
 const PARSED = [
     {
         args: [],
-        elemName: null,
         elems: [{
             name: "a::b",
             fullPath: ["a", "b"],
@@ -12,8 +11,6 @@ const PARSED = [
             generics: [],
         }],
         foundElems: 1,
-        id: "A::B",
-        nameSplit: null,
         original: "A::B",
         returned: [],
         typeFilter: -1,
@@ -22,7 +19,6 @@ const PARSED = [
     },
     {
         args: [],
-        elemName: null,
         elems: [{
             name: "::a::b",
             fullPath: ["a", "b"],
@@ -31,8 +27,6 @@ const PARSED = [
             generics: [],
         }],
         foundElems: 1,
-        id: '::A::B',
-        nameSplit: null,
         original: '::A::B',
         returned: [],
         typeFilter: -1,
@@ -41,7 +35,6 @@ const PARSED = [
     },
     {
         args: [],
-        elemName: null,
         elems: [
             {
                 name: "a::b::",
@@ -59,8 +52,6 @@ const PARSED = [
             },
         ],
         foundElems: 2,
-        id: 'A::B::,C',
-        nameSplit: null,
         original: 'A::B::,C',
         returned: [],
         typeFilter: -1,
@@ -69,7 +60,6 @@ const PARSED = [
     },
     {
         args: [],
-        elemName: null,
         elems: [
             {
                 name: "a::b::",
@@ -95,8 +85,6 @@ const PARSED = [
             },
         ],
         foundElems: 2,
-        id: 'A::B::<f>,C',
-        nameSplit: null,
         original: 'A::B::<f>,C',
         returned: [],
         typeFilter: -1,
diff --git a/src/test/rustdoc-js-std/parser-quote.js b/src/test/rustdoc-js-std/parser-quote.js
index 1c59a3d50ee..07af9249172 100644
--- a/src/test/rustdoc-js-std/parser-quote.js
+++ b/src/test/rustdoc-js-std/parser-quote.js
@@ -3,11 +3,8 @@ const QUERY = ['-> "p"', '("p")'];
 const PARSED = [
     {
         args: [],
-        elemName: null,
         elems: [],
         foundElems: 1,
-        id: "-> \"p\"",
-        nameSplit: null,
         original: "-> \"p\"",
         returned: [{
             name: "p",
@@ -28,11 +25,8 @@ const PARSED = [
             pathLast: "p",
             generics: [],
         }],
-        elemName: null,
         elems: [],
         foundElems: 1,
-        id: "(\"p\")",
-        nameSplit: null,
         original: "(\"p\")",
         returned: [],
         typeFilter: -1,
diff --git a/src/test/rustdoc-js-std/parser-returned.js b/src/test/rustdoc-js-std/parser-returned.js
index ceecda67050..face0a7461d 100644
--- a/src/test/rustdoc-js-std/parser-returned.js
+++ b/src/test/rustdoc-js-std/parser-returned.js
@@ -3,11 +3,8 @@ const QUERY = ['-> <P>', '-> P'];
 const PARSED = [
     {
         args: [],
-        elemName: null,
         elems: [],
         foundElems: 1,
-        id: "-> <P>",
-        nameSplit: null,
         original: "-> <P>",
         returned: [{
             name: "",
@@ -30,11 +27,8 @@ const PARSED = [
     },
     {
         args: [],
-        elemName: null,
         elems: [],
         foundElems: 1,
-        id: "-> P",
-        nameSplit: null,
         original: "-> P",
         returned: [{
             name: "p",
diff --git a/src/test/rustdoc-js-std/vec-new.js b/src/test/rustdoc-js-std/vec-new.js
index e1a3256876b..cd0e8e7b4a9 100644
--- a/src/test/rustdoc-js-std/vec-new.js
+++ b/src/test/rustdoc-js-std/vec-new.js
@@ -4,6 +4,6 @@ const EXPECTED = {
     'others': [
         { 'path': 'std::vec::Vec', 'name': 'new' },
         { 'path': 'std::vec::Vec', 'name': 'ne' },
-        { 'path': 'std::rc::Rc', 'name': 'ne' },
+        { 'path': 'alloc::vec::Vec', 'name': 'ne' },
     ],
 };
diff --git a/src/test/rustdoc-js/doc-alias-whitespace.js b/src/test/rustdoc-js/doc-alias-whitespace.js
index 3ee55fe455d..c9fc0c4311f 100644
--- a/src/test/rustdoc-js/doc-alias-whitespace.js
+++ b/src/test/rustdoc-js/doc-alias-whitespace.js
@@ -10,7 +10,7 @@ const EXPECTED = [
             {
                 'path': 'doc_alias_whitespace',
                 'name': 'Struct',
-                'alias': 'demon lord',
+                'alias': 'Demon Lord',
                 'href': '../doc_alias_whitespace/struct.Struct.html',
                 'is_alias': true
             },
diff --git a/src/test/rustdoc-js/doc-alias.js b/src/test/rustdoc-js/doc-alias.js
index f450bf97981..7bb0cbe388f 100644
--- a/src/test/rustdoc-js/doc-alias.js
+++ b/src/test/rustdoc-js/doc-alias.js
@@ -32,7 +32,7 @@ const EXPECTED = [
             {
                 'path': 'doc_alias',
                 'name': 'Struct',
-                'alias': 'structitem',
+                'alias': 'StructItem',
                 'href': '../doc_alias/struct.Struct.html',
                 'is_alias': true
             },
@@ -44,7 +44,7 @@ const EXPECTED = [
             {
                 'path': 'doc_alias::Struct',
                 'name': 'field',
-                'alias': 'structfielditem',
+                'alias': 'StructFieldItem',
                 'href': '../doc_alias/struct.Struct.html#structfield.field',
                 'is_alias': true
             },
@@ -56,7 +56,7 @@ const EXPECTED = [
             {
                 'path': 'doc_alias::Struct',
                 'name': 'method',
-                'alias': 'structmethoditem',
+                'alias': 'StructMethodItem',
                 'href': '../doc_alias/struct.Struct.html#method.method',
                 'is_alias': true
             },
@@ -72,7 +72,7 @@ const EXPECTED = [
             {
                 'path': 'doc_alias::Struct',
                 'name': 'ImplConstItem',
-                'alias': 'structimplconstitem',
+                'alias': 'StructImplConstItem',
                 'href': '../doc_alias/struct.Struct.html#associatedconstant.ImplConstItem',
                 'is_alias': true
             },
@@ -84,7 +84,7 @@ const EXPECTED = [
             {
                 'path': 'doc_alias::Struct',
                 'name': 'function',
-                'alias': 'impltraitfunction',
+                'alias': 'ImplTraitFunction',
                 'href': '../doc_alias/struct.Struct.html#method.function',
                 'is_alias': true
             },
@@ -96,7 +96,7 @@ const EXPECTED = [
             {
                 'path': 'doc_alias',
                 'name': 'Enum',
-                'alias': 'enumitem',
+                'alias': 'EnumItem',
                 'href': '../doc_alias/enum.Enum.html',
                 'is_alias': true
             },
@@ -108,7 +108,7 @@ const EXPECTED = [
             {
                 'path': 'doc_alias::Enum',
                 'name': 'Variant',
-                'alias': 'variantitem',
+                'alias': 'VariantItem',
                 'href': '../doc_alias/enum.Enum.html#variant.Variant',
                 'is_alias': true
             },
@@ -120,7 +120,7 @@ const EXPECTED = [
             {
                 'path': 'doc_alias::Enum',
                 'name': 'method',
-                'alias': 'enummethoditem',
+                'alias': 'EnumMethodItem',
                 'href': '../doc_alias/enum.Enum.html#method.method',
                 'is_alias': true
             },
@@ -132,7 +132,7 @@ const EXPECTED = [
             {
                 'path': 'doc_alias',
                 'name': 'Typedef',
-                'alias': 'typedefitem',
+                'alias': 'TypedefItem',
                 'href': '../doc_alias/type.Typedef.html',
                 'is_alias': true
             },
@@ -144,7 +144,7 @@ const EXPECTED = [
             {
                 'path': 'doc_alias',
                 'name': 'Trait',
-                'alias': 'traititem',
+                'alias': 'TraitItem',
                 'href': '../doc_alias/trait.Trait.html',
                 'is_alias': true
             },
@@ -156,7 +156,7 @@ const EXPECTED = [
             {
                 'path': 'doc_alias::Trait',
                 'name': 'Target',
-                'alias': 'traittypeitem',
+                'alias': 'TraitTypeItem',
                 'href': '../doc_alias/trait.Trait.html#associatedtype.Target',
                 'is_alias': true
             },
@@ -168,7 +168,7 @@ const EXPECTED = [
             {
                 'path': 'doc_alias::Trait',
                 'name': 'AssociatedConst',
-                'alias': 'associatedconstitem',
+                'alias': 'AssociatedConstItem',
                 'href': '../doc_alias/trait.Trait.html#associatedconstant.AssociatedConst',
                 'is_alias': true
             },
@@ -180,7 +180,7 @@ const EXPECTED = [
             {
                 'path': 'doc_alias::Trait',
                 'name': 'function',
-                'alias': 'traitfunctionitem',
+                'alias': 'TraitFunctionItem',
                 'href': '../doc_alias/trait.Trait.html#tymethod.function',
                 'is_alias': true
             },
@@ -192,7 +192,7 @@ const EXPECTED = [
             {
                 'path': 'doc_alias',
                 'name': 'function',
-                'alias': 'functionitem',
+                'alias': 'FunctionItem',
                 'href': '../doc_alias/fn.function.html',
                 'is_alias': true
             },
@@ -204,7 +204,7 @@ const EXPECTED = [
             {
                 'path': 'doc_alias',
                 'name': 'Module',
-                'alias': 'moduleitem',
+                'alias': 'ModuleItem',
                 'href': '../doc_alias/Module/index.html',
                 'is_alias': true
             },
@@ -216,7 +216,7 @@ const EXPECTED = [
             {
                 'path': 'doc_alias',
                 'name': 'Const',
-                'alias': 'constitem',
+                'alias': 'ConstItem',
                 'href': '../doc_alias/constant.Const.html',
                 'is_alias': true
             },
@@ -232,7 +232,7 @@ const EXPECTED = [
             {
                 'path': 'doc_alias',
                 'name': 'Static',
-                'alias': 'staticitem',
+                'alias': 'StaticItem',
                 'href': '../doc_alias/static.Static.html',
                 'is_alias': true
             },
@@ -244,7 +244,7 @@ const EXPECTED = [
             {
                 'path': 'doc_alias',
                 'name': 'Union',
-                'alias': 'unionitem',
+                'alias': 'UnionItem',
                 'href': '../doc_alias/union.Union.html',
                 'is_alias': true
             },
@@ -262,7 +262,7 @@ const EXPECTED = [
             {
                 'path': 'doc_alias::Union',
                 'name': 'union_item',
-                'alias': 'unionfielditem',
+                'alias': 'UnionFieldItem',
                 'href': '../doc_alias/union.Union.html#structfield.union_item',
                 'is_alias': true
             },
@@ -274,7 +274,7 @@ const EXPECTED = [
             {
                 'path': 'doc_alias::Union',
                 'name': 'method',
-                'alias': 'unionmethoditem',
+                'alias': 'UnionMethodItem',
                 'href': '../doc_alias/union.Union.html#method.method',
                 'is_alias': true
             },
@@ -286,7 +286,7 @@ const EXPECTED = [
             {
                 'path': 'doc_alias',
                 'name': 'Macro',
-                'alias': 'macroitem',
+                'alias': 'MacroItem',
                 'href': '../doc_alias/macro.Macro.html',
                 'is_alias': true
             },