fix tests

Author: pitaj

src/tools/rust-analyzer/crates/parser/src/lexed_str.rs

@@ -331,10 +331,8 @@ impl<'a> Converter<'a> {
                 }
                 C_STRING
             }
-            rustc_lexer::LiteralKind::GuardedStr { n_hashes } => {
-                if n_hashes.is_none() {
-                    err = "Invalid string literal";
-                }
+            rustc_lexer::LiteralKind::GuardedStr { .. } => {
+                err = "Invalid string literal";
                 STRING
             }
         };

tests/ui/rust-2024/reserved-guarded-strings.rs

@@ -44,6 +44,8 @@ fn main() {
     demo4!("foo"###);
 
     demo2!(blah"xx"); //~ ERROR prefix `blah` is unknown
+    demo2!(blah#"xx"#); //~ ERROR prefix `blah` is unknown
+    //~^ ERROR invalid string literal
 
     demo1!(#""); //~ ERROR invalid string literal
     demo1!(#""#); //~ ERROR invalid string literal

tests/ui/rust-2024/reserved-guarded-strings.stderr

@@ -10,8 +10,32 @@ help: consider inserting whitespace here
 LL |     demo2!(blah "xx");
    |                +
 
+error: prefix `blah` is unknown
+  --> $DIR/reserved-guarded-strings.rs:47:12
+   |
+LL |     demo2!(blah#"xx"#);
+   |            ^^^^ unknown prefix
+   |
+   = note: prefixed identifiers and literals are reserved since Rust 2021
+help: consider inserting whitespace here
+   |
+LL |     demo2!(blah #"xx"#);
+   |                +
+
+error: invalid string literal
+  --> $DIR/reserved-guarded-strings.rs:47:16
+   |
+LL |     demo2!(blah#"xx"#);
+   |                ^^^^^^
+   |
+   = note: unprefixed guarded string literals are reserved for future use since Rust 2024
+help: consider inserting whitespace here
+   |
+LL |     demo2!(blah# "xx"#);
+   |                 +
+
 error: invalid string literal
-  --> $DIR/reserved-guarded-strings.rs:48:12
+  --> $DIR/reserved-guarded-strings.rs:50:12
    |
 LL |     demo1!(#"");
    |            ^^^
@@ -23,7 +47,7 @@ LL |     demo1!(# "");
    |             +
 
 error: invalid string literal
-  --> $DIR/reserved-guarded-strings.rs:49:12
+  --> $DIR/reserved-guarded-strings.rs:51:12
    |
 LL |     demo1!(#""#);
    |            ^^^^
@@ -35,7 +59,7 @@ LL |     demo1!(# ""#);
    |             +
 
 error: invalid string literal
-  --> $DIR/reserved-guarded-strings.rs:50:12
+  --> $DIR/reserved-guarded-strings.rs:52:12
    |
 LL |     demo1!(####"");
    |            ^^^^^^
@@ -47,7 +71,7 @@ LL |     demo1!(#### "");
    |                +
 
 error: invalid string literal
-  --> $DIR/reserved-guarded-strings.rs:51:12
+  --> $DIR/reserved-guarded-strings.rs:53:12
    |
 LL |     demo1!(#"foo");
    |            ^^^^^^
@@ -59,7 +83,7 @@ LL |     demo1!(# "foo");
    |             +
 
 error: invalid string literal
-  --> $DIR/reserved-guarded-strings.rs:52:12
+  --> $DIR/reserved-guarded-strings.rs:54:12
    |
 LL |     demo1!(###"foo");
    |            ^^^^^^^^
@@ -71,7 +95,7 @@ LL |     demo1!(### "foo");
    |               +
 
 error: invalid string literal
-  --> $DIR/reserved-guarded-strings.rs:53:12
+  --> $DIR/reserved-guarded-strings.rs:55:12
    |
 LL |     demo1!(#"foo"#);
    |            ^^^^^^^
@@ -83,7 +107,7 @@ LL |     demo1!(# "foo"#);
    |             +
 
 error: invalid string literal
-  --> $DIR/reserved-guarded-strings.rs:54:12
+  --> $DIR/reserved-guarded-strings.rs:56:12
    |
 LL |     demo1!(###"foo"#);
    |            ^^^^^^^^^
@@ -95,7 +119,7 @@ LL |     demo1!(### "foo"#);
    |               +
 
 error: invalid string literal
-  --> $DIR/reserved-guarded-strings.rs:55:12
+  --> $DIR/reserved-guarded-strings.rs:57:12
    |
 LL |     demo1!(###"foo"##);
    |            ^^^^^^^^^^
@@ -107,7 +131,7 @@ LL |     demo1!(### "foo"##);
    |               +
 
 error: invalid string literal
-  --> $DIR/reserved-guarded-strings.rs:56:12
+  --> $DIR/reserved-guarded-strings.rs:58:12
    |
 LL |     demo1!(###"foo"###);
    |            ^^^^^^^^^^^
@@ -118,5 +142,5 @@ help: consider inserting whitespace here
 LL |     demo1!(### "foo"###);
    |               +
 
-error: aborting due to 10 previous errors
+error: aborting due to 12 previous errors