diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-05-27 17:00:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-27 17:00:46 +0000 |
| commit | 5dbc7a39961945cd9d065d0a9fdc25711376574f (patch) | |
| tree | a2808291a9d00789d7f23e0e6bc9e133aace307a /tests/ui/unstable-features/overlapping_marker_traits.stderr | |
| parent | 3a092f9e543f72e7ee1abc39a7cf49d8d96b25fe (diff) | |
| parent | a5c0a13309164da22025014778cf4d794aec96a6 (diff) | |
| download | pin-project-5dbc7a39961945cd9d065d0a9fdc25711376574f.tar.gz | |
Upgrade rust/crates/pin-project to 1.0.7 am: c95dc51644 am: b845c5fd84 am: fcb335e6ca am: a5c0a13309
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pin-project/+/1713049
Change-Id: Ie859a9fc877c4ed769bf408a396e775cb361898b
Diffstat (limited to 'tests/ui/unstable-features/overlapping_marker_traits.stderr')
| -rw-r--r-- | tests/ui/unstable-features/overlapping_marker_traits.stderr | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/ui/unstable-features/overlapping_marker_traits.stderr b/tests/ui/unstable-features/overlapping_marker_traits.stderr index 91aaf6c..ffa50c7 100644 --- a/tests/ui/unstable-features/overlapping_marker_traits.stderr +++ b/tests/ui/unstable-features/overlapping_marker_traits.stderr @@ -6,13 +6,13 @@ error[E0557]: feature has been removed | = note: removed in favor of `#![feature(marker_trait_attr)]` -error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Struct<_>`: - --> $DIR/overlapping_marker_traits.rs:16:1 +error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Struct<_>` + --> $DIR/overlapping_marker_traits.rs:17:1 | -16 | #[pin_project] +17 | #[pin_project] | ^^^^^^^^^^^^^^ conflicting implementation for `Struct<_>` ... -23 | impl<T> Unpin for Struct<T> {} +24 | impl<T> Unpin for Struct<T> {} | --------------------------- first implementation here | = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info) |