diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-08-11 14:43:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-11 14:43:30 +0000 |
| commit | 854e9fcb8c82f15786589be06db1c743ebf62319 (patch) | |
| tree | 4ff684b6890583131074a1033210f0ac7abb1d0d /tests/ui/not_unpin/impl-unsafe-unpin.stderr | |
| parent | fcb335e6ca1967ccc95468d5c8ea80541c14d9ef (diff) | |
| parent | 02a74e9451d4ea00816d0489f8aaaee4ef5f9ae6 (diff) | |
| download | pin-project-854e9fcb8c82f15786589be06db1c743ebf62319.tar.gz | |
Upgrade rust/crates/pin-project to 1.0.8 am: c1569cc62c am: 02a74e9451android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pin-project/+/1791108
Change-Id: I26d5c7e71b70cf09c655f7cc6678f76b073d19f3
Diffstat (limited to 'tests/ui/not_unpin/impl-unsafe-unpin.stderr')
| -rw-r--r-- | tests/ui/not_unpin/impl-unsafe-unpin.stderr | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/ui/not_unpin/impl-unsafe-unpin.stderr b/tests/ui/not_unpin/impl-unsafe-unpin.stderr index 43cd4f1..7051bd8 100644 --- a/tests/ui/not_unpin/impl-unsafe-unpin.stderr +++ b/tests/ui/not_unpin/impl-unsafe-unpin.stderr @@ -7,7 +7,7 @@ error[E0119]: conflicting implementations of trait `pin_project::UnsafeUnpin` fo 10 | unsafe impl<T, U> UnsafeUnpin for Foo<T, U> where T: Unpin {} | ---------------------------------------------------------- first implementation here | - = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info) + = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info) error[E0119]: conflicting implementations of trait `pin_project::UnsafeUnpin` for type `Bar<_, _>` --> $DIR/impl-unsafe-unpin.rs:12:1 @@ -18,7 +18,7 @@ error[E0119]: conflicting implementations of trait `pin_project::UnsafeUnpin` fo 19 | unsafe impl<T, U> UnsafeUnpin for Bar<T, U> {} | ------------------------------------------- first implementation here | - = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info) + = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info) error[E0119]: conflicting implementations of trait `pin_project::UnsafeUnpin` for type `Baz<_, _>` --> $DIR/impl-unsafe-unpin.rs:21:1 @@ -29,4 +29,4 @@ error[E0119]: conflicting implementations of trait `pin_project::UnsafeUnpin` fo 28 | unsafe impl<T: Unpin, U: Unpin> UnsafeUnpin for Baz<T, U> {} | --------------------------------------------------------- first implementation here | - = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info) + = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info) |