Update ui test to nightly-2022-07-02

taiki-e · Jul 2, 2022 · 2a63666 · 2a63666
1 parent 9ce302b
commit 2a63666
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 17 deletions.
diff --git a/tests/ui/not_unpin/conflict-unpin.stderr b/tests/ui/not_unpin/conflict-unpin.stderr
@@ -5,7 +5,7 @@ error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type
    |               ^^^^^^ conflicting implementation for `Foo<_, _>`
 ...
 10 | impl<T, U> Unpin for Foo<T, U> where T: Unpin {}
-   | --------------------------------------------- first implementation here
+   | ------------------------------ first implementation here
 
 error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Bar<_, _>`
   --> tests/ui/not_unpin/conflict-unpin.rs:12:15

diff --git a/tests/ui/not_unpin/impl-unsafe-unpin.stderr b/tests/ui/not_unpin/impl-unsafe-unpin.stderr
@@ -5,7 +5,7 @@ error[E0119]: conflicting implementations of trait `_::_pin_project::UnsafeUnpin
    | ^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Foo<_, _>`
 ...
 10 | unsafe impl<T, U> UnsafeUnpin for Foo<T, U> where T: Unpin {}
-   | ---------------------------------------------------------- first implementation here
+   | ------------------------------------------- first implementation here
    |
    = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
 

diff --git a/tests/ui/pin_project/conflict-unpin.stderr b/tests/ui/pin_project/conflict-unpin.stderr
@@ -5,7 +5,7 @@ error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type
    | ^^^^^^^^^^^^^^ conflicting implementation for `Foo<_, _>`
 ...
 13 | impl<T, U> Unpin for Foo<T, U> where T: Unpin {} // Conditional Unpin impl
-   | --------------------------------------------- first implementation here
+   | ------------------------------ first implementation here
    |
    = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
 

diff --git a/tests/ui/pin_project/impl-unsafe-unpin.stderr b/tests/ui/pin_project/impl-unsafe-unpin.stderr
@@ -5,7 +5,7 @@ error[E0119]: conflicting implementations of trait `_::_pin_project::UnsafeUnpin
    | ^^^^^^^^^^^^^^ conflicting implementation for `Foo<_, _>`
 ...
 10 | unsafe impl<T, U> UnsafeUnpin for Foo<T, U> where T: Unpin {}
-   | ---------------------------------------------------------- first implementation here
+   | ------------------------------------------- first implementation here
    |
    = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
 

diff --git a/tests/ui/pinned_drop/conditional-drop-impl.stderr b/tests/ui/pinned_drop/conditional-drop-impl.stderr
@@ -7,10 +7,8 @@ error[E0367]: `Drop` impl requires `T: Unpin` but the struct it is implemented f
 note: the implementor must specify the same requirement
   --> tests/ui/pinned_drop/conditional-drop-impl.rs:7:1
    |
-7  | / struct DropImpl<T> {
-8  | |     f: T,
-9  | | }
-   | |_^
+7  | struct DropImpl<T> {
+   | ^^^^^^^^^^^^^^^^^^
 
 error[E0277]: `T` cannot be unpinned
   --> tests/ui/pinned_drop/conditional-drop-impl.rs:16:15

diff --git a/tests/ui/unsafe_unpin/conflict-unpin.stderr b/tests/ui/unsafe_unpin/conflict-unpin.stderr
@@ -5,7 +5,7 @@ error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type
    |               ^^^^^^^^^^^ conflicting implementation for `Foo<_, _>`
 ...
 10 | impl<T, U> Unpin for Foo<T, U> where T: Unpin {}
-   | --------------------------------------------- first implementation here
+   | ------------------------------ first implementation here
    |
    = note: upstream crates may add a new impl of trait `_::_pin_project::UnsafeUnpin` for type `_::_pin_project::__private::Wrapper<'_, Foo<_, _>>` in future versions
 

diff --git a/tests/ui/unstable-features/negative_impls.stderr b/tests/ui/unstable-features/negative_impls.stderr
@@ -2,7 +2,7 @@ error: cross-crate traits with a default impl, like `Unpin`, should not be speci
   --> tests/ui/unstable-features/negative_impls.rs:17:1
    |
 17 | impl Unpin for Foo<MyPhantomPinned, ()> {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: the lint level is defined here
   --> tests/ui/unstable-features/negative_impls.rs:2:9
@@ -15,10 +15,5 @@ note: the lint level is defined here
 note: try using the same sequence of generic parameters as the struct definition
   --> tests/ui/unstable-features/negative_impls.rs:8:1
    |
-8  | / struct Foo<Pinned, Unpinned> {
-9  | |     #[pin]
-10 | |     pinned: Pinned,
-11 | |
-12 | |     unpinned: Unpinned,
-13 | | }
-   | |_^
+8  | struct Foo<Pinned, Unpinned> {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^