Simplify parser syntax

9 files changed, 10 insertions, 163 deletions

diff --git a/src/test/rustdoc-js-std/parser-errors.js b/src/test/rustdoc-js-std/parser-errors.js
index 369b8c89a66..7d00b7fed59 100644
--- a/src/test/rustdoc-js-std/parser-errors.js
+++ b/src/test/rustdoc-js-std/parser-errors.js
@@ -19,7 +19,6 @@ const QUERY = [
 
 const PARSED = [
     {
-        args: [],
         elems: [],
         foundElems: 0,
         original: "<\"P\">",
@@ -29,7 +28,6 @@ const PARSED = [
         error: "`\"` cannot be used in generics",
     },
     {
-        args: [],
         elems: [],
         foundElems: 0,
         original: "\"P\" \"P\"",
@@ -39,7 +37,6 @@ const PARSED = [
         error: "Cannot have more than one literal search element",
     },
     {
-        args: [],
         elems: [],
         foundElems: 0,
         original: "P \"P\"",
@@ -49,7 +46,6 @@ const PARSED = [
         error: "Cannot use literal search when there is more than one element",
     },
     {
-        args: [],
         elems: [],
         foundElems: 0,
         original: "\"p\" p",
@@ -59,7 +55,6 @@ const PARSED = [
         error: "You cannot have more than one element if you use quotes",
     },
     {
-        args: [],
         elems: [],
         foundElems: 0,
         original: "\"const\": p",
@@ -69,7 +64,6 @@ const PARSED = [
         error: "You cannot use quotes on type filter",
     },
     {
-        args: [],
         elems: [],
         foundElems: 0,
         original: "<:a>",
@@ -79,7 +73,6 @@ const PARSED = [
         error: "Unexpected `:` after `<`",
     },
     {
-        args: [],
         elems: [],
         foundElems: 0,
         original: "<::a>",
@@ -89,17 +82,15 @@ const PARSED = [
         error: "Unexpected `::`: paths cannot start with `::`",
     },
     {
-        args: [],
         elems: [],
         foundElems: 0,
         original: "((a))",
         returned: [],
         typeFilter: -1,
         userQuery: "((a))",
-        error: "Unexpected `(` after `(`",
+        error: "Unexpected `(`",
     },
     {
-        args: [],
         elems: [],
         foundElems: 0,
         original: "->,a",
@@ -109,17 +100,15 @@ const PARSED = [
         error: "Unexpected `,` after `->`",
     },
     {
-        args: [],
         elems: [],
         foundElems: 0,
         original: "(p -> p",
         returned: [],
         typeFilter: -1,
         userQuery: "(p -> p",
-        error: "Unexpected `-` after `(`",
+        error: "Unexpected `(`",
     },
     {
-        args: [],
         elems: [],
         foundElems: 0,
         original: "::a::b",
@@ -129,7 +118,6 @@ const PARSED = [
         error: "Paths cannot start with `::`",
     },
     {
-        args: [],
         elems: [],
         foundElems: 0,
         original: "a::::b",
@@ -139,7 +127,6 @@ const PARSED = [
         error: "Unexpected `::::`",
     },
     {
-        args: [],
         elems: [],
         foundElems: 0,
         original: "a::b::",
@@ -149,7 +136,6 @@ const PARSED = [
         error: "Paths cannot end with `::`",
     },
     {
-        args: [],
         elems: [],
         foundElems: 0,
         original: ":a",
@@ -159,7 +145,6 @@ const PARSED = [
         error: "Expected type filter before `:`",
     },
     {
-        args: [],
         elems: [],
         foundElems: 0,
         original: "a b:",
@@ -169,17 +154,15 @@ const PARSED = [
         error: "Unexpected `:`",
     },
     {
-        args: [],
         elems: [],
         foundElems: 0,
         original: "a (b:",
         returned: [],
         typeFilter: -1,
         userQuery: "a (b:",
-        error: "Unexpected `:` after `(`",
+        error: "Unexpected `(`",
     },
     {
-        args: [],
         elems: [],
         foundElems: 0,
         original: "{:",
diff --git a/src/test/rustdoc-js-std/parser-filter.js b/src/test/rustdoc-js-std/parser-filter.js
index 2b474849318..e5a87a415ac 100644
--- a/src/test/rustdoc-js-std/parser-filter.js
+++ b/src/test/rustdoc-js-std/parser-filter.js
@@ -2,7 +2,6 @@ const QUERY = ['fn:foo', 'enum : foo', 'macro<f>:foo'];
 
 const PARSED = [
     {
-        args: [],
         elems: [{
             name: "foo",
             fullPath: ["foo"],
@@ -18,7 +17,6 @@ const PARSED = [
         error: null,
     },
     {
-        args: [],
         elems: [{
             name: "foo",
             fullPath: ["foo"],
@@ -34,7 +32,6 @@ const PARSED = [
         error: null,
     },
     {
-        args: [],
         elems: [],
         foundElems: 0,
         original: "macro<f>:foo",
diff --git a/src/test/rustdoc-js-std/parser-generics.js b/src/test/rustdoc-js-std/parser-generics.js
index d0a0a904353..cf8d99ef22a 100644
--- a/src/test/rustdoc-js-std/parser-generics.js
+++ b/src/test/rustdoc-js-std/parser-generics.js
@@ -2,7 +2,6 @@ const QUERY = ['<P>', 'A<B<C<D>,  E>', 'p<> u8'];
 
 const PARSED = [
     {
-        args: [],
         elems: [{
             name: "",
             fullPath: [""],
@@ -26,54 +25,15 @@ const PARSED = [
         error: null,
     },
     {
-        args: [],
-        elems: [{
-            name: "a",
-            fullPath: ["a"],
-            pathWithoutLast: [],
-            pathLast: "a",
-            generics: [
-                {
-                    name: "b",
-                    fullPath: ["b"],
-                    pathWithoutLast: [],
-                    pathLast: "b",
-                    generics: [
-                        {
-                            name: "c",
-                            fullPath: ["c"],
-                            pathWithoutLast: [],
-                            pathLast: "c",
-                            generics: [
-                                {
-                                    name: "d",
-                                    fullPath: ["d"],
-                                    pathWithoutLast: [],
-                                    pathLast: "d",
-                                    generics: [],
-                                },
-                            ],
-                        },
-                        {
-                            name: "e",
-                            fullPath: ["e"],
-                            pathWithoutLast: [],
-                            pathLast: "e",
-                            generics: [],
-                        },
-                    ],
-                },
-            ],
-        }],
-        foundElems: 1,
+        elems: [],
+        foundElems: 0,
         original: 'A<B<C<D>,  E>',
         returned: [],
         typeFilter: -1,
         userQuery: 'a<b<c<d>,  e>',
-        error: null,
+        error: 'Unexpected `<` after `<`',
     },
     {
-        args: [],
         elems: [
             {
                 name: "p",
diff --git a/src/test/rustdoc-js-std/parser-in_args.js b/src/test/rustdoc-js-std/parser-in_args.js
deleted file mode 100644
index e74e423ceed..00000000000
--- a/src/test/rustdoc-js-std/parser-in_args.js
+++ /dev/null
@@ -1,44 +0,0 @@
-const QUERY = ['(whatever)', '(<P>)'];
-
-const PARSED = [
-    {
-        args: [{
-            name: "whatever",
-            fullPath: ["whatever"],
-            pathWithoutLast: [],
-            pathLast: "whatever",
-            generics: [],
-        }],
-        elems: [],
-        foundElems: 1,
-        original: "(whatever)",
-        returned: [],
-        typeFilter: -1,
-        userQuery: "(whatever)",
-        error: null,
-    },
-    {
-        args: [{
-            name: "",
-            fullPath: [""],
-            pathWithoutLast: [],
-            pathLast: "",
-            generics: [
-                {
-                    name: "p",
-                    fullPath: ["p"],
-                    pathWithoutLast: [],
-                    pathLast: "p",
-                    generics: [],
-                },
-            ],
-        }],
-        elems: [],
-        foundElems: 1,
-        original: "(<P>)",
-        returned: [],
-        typeFilter: -1,
-        userQuery: "(<p>)",
-        error: null,
-    },
-];
diff --git a/src/test/rustdoc-js-std/parser-invalid.js b/src/test/rustdoc-js-std/parser-invalid.js
index 024372ef8d5..87ebe21c49b 100644
--- a/src/test/rustdoc-js-std/parser-invalid.js
+++ b/src/test/rustdoc-js-std/parser-invalid.js
@@ -5,7 +5,6 @@ const QUERY = ['a b', 'a   b', 'a,b(c)'];
 
 const PARSED = [
     {
-        args: [],
         elems: [
             {
                 name: "a",
@@ -30,7 +29,6 @@ const PARSED = [
         error: null,
     },
     {
-        args: [],
         elems: [
             {
                 name: "a",
@@ -55,36 +53,12 @@ const PARSED = [
         error: null,
     },
     {
-        args: [
-            {
-                name: "c",
-                fullPath: ["c"],
-                pathWithoutLast: [],
-                pathLast: "c",
-                generics: [],
-            },
-        ],
-        elems: [
-            {
-                name: "a",
-                fullPath: ["a"],
-                pathWithoutLast: [],
-                pathLast: "a",
-                generics: [],
-            },
-            {
-                name: "b",
-                fullPath: ["b"],
-                pathWithoutLast: [],
-                pathLast: "b",
-                generics: [],
-            },
-        ],
-        foundElems: 3,
+        elems: [],
+        foundElems: 0,
         original: "a,b(c)",
         returned: [],
         typeFilter: -1,
         userQuery: "a,b(c)",
-        error: null,
+        error: "Unexpected `(`",
     },
 ];
diff --git a/src/test/rustdoc-js-std/parser-literal.js b/src/test/rustdoc-js-std/parser-literal.js
index f8c73672922..87b3baff1e2 100644
--- a/src/test/rustdoc-js-std/parser-literal.js
+++ b/src/test/rustdoc-js-std/parser-literal.js
@@ -2,7 +2,6 @@ const QUERY = ['R<P>'];
 
 const PARSED = [
     {
-        args: [],
         elems: [{
             name: "r",
             fullPath: ["r"],
diff --git a/src/test/rustdoc-js-std/parser-paths.js b/src/test/rustdoc-js-std/parser-paths.js
index 12b7f922b14..c8c7f21b9bd 100644
--- a/src/test/rustdoc-js-std/parser-paths.js
+++ b/src/test/rustdoc-js-std/parser-paths.js
@@ -2,7 +2,6 @@ const QUERY = ['A::B', 'A::B,C',  'A::B<f>,C'];
 
 const PARSED = [
     {
-        args: [],
         elems: [{
             name: "a::b",
             fullPath: ["a", "b"],
@@ -18,7 +17,6 @@ const PARSED = [
         error: null,
     },
     {
-        args: [],
         elems: [
             {
                 name: "a::b",
@@ -43,7 +41,6 @@ const PARSED = [
         error: null,
     },
     {
-        args: [],
         elems: [
             {
                 name: "a::b",
diff --git a/src/test/rustdoc-js-std/parser-quote.js b/src/test/rustdoc-js-std/parser-quote.js
index 07af9249172..e8b1c9a7719 100644
--- a/src/test/rustdoc-js-std/parser-quote.js
+++ b/src/test/rustdoc-js-std/parser-quote.js
@@ -1,8 +1,7 @@
-const QUERY = ['-> "p"', '("p")'];
+const QUERY = ['-> "p"'];
 
 const PARSED = [
     {
-        args: [],
         elems: [],
         foundElems: 1,
         original: "-> \"p\"",
@@ -17,20 +16,4 @@ const PARSED = [
         userQuery: "-> \"p\"",
         error: null,
     },
-    {
-        args: [{
-            name: "p",
-            fullPath: ["p"],
-            pathWithoutLast: [],
-            pathLast: "p",
-            generics: [],
-        }],
-        elems: [],
-        foundElems: 1,
-        original: "(\"p\")",
-        returned: [],
-        typeFilter: -1,
-        userQuery: "(\"p\")",
-        error: null,
-    },
 ];
diff --git a/src/test/rustdoc-js-std/parser-returned.js b/src/test/rustdoc-js-std/parser-returned.js
index face0a7461d..db64b03c0b3 100644
--- a/src/test/rustdoc-js-std/parser-returned.js
+++ b/src/test/rustdoc-js-std/parser-returned.js
@@ -2,7 +2,6 @@ const QUERY = ['-> <P>', '-> P'];
 
 const PARSED = [
     {
-        args: [],
         elems: [],
         foundElems: 1,
         original: "-> <P>",
@@ -26,7 +25,6 @@ const PARSED = [
         error: null,
     },
     {
-        args: [],
         elems: [],
         foundElems: 1,
         original: "-> P",