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/unstable-features/marker_trait_attr-feature-gate.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/unstable-features/marker_trait_attr-feature-gate.stderr')
| -rw-r--r-- | tests/ui/unstable-features/marker_trait_attr-feature-gate.stderr | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/ui/unstable-features/marker_trait_attr-feature-gate.stderr b/tests/ui/unstable-features/marker_trait_attr-feature-gate.stderr index bab534b..44322ec 100644 --- a/tests/ui/unstable-features/marker_trait_attr-feature-gate.stderr +++ b/tests/ui/unstable-features/marker_trait_attr-feature-gate.stderr @@ -1,10 +1,10 @@ -error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Struct<_>`: - --> $DIR/marker_trait_attr-feature-gate.rs:6:1 +error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Struct<_>` + --> $DIR/marker_trait_attr-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) |