diff --git a/Rust/Rust.sublime-syntax b/Rust/Rust.sublime-syntax
index e07eb54eb8..cbb135b1c6 100644
--- a/Rust/Rust.sublime-syntax
+++ b/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:
diff --git a/Rust/tests/syntax_test_generics.rs b/Rust/tests/syntax_test_generics.rs
index 56892b72e6..06b03fb6c1 100644
--- a/Rust/tests/syntax_test_generics.rs
+++ b/Rust/tests/syntax_test_generics.rs
@@ -442,8 +442,96 @@ fn function<const N: u16>() {
 //              ^^^ storage.type.numeric
     let b: Byte<b'a'>;
 //             ^^^^^^ meta.function meta.block meta.generic
-//              ^^^^ string.quoted.single.rust
+//              ^^^^ string.quoted.single
 //              ^ storage.type.string
 //               ^ punctuation.definition.string.begin
 //                 ^ punctuation.definition.string.end
 }
+
+fn impl_trait_return_use_bound<'a>() -> impl for<'b> Trait1<Item = impl Trait2<'a> + use<'a>> {}
+//                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function meta.function.return-type
+//                                   ^^ punctuation.separator
+//                                      ^^^^ storage.type.impl
+//                                           ^^^ keyword.other
+//                                              ^ meta.generic punctuation.definition.generic.begin
+//                                                 ^ meta.generic punctuation.definition.generic.end
+//                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.generic
+//                                                         ^ meta.generic punctuation.definition.generic.begin
+//                                                               ^ meta.generic keyword.operator
+//                                                                 ^^^^ meta.generic storage.type.impl
+//                                                                            ^^^^ meta.generic meta.generic
+//                                                                            ^ punctuation.definition.generic.begin
+//                                                                             ^^ storage.modifier.lifetime
+//                                                                               ^ punctuation.definition.generic.end
+//                                                                                 ^ keyword.operator
+//                                                                                   ^^^ 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
+//                                          ^ keyword.operator
+//                                            ^^^ keyword.other
+//                                               ^ punctuation.definition.generic.begin
+//                                                ^^ storage.modifier.lifetime
+//                                                  ^ punctuation.separator
+//                                                    ^^^^ keyword.other
+//                                                        ^ punctuation.separator
+//                                                             ^ punctuation.definition.generic.end
+
+fn impl_trait_return1<'a, 'b>() -> impl Trait<&'a u8, Ty = impl Sized + 'b> {}
+//                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function meta.function.return-type
+//                              ^^ punctuation.separator
+//                                 ^^^^ storage.type.impl
+//                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  meta.generic
+//                                           ^ punctuation.definition.generic.begin
+//                                            ^ keyword.operator
+//                                             ^^ storage.modifier.lifetime
+//                                                ^^ storage.type
+//                                                  ^ punctuation.separator
+//                                                       ^ keyword.operator
+//                                                         ^^^^ storage.type.impl
+//                                                              ^^^^^ support.type
+//                                                                    ^ keyword.operator
+//                                                                      ^^ storage.modifier.lifetime
+//                                                                        ^ punctuation.definition.generic.end
+fn impl_trait_return2() -> impl Debug + 'a {}
+//                      ^^^^^^^^^^^^^^^^^^ meta.function meta.function.return-type
+//                         ^^^^ storage.type.impl
+//                                    ^ keyword.operator
+//                                      ^^ storage.modifier.lifetime
+
+fn impl_trait_param(x: impl FnOnce(&[u8]) -> &[u8])  {}
+//                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function meta.function.parameters
+//                     ^^^^ storage.type.impl
+//                          ^^^^^^ support.type
+//                                ^ meta.group punctuation.section.group.begin
+//                                 ^ meta.group keyword.operator
+//                                  ^ meta.group punctuation.section.group.begin
+//                                   ^^ meta.group storage.type
+//                                     ^^ meta.group punctuation.section.group.end
+//                                        ^^^^^^^^ meta.function meta.function.parameters meta.function.return-type
+//                                        ^^ punctuation.separator
+//                                           ^ meta.function.parameters keyword.operator
+//                                            ^ meta.function.parameters punctuation.section.group.begin
+//                                             ^^ meta.function.parameters storage.type
+//                                               ^ meta.function.parameters punctuation.section.group.end
+
+
+fn impl_trait_with_plus() -> impl Iterator<Item = hir::GenericParam<'hir>> + Captures<'a> + Captures<'s> {}
+//                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function meta.function.return-type
+//                           ^^^^ storage.type.impl
+//                                ^^^^^^^^ support.type
+//                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.generic
+//                                              ^ keyword.operator
+//                                                                  ^^^^ storage.modifier.lifetime
+//                                                                         ^ keyword.operator
+//                                                                                   ^^^^ meta.generic
+//                                                                                    ^^ storage.modifier.lifetime
+//                                                                                        ^ keyword.operator
+//                                                                                                  ^^^^ meta.generic
+//                                                                                                   ^^ storage.modifier.lifetime
+