diff options
author | David LeGare <legare@google.com> | 2022-03-02 20:59:51 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-02 20:59:51 +0000 |
commit | ac81d17ea0cce1b865bbecae5677eeef7b1703e4 (patch) | |
tree | 80c46c7f97eb0158db00b2c4710dd54073c36733 /tests/ui/pin_project/conflict-drop.stderr | |
parent | 23cdec702c0235804c847247f16c7bc73f9d9fce (diff) | |
parent | 8915193b0de5f14b58aea0cd7bd72a6083529dc2 (diff) | |
download | pin-project-ac81d17ea0cce1b865bbecae5677eeef7b1703e4.tar.gz |
Update pin-project to 1.0.10 am: 8915193b0d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pin-project/+/2005953
Change-Id: I3c1379108ed7a86c8c877b70d6c1d516280db2e5
Diffstat (limited to 'tests/ui/pin_project/conflict-drop.stderr')
-rw-r--r-- | tests/ui/pin_project/conflict-drop.stderr | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/ui/pin_project/conflict-drop.stderr b/tests/ui/pin_project/conflict-drop.stderr index 25b0e00..4ae628d 100644 --- a/tests/ui/pin_project/conflict-drop.stderr +++ b/tests/ui/pin_project/conflict-drop.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `_::FooMustNotImplDrop` for type `Foo<_, _>` - --> $DIR/conflict-drop.rs:5:1 + --> tests/ui/pin_project/conflict-drop.rs:5:1 | 5 | #[pin_project] //~ ERROR E0119 | ^^^^^^^^^^^^^^ @@ -10,7 +10,7 @@ error[E0119]: conflicting implementations of trait `_::FooMustNotImplDrop` for t = 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 `std::ops::Drop` for type `Bar<_, _>` - --> $DIR/conflict-drop.rs:16:15 + --> tests/ui/pin_project/conflict-drop.rs:16:15 | 16 | #[pin_project(PinnedDrop)] //~ ERROR E0119 | ^^^^^^^^^^ conflicting implementation for `Bar<_, _>` |