feat: allow optional trait bounds in type arguments

Author: amaanq

grammar.js

@@ -729,7 +729,7 @@ module.exports = grammar({
       field('alias', $._type),
     ),
 
-    lifetime: $ => seq('\'', $.identifier),
+    lifetime: $ => prec(1, seq('\'', $.identifier)),
 
     array_type: $ => seq(
       '[',
@@ -812,12 +812,15 @@ module.exports = grammar({
 
     type_arguments: $ => seq(
       token(prec(1, '<')),
-      sepBy1(',', choice(
-        $._type,
-        $.type_binding,
-        $.lifetime,
-        $._literal,
-        $.block,
+      sepBy1(',', seq(
+        choice(
+          $._type,
+          $.type_binding,
+          $.lifetime,
+          $._literal,
+          $.block,
+        ),
+        optional($.trait_bounds),
       )),
       optional(','),
       '>',

test/corpus/declarations.txt

@@ -1667,6 +1667,30 @@ fn univariant(this: &impl ?Sized, that: &(impl LayoutCalculator + ?Sized)) {}
                 (type_identifier)))))))
     (block)))
 
+================================================================================
+Trait bounds in type in trait
+================================================================================
+
+impl<T: AstDeref<Target: HasNodeId>> HasNodeId for T {}
+
+--------------------------------------------------------------------------------
+
+(source_file
+  (impl_item
+    (type_parameters
+      (constrained_type_parameter
+        (type_identifier)
+        (trait_bounds
+          (generic_type
+            (type_identifier)
+            (type_arguments
+              (type_identifier)
+              (trait_bounds
+                (type_identifier)))))))
+    (type_identifier)
+    (type_identifier)
+    (declaration_list)))
+
 ================================================================================
 Macro invocations inside trait declarations
 ================================================================================