diff --git a/tests/ui/pin_project/project_replace_unsized.stderr b/tests/ui/pin_project/project_replace_unsized.stderr
index a2d8ae5d..5ed3c5ed 100644
--- a/tests/ui/pin_project/project_replace_unsized.stderr
+++ b/tests/ui/pin_project/project_replace_unsized.stderr
@@ -35,11 +35,11 @@ note: required because it appears within the type `Struct<T>`
     |
 4   | struct Struct<T: ?Sized> {
     |        ^^^^^^
-note: required by `UnsafeOverwriteGuard`
-   --> src/lib.rs:271:5
+note: required by a bound in `UnsafeOverwriteGuard`
+   --> src/lib.rs
     |
-271 |     pub struct UnsafeOverwriteGuard<T> {
-    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    |     pub struct UnsafeOverwriteGuard<T> {
+    |                                     ^ required by this bound in `UnsafeOverwriteGuard`
     = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider removing the `?Sized` bound to make the type parameter `Sized`
     |
@@ -105,11 +105,11 @@ note: required because it appears within the type `TupleStruct<T>`
     |
 9   | struct TupleStruct<T: ?Sized>(T);
     |        ^^^^^^^^^^^
-note: required by `UnsafeOverwriteGuard`
-   --> src/lib.rs:271:5
+note: required by a bound in `UnsafeOverwriteGuard`
+   --> src/lib.rs
     |
-271 |     pub struct UnsafeOverwriteGuard<T> {
-    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    |     pub struct UnsafeOverwriteGuard<T> {
+    |                                     ^ required by this bound in `UnsafeOverwriteGuard`
     = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider removing the `?Sized` bound to make the type parameter `Sized`
     |
diff --git a/tests/ui/pin_project/project_replace_unsized_fn_params.stderr b/tests/ui/pin_project/project_replace_unsized_fn_params.stderr
index cb329eaa..a574ca6c 100644
--- a/tests/ui/pin_project/project_replace_unsized_fn_params.stderr
+++ b/tests/ui/pin_project/project_replace_unsized_fn_params.stderr
@@ -32,11 +32,11 @@ note: required because it appears within the type `Struct<T>`
     |
 6   | struct Struct<T: ?Sized> {
     |        ^^^^^^
-note: required by `UnsafeOverwriteGuard`
-   --> src/lib.rs:271:5
+note: required by a bound in `UnsafeOverwriteGuard`
+   --> src/lib.rs
     |
-271 |     pub struct UnsafeOverwriteGuard<T> {
-    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    |     pub struct UnsafeOverwriteGuard<T> {
+    |                                     ^ required by this bound in `UnsafeOverwriteGuard`
     = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider removing the `?Sized` bound to make the type parameter `Sized`
     |
@@ -99,11 +99,11 @@ note: required because it appears within the type `TupleStruct<T>`
     |
 11  | struct TupleStruct<T: ?Sized>(T);
     |        ^^^^^^^^^^^
-note: required by `UnsafeOverwriteGuard`
-   --> src/lib.rs:271:5
+note: required by a bound in `UnsafeOverwriteGuard`
+   --> src/lib.rs
     |
-271 |     pub struct UnsafeOverwriteGuard<T> {
-    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    |     pub struct UnsafeOverwriteGuard<T> {
+    |                                     ^ required by this bound in `UnsafeOverwriteGuard`
     = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider removing the `?Sized` bound to make the type parameter `Sized`
     |
diff --git a/tests/ui/pin_project/remove-attr-from-struct.stderr b/tests/ui/pin_project/remove-attr-from-struct.stderr
index e5302636..1a9cd42c 100644
--- a/tests/ui/pin_project/remove-attr-from-struct.stderr
+++ b/tests/ui/pin_project/remove-attr-from-struct.stderr
@@ -68,11 +68,11 @@ note: required because it appears within the type `A`
     |
 10  | struct A {
     |        ^
-note: required by `Pin::<P>::new`
+note: required by a bound in `Pin::<P>::new`
    --> $RUST/core/src/pin.rs
     |
-    |     pub const fn new(pointer: P) -> Pin<P> {
-    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    | impl<P: Deref<Target: Unpin>> Pin<P> {
+    |                       ^^^^^ required by this bound in `Pin::<P>::new`
 
 error[E0599]: no method named `project` found for struct `Pin<&mut A>` in the current scope
   --> tests/ui/pin_project/remove-attr-from-struct.rs:40:30
@@ -94,11 +94,11 @@ note: required because it appears within the type `B`
     |
 17  | struct B {
     |        ^
-note: required by `Pin::<P>::new`
+note: required by a bound in `Pin::<P>::new`
    --> $RUST/core/src/pin.rs
     |
-    |     pub const fn new(pointer: P) -> Pin<P> {
-    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    | impl<P: Deref<Target: Unpin>> Pin<P> {
+    |                       ^^^^^ required by this bound in `Pin::<P>::new`
 
 error[E0599]: no method named `project` found for struct `Pin<&mut B>` in the current scope
   --> tests/ui/pin_project/remove-attr-from-struct.rs:43:30
diff --git a/tests/ui/pinned_drop/conditional-drop-impl.stderr b/tests/ui/pinned_drop/conditional-drop-impl.stderr
index ae6f52e6..0c55bc2a 100644
--- a/tests/ui/pinned_drop/conditional-drop-impl.stderr
+++ b/tests/ui/pinned_drop/conditional-drop-impl.stderr
@@ -13,23 +13,18 @@ note: the implementor must specify the same requirement
    | |_^
 
 error[E0277]: `T` cannot be unpinned
-   --> tests/ui/pinned_drop/conditional-drop-impl.rs:16:15
-    |
-16  | #[pin_project(PinnedDrop)] //~ ERROR E0277
-    |               ^^^^^^^^^^ the trait `Unpin` is not implemented for `T`
-    |
-    = note: consider using `Box::pin`
+  --> tests/ui/pinned_drop/conditional-drop-impl.rs:16:15
+   |
+16 | #[pin_project(PinnedDrop)] //~ ERROR E0277
+   |               ^^^^^^^^^^ the trait `Unpin` is not implemented for `T`
+   |
+   = note: consider using `Box::pin`
 note: required because of the requirements on the impl of `PinnedDrop` for `PinnedDropImpl<T>`
-   --> tests/ui/pinned_drop/conditional-drop-impl.rs:23:16
-    |
-23  | impl<T: Unpin> PinnedDrop for PinnedDropImpl<T> {
-    |                ^^^^^^^^^^     ^^^^^^^^^^^^^^^^^
-note: required by `pin_project::__private::PinnedDrop::drop`
-   --> src/lib.rs:188:9
-    |
-188 |         unsafe fn drop(self: Pin<&mut Self>);
-    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  --> tests/ui/pinned_drop/conditional-drop-impl.rs:23:16
+   |
+23 | impl<T: Unpin> PinnedDrop for PinnedDropImpl<T> {
+   |                ^^^^^^^^^^     ^^^^^^^^^^^^^^^^^
 help: consider restricting type parameter `T`
-    |
-17  | struct PinnedDropImpl<T: std::marker::Unpin> {
-    |                        ++++++++++++++++++++
+   |
+17 | struct PinnedDropImpl<T: std::marker::Unpin> {
+   |                        ++++++++++++++++++++
diff --git a/tests/ui/pinned_drop/forget-pinned-drop-impl.stderr b/tests/ui/pinned_drop/forget-pinned-drop-impl.stderr
index 81992e1e..ef8a7bf4 100644
--- a/tests/ui/pinned_drop/forget-pinned-drop-impl.stderr
+++ b/tests/ui/pinned_drop/forget-pinned-drop-impl.stderr
@@ -1,11 +1,5 @@
 error[E0277]: the trait bound `Struct: PinnedDrop` is not satisfied
-   --> tests/ui/pinned_drop/forget-pinned-drop-impl.rs:3:15
-    |
-3   | #[pin_project(PinnedDrop)] //~ ERROR E0277
-    |               ^^^^^^^^^^ the trait `PinnedDrop` is not implemented for `Struct`
-    |
-note: required by `pin_project::__private::PinnedDrop::drop`
-   --> src/lib.rs:188:9
-    |
-188 |         unsafe fn drop(self: Pin<&mut Self>);
-    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ --> tests/ui/pinned_drop/forget-pinned-drop-impl.rs:3:15
+  |
+3 | #[pin_project(PinnedDrop)] //~ ERROR E0277
+  |               ^^^^^^^^^^ the trait `PinnedDrop` is not implemented for `Struct`