diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-05-27 16:11:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-27 16:11:54 +0000 |
| commit | fcb335e6ca1967ccc95468d5c8ea80541c14d9ef (patch) | |
| tree | a2808291a9d00789d7f23e0e6bc9e133aace307a /tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr | |
| parent | 4eafa0cc0e589d8dd142ef7d2c30718b0f9c0e5b (diff) | |
| parent | b845c5fd84f50f28cd5cce350eac405562744e3b (diff) | |
| download | pin-project-fcb335e6ca1967ccc95468d5c8ea80541c14d9ef.tar.gz | |
Upgrade rust/crates/pin-project to 1.0.7 am: c95dc51644 am: b845c5fd84
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pin-project/+/1713049
Change-Id: Iffa76ddb8d7768585214b1b10204d6f61a40d420
Diffstat (limited to 'tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr')
| -rw-r--r-- | tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr b/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr index 4a8e238..64a0596 100644 --- a/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr +++ b/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr @@ -1,10 +1,10 @@ -error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Struct<_>`: - --> $DIR/overlapping_marker_traits-feature-gate.rs:6:1 +error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Struct<_>` + --> $DIR/overlapping_marker_traits-feature-gate.rs:7:1 | -6 | #[pin_project] //~ ERROR E0119 +7 | #[pin_project] //~ ERROR E0119 | ^^^^^^^^^^^^^^ conflicting implementation for `Struct<_>` ... -13 | impl<T> Unpin for Struct<T> {} +14 | 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) |