New upstream version 1.56.0~beta.4+dfsg1

[rustc.git] / src / test / ui / str / str-lit-type-mismatch.stderr

diff --git a/src/test/ui/str/str-lit-type-mismatch.stderr b/src/test/ui/str/str-lit-type-mismatch.stderr
index 64ddfcc9b476505897f7e515714d77f78aa6e1e1..90590b70dfe9f73984da1536ac1434869ad89959 100644 (file)
--- a/src/test/ui/str/str-lit-type-mismatch.stderr
+++ b/src/test/ui/str/str-lit-type-mismatch.stderr
@@ -2,40 +2,47 @@ error[E0308]: mismatched types
   --> $DIR/str-lit-type-mismatch.rs:2:20
    |
 LL |     let x: &[u8] = "foo";
-   |            -----   ^^^^^
-   |            |       |
-   |            |       expected slice `[u8]`, found `str`
-   |            |       help: consider adding a leading `b`: `b"foo"`
+   |            -----   ^^^^^ expected slice `[u8]`, found `str`
+   |            |
    |            expected due to this
    |
    = note: expected reference `&[u8]`
               found reference `&'static str`
+help: consider adding a leading `b`
+   |
+LL |     let x: &[u8] = b"foo";
+   |                    +
 
 error[E0308]: mismatched types
   --> $DIR/str-lit-type-mismatch.rs:3:23
    |
 LL |     let y: &[u8; 4] = "baaa";
-   |            --------   ^^^^^^
-   |            |          |
-   |            |          expected array `[u8; 4]`, found `str`
-   |            |          help: consider adding a leading `b`: `b"baaa"`
+   |            --------   ^^^^^^ expected array `[u8; 4]`, found `str`
+   |            |
    |            expected due to this
    |
    = note: expected reference `&[u8; 4]`
               found reference `&'static str`
+help: consider adding a leading `b`
+   |
+LL |     let y: &[u8; 4] = b"baaa";
+   |                       +
 
 error[E0308]: mismatched types
   --> $DIR/str-lit-type-mismatch.rs:4:19
    |
 LL |     let z: &str = b"foo";
-   |            ----   ^^^^^^
-   |            |      |
-   |            |      expected `str`, found array `[u8; 3]`
-   |            |      help: consider removing the leading `b`: `"foo"`
+   |            ----   ^^^^^^ expected `str`, found array `[u8; 3]`
+   |            |
    |            expected due to this
    |
    = note: expected reference `&str`
               found reference `&'static [u8; 3]`
+help: consider removing the leading `b`
+   |
+LL -     let z: &str = b"foo";
+LL +     let z: &str = "foo";
+   | 
 
 error: aborting due to 3 previous errors