diff --git a/tests/ui/pin_project/invalid-bounds.stderr b/tests/ui/pin_project/invalid-bounds.stderr
index 084ff47..3589193 100644
--- a/tests/ui/pin_project/invalid-bounds.stderr
+++ b/tests/ui/pin_project/invalid-bounds.stderr
@@ -1,4 +1,4 @@
-error: no rules expected the token `:`
+error: no rules expected `:`
  --> tests/ui/pin_project/invalid-bounds.rs:6:33
   |
 6 |     struct Generics1<T: 'static : Sized> { //~ ERROR no rules expected the token `:`
@@ -10,7 +10,7 @@ note: while trying to match `>`
   |         >)?
   |         ^
 
-error: no rules expected the token `:`
+error: no rules expected `:`
   --> tests/ui/pin_project/invalid-bounds.rs:12:33
    |
 12 |     struct Generics2<T: 'static : ?Sized> { //~ ERROR no rules expected the token `:`
@@ -274,7 +274,7 @@ help: you might have meant to end the type parameters here
    |                     $(: $generics_bound>)?
    |                                        +
 
-error: no rules expected the token `Sized`
+error: no rules expected `Sized`
   --> tests/ui/pin_project/invalid-bounds.rs:36:34
    |
 36 |     struct Generics6<T: ?Sized : Sized> { //~ ERROR no rules expected the token `Sized`
@@ -286,7 +286,7 @@ note: while trying to match meta-variable `$generics_lifetime_bound:lifetime`
    |                 $(: $generics_lifetime_bound:lifetime)?
    |                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: no rules expected the token `:`
+error: no rules expected `:`
   --> tests/ui/pin_project/invalid-bounds.rs:44:20
    |
 44 |         T: 'static : Sized //~ ERROR no rules expected the token `:`
@@ -298,7 +298,7 @@ note: while trying to match `{`
    |         {
    |         ^
 
-error: no rules expected the token `:`
+error: no rules expected `:`
   --> tests/ui/pin_project/invalid-bounds.rs:53:20
    |
 53 |         T: 'static : ?Sized //~ ERROR no rules expected the token `:`
@@ -517,7 +517,7 @@ error: expected `{` after struct name, found `:`
    |
    = note: this error originates in the macro `$crate::__pin_project_parse_generics` which comes from the expansion of the macro `pin_project` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: no rules expected the token `Sized`
+error: no rules expected `Sized`
   --> tests/ui/pin_project/invalid-bounds.rs:89:21
    |
 89 |         T: ?Sized : Sized //~ ERROR no rules expected the token `Sized`
diff --git a/tests/ui/pin_project/invalid.stderr b/tests/ui/pin_project/invalid.stderr
index 3dfc90c..8cd85c8 100644
--- a/tests/ui/pin_project/invalid.stderr
+++ b/tests/ui/pin_project/invalid.stderr
@@ -1,4 +1,4 @@
-error: no rules expected the token `(`
+error: no rules expected `(`
  --> tests/ui/pin_project/invalid.rs:7:14
   |
 7 |         #[pin()] //~ ERROR no rules expected the token `(`
@@ -10,7 +10,7 @@ note: while trying to match `]`
   |                 $(#[$pin:ident])?
   |                               ^
 
-error: no rules expected the token `(`
+error: no rules expected `(`
  --> tests/ui/pin_project/invalid.rs:7:14
   |
 7 |         #[pin()] //~ ERROR no rules expected the token `(`
@@ -22,7 +22,7 @@ note: while trying to match `]`
   |                 $(#[$pin:ident])?
   |                               ^
 
-error: no rules expected the token `#`
+error: no rules expected `#`
   --> tests/ui/pin_project/invalid.rs:22:9
    |
 22 |         #[pin] //~ ERROR no rules expected the token `#`
@@ -34,7 +34,7 @@ note: while trying to match meta-variable `$field_vis:vis`
    |                 $field_vis:vis $field:ident: $field_ty:ty
    |                 ^^^^^^^^^^^^^^
 
-error: no rules expected the token `#`
+error: no rules expected `#`
   --> tests/ui/pin_project/invalid.rs:22:9
    |
 22 |         #[pin] //~ ERROR no rules expected the token `#`
diff --git a/tests/ui/pin_project/overlapping_unpin_struct.stderr b/tests/ui/pin_project/overlapping_unpin_struct.stderr
index 9ec1abc..8529ddc 100644
--- a/tests/ui/pin_project/overlapping_unpin_struct.stderr
+++ b/tests/ui/pin_project/overlapping_unpin_struct.stderr
@@ -2,7 +2,7 @@ error[E0277]: `PhantomPinned` cannot be unpinned
   --> tests/ui/pin_project/overlapping_unpin_struct.rs:21:16
    |
 21 |     is_unpin::<Foo<PhantomPinned>>(); //~ ERROR E0277
-   |                ^^^^^^^^^^^^^^^^^^ within `_::__Origin<'_, PhantomPinned>`, the trait `Unpin` is not implemented for `PhantomPinned`, which is required by `Foo<PhantomPinned>: Unpin`
+   |                ^^^^^^^^^^^^^^^^^^ within `_::__Origin<'_, PhantomPinned>`, the trait `Unpin` is not implemented for `PhantomPinned`
    |
    = note: consider using the `pin!` macro
            consider using `Box::pin` if you need to access the pinned value outside of the current scope
diff --git a/tests/ui/pin_project/unsupported.stderr b/tests/ui/pin_project/unsupported.stderr
index 909a671..c74041d 100644
--- a/tests/ui/pin_project/unsupported.stderr
+++ b/tests/ui/pin_project/unsupported.stderr
@@ -1,4 +1,4 @@
-error: no rules expected the token `}`
+error: no rules expected `}`
  --> tests/ui/pin_project/unsupported.rs:5:1
   |
 5 | / pin_project! {
@@ -13,7 +13,7 @@ note: while trying to match meta-variable `$field_vis:vis`
   |                 ^^^^^^^^^^^^^^
   = note: this error originates in the macro `$crate::__pin_project_expand` which comes from the expansion of the macro `pin_project` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: no rules expected the token `}`
+error: no rules expected `}`
  --> tests/ui/pin_project/unsupported.rs:5:1
   |
 5 | / pin_project! {
@@ -28,7 +28,7 @@ note: while trying to match meta-variable `$field_vis:vis`
   |                 ^^^^^^^^^^^^^^
   = note: this error originates in the macro `$crate::__pin_project_expand` which comes from the expansion of the macro `pin_project` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: no rules expected the token `(`
+error: no rules expected `(`
   --> tests/ui/pin_project/unsupported.rs:10:19
    |
 10 |     struct Struct2(); //~ ERROR no rules expected the token `(`
@@ -40,7 +40,7 @@ note: while trying to match `{`
    |         {
    |         ^
 
-error: no rules expected the token `;`
+error: no rules expected `;`
   --> tests/ui/pin_project/unsupported.rs:14:19
    |
 14 |     struct Struct3; //~ ERROR no rules expected the token `;`
@@ -52,7 +52,7 @@ note: while trying to match `{`
    |         {
    |         ^
 
-error: no rules expected the token `(`
+error: no rules expected `(`
   --> tests/ui/pin_project/unsupported.rs:19:10
    |
 19 |         A(u8)
@@ -64,7 +64,7 @@ note: while trying to match `}`
    |         }
    |         ^
 
-error: no rules expected the token `(`
+error: no rules expected `(`
   --> tests/ui/pin_project/unsupported.rs:19:10
    |
 19 |         A(u8)
@@ -76,7 +76,7 @@ note: while trying to match `}`
    |         }
    |         ^
 
-error: no rules expected the token `union`
+error: no rules expected identifier `union`
   --> tests/ui/pin_project/unsupported.rs:23:1
    |
 23 | / pin_project! {
@@ -86,14 +86,14 @@ error: no rules expected the token `union`
 27 | | }
    | |_^ no rules expected this token in macro call
    |
-note: while trying to match `struct`
+note: while trying to match keyword `struct`
   --> src/lib.rs
    |
    |         [$(#[$attrs:meta])* $vis:vis struct $ident:ident]
    |                                      ^^^^^^
    = note: this error originates in the macro `$crate::__pin_project_expand` which comes from the expansion of the macro `pin_project` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: no rules expected the token `union`
+error: no rules expected identifier `union`
   --> tests/ui/pin_project/unsupported.rs:23:1
    |
 23 | / pin_project! {
@@ -103,7 +103,7 @@ error: no rules expected the token `union`
 27 | | }
    | |_^ no rules expected this token in macro call
    |
-note: while trying to match `struct`
+note: while trying to match keyword `struct`
   --> src/lib.rs
    |
    |         [$(#[$attrs:meta])* $vis:vis struct $ident:ident]