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/pin_project/conflict-drop.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/pin_project/conflict-drop.stderr')
| -rw-r--r-- | tests/ui/pin_project/conflict-drop.stderr | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/ui/pin_project/conflict-drop.stderr b/tests/ui/pin_project/conflict-drop.stderr index d5ca7b3..ae51456 100644 --- a/tests/ui/pin_project/conflict-drop.stderr +++ b/tests/ui/pin_project/conflict-drop.stderr @@ -1,7 +1,7 @@ -error[E0119]: conflicting implementations of trait `_::FooMustNotImplDrop` for type `Foo<_, _>`: - --> $DIR/conflict-drop.rs:4:1 +error[E0119]: conflicting implementations of trait `_::FooMustNotImplDrop` for type `Foo<_, _>` + --> $DIR/conflict-drop.rs:5:1 | -4 | #[pin_project] //~ ERROR E0119 +5 | #[pin_project] //~ ERROR E0119 | ^^^^^^^^^^^^^^ | | | first implementation here @@ -9,11 +9,11 @@ error[E0119]: conflicting implementations of trait `_::FooMustNotImplDrop` for t | = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info) -error[E0119]: conflicting implementations of trait `std::ops::Drop` for type `Bar<_, _>`: - --> $DIR/conflict-drop.rs:15:15 +error[E0119]: conflicting implementations of trait `std::ops::Drop` for type `Bar<_, _>` + --> $DIR/conflict-drop.rs:16:15 | -15 | #[pin_project(PinnedDrop)] //~ ERROR E0119 +16 | #[pin_project(PinnedDrop)] //~ ERROR E0119 | ^^^^^^^^^^ conflicting implementation for `Bar<_, _>` ... -27 | impl<T, U> Drop for Bar<T, U> { +28 | impl<T, U> Drop for Bar<T, U> { | ----------------------------- first implementation here |