fix: allow removed_trait_bound in more places

Author: amaanq

grammar.js

@@ -526,7 +526,6 @@ module.exports = grammar({
         $._type,
         $.lifetime,
         $.higher_ranked_trait_bound,
-        $.removed_trait_bound,
       )),
     ),
 
@@ -711,6 +710,7 @@ module.exports = grammar({
       $.never_type,
       $.dynamic_type,
       $.bounded_type,
+      $.removed_trait_bound,
       alias(choice(...primitiveTypes), $.primitive_type),
     ),
 
@@ -851,6 +851,7 @@ module.exports = grammar({
       field('trait', choice(
         $._type_identifier,
         $.scoped_type_identifier,
+        $.removed_trait_bound,
         $.generic_type,
         $.function_type,
       )),

test/corpus/declarations.txt

@@ -269,8 +269,7 @@ fn triples(a: impl B) -> impl Iterator<Item=(usize)> {
 Diverging functions
 ================================================================================
 
-fn aborts() -> ! {
-}
+fn aborts() -> ! {}
 
 --------------------------------------------------------------------------------
 
@@ -1634,6 +1633,8 @@ Unsized types in trait bounds
 trait Foo<T: ?Sized> {
 }
 
+fn univariant(this: &impl ?Sized, that: &(impl LayoutCalculator + ?Sized)) {}
+
 --------------------------------------------------------------------------------
 
 (source_file
@@ -1645,7 +1646,26 @@ trait Foo<T: ?Sized> {
         (trait_bounds
           (removed_trait_bound
             (type_identifier)))))
-    (declaration_list)))
+    (declaration_list))
+  (function_item
+    (identifier)
+    (parameters
+      (parameter
+        (identifier)
+        (reference_type
+          (abstract_type
+            (removed_trait_bound
+              (type_identifier)))))
+      (parameter
+        (identifier)
+        (reference_type
+          (tuple_type
+            (bounded_type
+              (abstract_type
+                (type_identifier))
+              (removed_trait_bound
+                (type_identifier)))))))
+    (block)))
 
 ================================================================================
 Macro invocations inside trait declarations