implement type_parameter like const_parameter

instead of having two seperate type_parameter rules:
`constrained_type_parameter` and `optional_type_parameter`, combine them
into one rule with two `optional`s.

Author: m4rch3n1ng

grammar.js

@@ -107,7 +107,6 @@ module.exports = grammar({
     [$.scoped_identifier, $.scoped_type_identifier],
     [$.parameters, $._pattern],
     [$.parameters, $.tuple_struct_pattern],
-    [$.type_parameters, $.for_lifetimes],
     [$.array_expression],
     [$.visibility_modifier],
     [$.visibility_modifier, $.scoped_identifier, $.scoped_type_identifier],
@@ -549,11 +548,9 @@ module.exports = grammar({
       sepBy1(',', seq(
         repeat($.attribute_item),
         choice(
-          $.lifetime,
           $.metavariable,
-          $._type_identifier,
-          $.constrained_type_parameter,
-          $.optional_type_parameter,
+          $.type_parameter,
+          $.lifetime_parameter,
           $.const_parameter,
         ),
       )),
@@ -581,19 +578,21 @@ module.exports = grammar({
       ),
     ),
 
-    constrained_type_parameter: $ => seq(
-      field('left', choice($.lifetime, $._type_identifier)),
-      field('bounds', $.trait_bounds),
-    ),
+    type_parameter: $ => prec(1, seq(
+      field('name', $._type_identifier),
+      optional(field('bounds', $.trait_bounds)),
+      optional(
+        seq(
+          '=',
+          field('default_type', $._type),
+        ),
+      ),
+    )),
 
-    optional_type_parameter: $ => seq(
-      field('name', choice(
-        $._type_identifier,
-        $.constrained_type_parameter,
-      )),
-      '=',
-      field('default_type', $._type),
-    ),
+    lifetime_parameter: $ => prec(1, seq(
+      field('name', $.lifetime),
+      optional(field('bounds', $.trait_bounds)),
+    )),
 
     let_declaration: $ => seq(
       'let',