updated raw string tests

Author: hellow554

src/test/ui/parser/raw/raw-byte-string-eof.stderr

@@ -1,10 +1,16 @@
 error: unterminated raw string
-  --> $DIR/raw-byte-string-eof.rs:2:6
+  --> $DIR/raw-byte-string-eof.rs:2:5
    |
 LL |     br##"a"#;
-   |      ^ unterminated raw string
+   |     ^^^^ unterminated raw string
+help: Raw string could be meant to end here
    |
-   = note: this raw string should be terminated with `"##`
+LL |     br##"a"##;
+   |           ^^^
+help: Raw string could be meant to end here
+   |
+LL | }"##
+   |   ^^^
 
 error: aborting due to previous error
 

src/test/ui/parser/raw/raw-byte-string-literals.stderr

@@ -5,10 +5,10 @@ LL |     br"é";
    |        ^
 
 error: found invalid character; only `#` is allowed in raw string delimitation: ~
-  --> $DIR/raw-byte-string-literals.rs:6:6
+  --> $DIR/raw-byte-string-literals.rs:6:5
    |
 LL |     br##~"a"~##;
-   |      ^^^
+   |     ^^^^
 
 error: aborting due to 2 previous errors
 

src/test/ui/parser/raw/raw-literal-too-many-long.rs

@@ -0,0 +1,21 @@
+fn main() {
+    let a = r##"This //~ ERROR too many `#` when terminating raw string
+    is
+    a
+    very
+    long
+    string
+    which
+    goes
+    over
+    a
+    b
+    c
+    d
+    e
+    f
+    g
+    h
+    lines
+    "###;
+}

src/test/ui/parser/raw/raw-literal-too-many-long.stderr

@@ -0,0 +1,20 @@
+error: too many `#` when terminating raw string
+  --> $DIR/raw-literal-too-many-long.rs:2:13
+   |
+LL |       let a = r##"This
+   |               ^-- The raw string has 2 leading `#`...
+   |  _____________|
+   | |
+LL | |     is
+LL | |     a
+LL | |     very
+...  |
+LL | |     lines
+LL | |     "###;
+   | |______--^
+   |        |
+   |        ...but is closed with 3.
+   = help: remove the unneeded `#`
+
+error: aborting due to previous error
+

src/test/ui/parser/raw/raw-str-long.rs

@@ -0,0 +1,21 @@
+fn main() {
+    let a = r##"This //~ ERROR unterminated raw string
+    is
+    a
+    very
+    long
+    string
+    which
+    goes
+    over
+    a
+    b
+    c
+    d
+    e
+    f
+    g
+    h
+    lines
+    "#;
+}

src/test/ui/parser/raw/raw-str-long.stderr

@@ -0,0 +1,16 @@
+error: unterminated raw string
+  --> $DIR/raw-string-long.rs:2:13
+   |
+LL |     let a = r##"This
+   |             ^^^ unterminated raw string
+help: Raw string could be meant to end here
+   |
+LL |     "##;
+   |     ^^^
+help: Raw string could be meant to end here
+   |
+LL | }"##
+   |   ^^^
+
+error: aborting due to previous error
+

src/test/ui/parser/raw/raw-str-unbalanced.rs

@@ -1,4 +1,5 @@
 static s: &'static str =
-    r#"
-      "## //~ ERROR expected one of `.`, `;`, `?`, or an operator, found `#`
-;
+    r#" //~ ERROR too many `#` when terminating raw string
+      "##;
+
+fn main() {}

src/test/ui/parser/raw/raw-str-unbalanced.stderr

@@ -1,8 +1,15 @@
-error: expected one of `.`, `;`, `?`, or an operator, found `#`
-  --> $DIR/raw-str-unbalanced.rs:3:9
+error: too many `#` when terminating raw string
+  --> $DIR/raw-str-unbalanced.rs:2:5
    |
-LL |       "##
-   |         ^ expected one of `.`, `;`, `?`, or an operator here
+LL |       r#"
+   |       ^- The raw string has 1 leading `#`...
+   |  _____|
+   | |
+LL | |       "##;
+   | |________-^
+   |          |
+   |          ...but is closed with 2.
+   = help: remove the unneeded `#`
 
 error: aborting due to previous error
 

src/test/ui/parser/raw/raw-str-unterminated.stderr

@@ -2,9 +2,10 @@ error: unterminated raw string
   --> $DIR/raw-str-unterminated.rs:2:5
    |
 LL |     r#" string literal goes on
-   |     ^ unterminated raw string
-   |
-   = note: this raw string should be terminated with `"#`
+   |     ^^ unterminated raw string
+LL |         and on
+LL |
+   |                                         - help: Raw string could be meant to end here: `"#`
 
 error: aborting due to previous error
 

src/test/ui/parser/raw/raw_string.rs renamed to src/test/ui/parser/raw/raw-str.rs

@@ -0,0 +1,16 @@
+error: unterminated raw string
+  --> $DIR/raw_string.rs:2:13
+   |
+LL |     let x = r##"lol"#;
+   |             ^^^ unterminated raw string
+help: Raw string could be meant to end here
+   |
+LL |     let x = r##"lol"##;
+   |                    ^^^
+help: Raw string could be meant to end here
+   |
+LL | }"##
+   |   ^^^
+
+error: aborting due to previous error
+