revert change to test source

diff --git a/tests/ui/higher-rank-trait-bounds/issue-62203-hrtb-ice.rs b/tests/ui/higher-rank-trait-bounds/issue-62203-hrtb-ice.rs
index 6d3bb9bbb771533597efe5836c852030577de108..e70f6fc3430f67726e0192f0119ffd3657d5cff2 100644 (file)
--- a/tests/ui/higher-rank-trait-bounds/issue-62203-hrtb-ice.rs
+++ b/tests/ui/higher-rank-trait-bounds/issue-62203-hrtb-ice.rs
@@ -35,14 +35,16 @@ trait Ty<'a> {
 }
 
 fn main() {
-    let v = Unit2.m(L {
-        //~^ ERROR type mismatch
-        //~| ERROR to be a closure that returns `Unit3`, but it returns `Unit4`
-        f: |x| {
-            drop(x);
-            Unit4
+    let v = Unit2.m(
+        L {
+            //~^ ERROR to be a closure that returns `Unit3`, but it returns `Unit4`
+            //~| ERROR type mismatch
+            f: |x| {
+                drop(x);
+                Unit4
+            },
         },
-    });
+    );
 }
 
 impl<'a> Ty<'a> for Unit2 {

diff --git a/tests/ui/higher-rank-trait-bounds/issue-62203-hrtb-ice.stderr b/tests/ui/higher-rank-trait-bounds/issue-62203-hrtb-ice.stderr
index 9faea3a229bd61a75ec63df5019cf5c25fd0e767..810f7c28c004f61efa5575ec0e1426d170def6a2 100644 (file)
--- a/tests/ui/higher-rank-trait-bounds/issue-62203-hrtb-ice.stderr
+++ b/tests/ui/higher-rank-trait-bounds/issue-62203-hrtb-ice.stderr
@@ -1,17 +1,16 @@
-error[E0271]: type mismatch resolving `for<'r> <L<[closure@issue-62203-hrtb-ice.rs:41:12]> as T0<'r, (&'r u8,)>>::O == <_ as Ty<'r>>::V`
-  --> $DIR/issue-62203-hrtb-ice.rs:38:21
+error[E0271]: type mismatch resolving `for<'r> <L<[closure@issue-62203-hrtb-ice.rs:42:16]> as T0<'r, (&'r u8,)>>::O == <_ as Ty<'r>>::V`
+  --> $DIR/issue-62203-hrtb-ice.rs:39:9
    |
-LL |       let v = Unit2.m(L {
-   |  ___________________-_^
-   | |                   |
-   | |                   required by a bound introduced by this call
+LL |       let v = Unit2.m(
+   |                     - required by a bound introduced by this call
+LL | /         L {
 LL | |
 LL | |
-LL | |         f: |x| {
+LL | |             f: |x| {
 ...  |
+LL | |             },
 LL | |         },
-LL | |     });
-   | |_____^ type mismatch resolving `for<'r> <L<[closure@issue-62203-hrtb-ice.rs:41:12]> as T0<'r, (&'r u8,)>>::O == <_ as Ty<'r>>::V`
+   | |_________^ type mismatch resolving `for<'r> <L<[closure@issue-62203-hrtb-ice.rs:42:16]> as T0<'r, (&'r u8,)>>::O == <_ as Ty<'r>>::V`
    |
 note: expected this to be `<_ as Ty<'_>>::V`
   --> $DIR/issue-62203-hrtb-ice.rs:21:14
@@ -31,22 +30,21 @@ LL |     where
 LL |         F: for<'r> T0<'r, (<Self as Ty<'r>>::V,), O = <B as Ty<'r>>::V>,
    |                                                   ^^^^^^^^^^^^^^^^^^^^ required by this bound in `T1::m`
 
-error[E0271]: expected `[closure@issue-62203-hrtb-ice.rs:41:12]` to be a closure that returns `Unit3`, but it returns `Unit4`
-  --> $DIR/issue-62203-hrtb-ice.rs:38:21
+error[E0271]: expected `[closure@issue-62203-hrtb-ice.rs:42:16]` to be a closure that returns `Unit3`, but it returns `Unit4`
+  --> $DIR/issue-62203-hrtb-ice.rs:39:9
    |
-LL |       let v = Unit2.m(L {
-   |  ___________________-_^
-   | |                   |
-   | |                   required by a bound introduced by this call
+LL |       let v = Unit2.m(
+   |                     - required by a bound introduced by this call
+LL | /         L {
 LL | |
 LL | |
-LL | |         f: |x| {
+LL | |             f: |x| {
 ...  |
+LL | |             },
 LL | |         },
-LL | |     });
-   | |_____^ expected struct `Unit3`, found struct `Unit4`
+   | |_________^ expected struct `Unit3`, found struct `Unit4`
    |
-note: required for `L<[closure@$DIR/issue-62203-hrtb-ice.rs:41:12: 41:15]>` to implement `for<'r> T0<'r, (&'r u8,)>`
+note: required for `L<[closure@$DIR/issue-62203-hrtb-ice.rs:42:16: 42:19]>` to implement `for<'r> T0<'r, (&'r u8,)>`
   --> $DIR/issue-62203-hrtb-ice.rs:17:16
    |
 LL | impl<'a, A, T> T0<'a, A> for L<T>