diff options
author | David LeGare <legare@google.com> | 2022-03-02 21:37:58 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-02 21:37:58 +0000 |
commit | 365fe11dc7cf47ae04d945af513246d19dfc00e8 (patch) | |
tree | 80c46c7f97eb0158db00b2c4710dd54073c36733 /tests/ui/pin_project/conflict-unpin.stderr | |
parent | 23cdec702c0235804c847247f16c7bc73f9d9fce (diff) | |
parent | ac81d17ea0cce1b865bbecae5677eeef7b1703e4 (diff) | |
download | pin-project-365fe11dc7cf47ae04d945af513246d19dfc00e8.tar.gz |
Update pin-project to 1.0.10 am: 8915193b0d am: ac81d17ea0
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pin-project/+/2005953
Change-Id: I44e3dfdc6c005d46e30a740e77bb74955ccdfbd8
Diffstat (limited to 'tests/ui/pin_project/conflict-unpin.stderr')
-rw-r--r-- | tests/ui/pin_project/conflict-unpin.stderr | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/ui/pin_project/conflict-unpin.stderr b/tests/ui/pin_project/conflict-unpin.stderr index 5a16469..5e012c4 100644 --- a/tests/ui/pin_project/conflict-unpin.stderr +++ b/tests/ui/pin_project/conflict-unpin.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Foo<_, _>` - --> $DIR/conflict-unpin.rs:5:1 + --> tests/ui/pin_project/conflict-unpin.rs:5:1 | 5 | #[pin_project] //~ ERROR E0119 | ^^^^^^^^^^^^^^ conflicting implementation for `Foo<_, _>` @@ -10,7 +10,7 @@ error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type = 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::marker::Unpin` for type `Bar<_, _>` - --> $DIR/conflict-unpin.rs:17:1 + --> tests/ui/pin_project/conflict-unpin.rs:17:1 | 17 | #[pin_project] //~ ERROR E0119 | ^^^^^^^^^^^^^^ conflicting implementation for `Bar<_, _>` @@ -21,7 +21,7 @@ error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type = 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::marker::Unpin` for type `Baz<_, _>` - --> $DIR/conflict-unpin.rs:27:1 + --> tests/ui/pin_project/conflict-unpin.rs:27:1 | 27 | #[pin_project] //~ ERROR E0119 | ^^^^^^^^^^^^^^ conflicting implementation for `Baz<_, _>` |