diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-05-19 16:12:52 -0700 |
|---|---|---|
| committer | Joel Galenson <jgalenson@google.com> | 2021-05-19 16:12:52 -0700 |
| commit | c95dc516440636acb2e9f0b61e3a4595a90c4d2e (patch) | |
| tree | a2808291a9d00789d7f23e0e6bc9e133aace307a /tests/ui/unstable-features/overlapping_marker_traits.stderr | |
| parent | 1a7271af628c203700f21c3b3eac18bbd7373340 (diff) | |
| download | pin-project-c95dc516440636acb2e9f0b61e3a4595a90c4d2e.tar.gz | |
Upgrade rust/crates/pin-project to 1.0.7
Test: make
Change-Id: I9cb8c4f9c94d68c5775ee9a360f4e882a836e186
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) |