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/pin_project/conflict-drop.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/pin_project/conflict-drop.stderr')
| -rw-r--r-- | tests/ui/pin_project/conflict-drop.stderr | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/ui/pin_project/conflict-drop.stderr b/tests/ui/pin_project/conflict-drop.stderr index d5ca7b3..ae51456 100644 --- a/tests/ui/pin_project/conflict-drop.stderr +++ b/tests/ui/pin_project/conflict-drop.stderr @@ -1,7 +1,7 @@ -error[E0119]: conflicting implementations of trait `_::FooMustNotImplDrop` for type `Foo<_, _>`: - --> $DIR/conflict-drop.rs:4:1 +error[E0119]: conflicting implementations of trait `_::FooMustNotImplDrop` for type `Foo<_, _>` + --> $DIR/conflict-drop.rs:5:1 | -4 | #[pin_project] //~ ERROR E0119 +5 | #[pin_project] //~ ERROR E0119 | ^^^^^^^^^^^^^^ | | | first implementation here @@ -9,11 +9,11 @@ error[E0119]: conflicting implementations of trait `_::FooMustNotImplDrop` for t | = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info) -error[E0119]: conflicting implementations of trait `std::ops::Drop` for type `Bar<_, _>`: - --> $DIR/conflict-drop.rs:15:15 +error[E0119]: conflicting implementations of trait `std::ops::Drop` for type `Bar<_, _>` + --> $DIR/conflict-drop.rs:16:15 | -15 | #[pin_project(PinnedDrop)] //~ ERROR E0119 +16 | #[pin_project(PinnedDrop)] //~ ERROR E0119 | ^^^^^^^^^^ conflicting implementation for `Bar<_, _>` ... -27 | impl<T, U> Drop for Bar<T, U> { +28 | impl<T, U> Drop for Bar<T, U> { | ----------------------------- first implementation here |