diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-05-27 15:42:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-27 15:42:45 +0000 |
| commit | b845c5fd84f50f28cd5cce350eac405562744e3b (patch) | |
| tree | a2808291a9d00789d7f23e0e6bc9e133aace307a /tests/ui/not_unpin/conflict-unpin.stderr | |
| parent | 2985289ffb56db1a2cf157e4b6874d18496b2c35 (diff) | |
| parent | c95dc516440636acb2e9f0b61e3a4595a90c4d2e (diff) | |
| download | pin-project-b845c5fd84f50f28cd5cce350eac405562744e3b.tar.gz | |
Upgrade rust/crates/pin-project to 1.0.7 am: c95dc51644android-s-beta-4android-s-beta-3android-s-beta-4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pin-project/+/1713049
Change-Id: I83082aeac5db98559efa3c9c5ccf4df14e0ff691
Diffstat (limited to 'tests/ui/not_unpin/conflict-unpin.stderr')
| -rw-r--r-- | tests/ui/not_unpin/conflict-unpin.stderr | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/ui/not_unpin/conflict-unpin.stderr b/tests/ui/not_unpin/conflict-unpin.stderr index e90a574..7b43b0f 100644 --- a/tests/ui/not_unpin/conflict-unpin.stderr +++ b/tests/ui/not_unpin/conflict-unpin.stderr @@ -1,4 +1,4 @@ -error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Foo<_, _>`: +error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Foo<_, _>` --> $DIR/conflict-unpin.rs:3:15 | 3 | #[pin_project(!Unpin)] //~ ERROR E0119 @@ -7,7 +7,7 @@ error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type 10 | impl<T, U> Unpin for Foo<T, U> where T: Unpin {} | --------------------------------------------- first implementation here -error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Bar<_, _>`: +error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Bar<_, _>` --> $DIR/conflict-unpin.rs:12:15 | 12 | #[pin_project(!Unpin)] //~ ERROR E0119 @@ -16,7 +16,7 @@ error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type 19 | impl<T, U> Unpin for Bar<T, U> {} | ------------------------------ first implementation here -error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Baz<_, _>`: +error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Baz<_, _>` --> $DIR/conflict-unpin.rs:21:15 | 21 | #[pin_project(!Unpin)] //~ ERROR E0119 |