fix rebase

Author: estebank

src/test/ui/diagnostic-width/long-E0308.stderr

@@ -2,21 +2,21 @@ error[E0308]: mismatched types
   --> $DIR/long-E0308.rs:33:9
    |
 LL |        let x: Atype<
-   |   ____________-
-LL |  |       Btype<
-LL |  |         Ctype<
-LL |  |           Atype<
-...   |
-LL |  |       i32
-LL |  |     > = Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok...
-   |  |_____-___^
+   |  _____________-
+LL | |        Btype<
+LL | |          Ctype<
+LL | |            Atype<
+...  |
+LL | |        i32
+LL | |      > = Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok...
+   | | _____-___^
    | ||_____|
-   | |      expected due to this
-LL | |          Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok...
-LL | |              Ok("")
-LL | |          ))))))))))))))))))))))))))))))
-LL | |      ))))))))))))))))))))))))))))));
-   | |___________________________________^ expected struct `Atype`, found enum `Result`
+   |  |     expected due to this
+LL |  |         Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok...
+LL |  |             Ok("")
+LL |  |         ))))))))))))))))))))))))))))))
+LL |  |     ))))))))))))))))))))))))))))));
+   |  |__________________________________^ expected struct `Atype`, found enum `Result`
    |
    = note: expected struct `Atype<Btype<..., ...>, ...>`
            the full type name has been written to '$TEST_BUILD_DIR/diagnostic-width/long-E0308/long-E0308.long-type-hash.txt'