about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEsteban Küber <esteban@kuber.com.ar>2022-11-28 14:41:42 -0800
committerEsteban Küber <esteban@kuber.com.ar>2022-11-28 14:41:42 -0800
commit34b3c49d72b4199b7a804e8893fc585dbd00d5d3 (patch)
treecc81ef303a246cf999f0d61be5ba9c8cd54a9dc7
parent360bcb6fc6fb09e4a20e6b6de4f8db86807cb9a6 (diff)
downloadrust-34b3c49d72b4199b7a804e8893fc585dbd00d5d3.tar.gz
rust-34b3c49d72b4199b7a804e8893fc585dbd00d5d3.zip
fix rebase
-rw-r--r--src/test/ui/diagnostic-width/long-E0308.stderr28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/test/ui/diagnostic-width/long-E0308.stderr b/src/test/ui/diagnostic-width/long-E0308.stderr
index 99270a4696c..487ab23a1c1 100644
--- a/src/test/ui/diagnostic-width/long-E0308.stderr
+++ b/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'