Add use bounds

Author: ehuss

Rust/Rust.sublime-syntax

@@ -564,7 +564,6 @@ contexts:
   types:
     # matches stray identifiers as a types because a type is expected
     - include: comments
-    - include: impl-types
     - include: return-type
     - match: '&'
       scope: keyword.operator.rust
@@ -590,6 +589,7 @@ contexts:
         - include: pattern-param
     - include: dyn-types
     - include: lifetime
+    - include: impl-trait
     - match: (?={{identifier}}::)
       push: type-path
     - match: (?=::)
@@ -710,15 +710,6 @@ contexts:
     - match: '\b(?:r#)?_*{{type_identifier}}'
       scope: storage.type.rust
 
-  impl-types:
-    - match: '\bimpl\b'
-      scope: storage.type.impl.rust
-      push:
-        - include: comments
-        - include: impl-generic
-        - match: '(?=\S)'
-          pop: true
-
   dyn-types:
     - match: '\bdyn\b(?=\s*(?:\(|{{lifetime}}|{{identifier}}))'
       scope: storage.type.trait.rust
@@ -803,6 +794,31 @@ contexts:
     - match: '[-+%/*]'
       scope: keyword.operator.arithmetic.rust
 
+  impl-trait:
+    - match: '\bimpl\b'
+      scope: storage.type.impl.rust
+      push:
+        - match: '\buse\b'
+          scope: keyword.other.rust
+          push:
+            - match: '<'
+              scope: punctuation.definition.generic.begin.rust
+              set:
+                - match: '>'
+                  scope: punctuation.definition.generic.end.rust
+                  pop: true
+                - include: lifetime
+                - match: ','
+                  scope: punctuation.separator.rust
+                - match: \b(Self)\b
+                  scope: keyword.other.rust
+                - match: '{{identifier}}'
+                - match: '(?=\S)'
+                  pop: true
+        - include: types
+        - match: '(?=\S)'
+          pop: true
+
   ##[ STRUCTS ]###############################################################
 
   struct-identifier:

Rust/tests/syntax_test_generics.rs

@@ -464,19 +464,21 @@ fn impl_trait_return_use_bound<'a>() -> impl for<'b> Trait1<Item = impl Trait2<'
 //                                                                             ^^ storage.modifier.lifetime
 //                                                                               ^ punctuation.definition.generic.end
 //                                                                                 ^ keyword.operator
-//                                                                                      ^^^^ meta.generic meta.generic
+//                                                                                   ^^^ keyword.other
+//                                                                                      ^^^^ meta.generic
 //                                                                                      ^ punctuation.definition.generic.begin
 //                                                                                       ^^ storage.modifier.lifetime
 //                                                                                         ^ punctuation.definition.generic.end
 //                                                                                          ^ punctuation.definition.generic.end
 
 fn impl_trait_use<'a, foo>() -> impl Trait1 + use<'a, Self, foo> {}
 //                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function meta.function.return-type
-//                                               ^^^^^^^^^^^^^^^ meta.generic
+//                                          ^ keyword.operator
+//                                            ^^^ keyword.other
 //                                               ^ punctuation.definition.generic.begin
 //                                                ^^ storage.modifier.lifetime
 //                                                  ^ punctuation.separator
-//                                                    ^^^^ storage.type
+//                                                    ^^^^ keyword.other
 //                                                        ^ punctuation.separator
 //                                                             ^ punctuation.definition.generic.end