From a4b7ed7a42c716ab9f05e351f003d589124fd55d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:18:58 +0200 Subject: Adding upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- ...e-70677-panic-on-unterminated-raw-str-at-eof.rs | 5 --- ...677-panic-on-unterminated-raw-str-at-eof.stderr | 9 ----- src/test/ui/parser/raw/raw-byte-string-eof.rs | 3 -- src/test/ui/parser/raw/raw-byte-string-eof.stderr | 13 -------- src/test/ui/parser/raw/raw-byte-string-literals.rs | 7 ---- .../ui/parser/raw/raw-byte-string-literals.stderr | 20 ----------- src/test/ui/parser/raw/raw-literal-keywords.rs | 25 -------------- src/test/ui/parser/raw/raw-literal-keywords.stderr | 39 ---------------------- src/test/ui/parser/raw/raw-literal-self.rs | 4 --- src/test/ui/parser/raw/raw-literal-self.stderr | 8 ----- src/test/ui/parser/raw/raw-literal-underscore.rs | 4 --- .../ui/parser/raw/raw-literal-underscore.stderr | 8 ----- src/test/ui/parser/raw/raw-str-delim.rs | 3 -- src/test/ui/parser/raw/raw-str-delim.stderr | 8 ----- src/test/ui/parser/raw/raw-str-in-macro-call.rs | 14 -------- src/test/ui/parser/raw/raw-str-unbalanced.rs | 22 ------------ src/test/ui/parser/raw/raw-str-unbalanced.stderr | 36 -------------------- src/test/ui/parser/raw/raw-str-unterminated.rs | 4 --- src/test/ui/parser/raw/raw-str-unterminated.stderr | 11 ------ src/test/ui/parser/raw/raw-string-2.rs | 4 --- src/test/ui/parser/raw/raw-string-2.stderr | 11 ------ src/test/ui/parser/raw/raw-string.rs | 4 --- src/test/ui/parser/raw/raw-string.stderr | 13 -------- 23 files changed, 275 deletions(-) delete mode 100644 src/test/ui/parser/raw/issue-70677-panic-on-unterminated-raw-str-at-eof.rs delete mode 100644 src/test/ui/parser/raw/issue-70677-panic-on-unterminated-raw-str-at-eof.stderr delete mode 100644 src/test/ui/parser/raw/raw-byte-string-eof.rs delete mode 100644 src/test/ui/parser/raw/raw-byte-string-eof.stderr delete mode 100644 src/test/ui/parser/raw/raw-byte-string-literals.rs delete mode 100644 src/test/ui/parser/raw/raw-byte-string-literals.stderr delete mode 100644 src/test/ui/parser/raw/raw-literal-keywords.rs delete mode 100644 src/test/ui/parser/raw/raw-literal-keywords.stderr delete mode 100644 src/test/ui/parser/raw/raw-literal-self.rs delete mode 100644 src/test/ui/parser/raw/raw-literal-self.stderr delete mode 100644 src/test/ui/parser/raw/raw-literal-underscore.rs delete mode 100644 src/test/ui/parser/raw/raw-literal-underscore.stderr delete mode 100644 src/test/ui/parser/raw/raw-str-delim.rs delete mode 100644 src/test/ui/parser/raw/raw-str-delim.stderr delete mode 100644 src/test/ui/parser/raw/raw-str-in-macro-call.rs delete mode 100644 src/test/ui/parser/raw/raw-str-unbalanced.rs delete mode 100644 src/test/ui/parser/raw/raw-str-unbalanced.stderr delete mode 100644 src/test/ui/parser/raw/raw-str-unterminated.rs delete mode 100644 src/test/ui/parser/raw/raw-str-unterminated.stderr delete mode 100644 src/test/ui/parser/raw/raw-string-2.rs delete mode 100644 src/test/ui/parser/raw/raw-string-2.stderr delete mode 100644 src/test/ui/parser/raw/raw-string.rs delete mode 100644 src/test/ui/parser/raw/raw-string.stderr (limited to 'src/test/ui/parser/raw') diff --git a/src/test/ui/parser/raw/issue-70677-panic-on-unterminated-raw-str-at-eof.rs b/src/test/ui/parser/raw/issue-70677-panic-on-unterminated-raw-str-at-eof.rs deleted file mode 100644 index bdfc29a3d..000000000 --- a/src/test/ui/parser/raw/issue-70677-panic-on-unterminated-raw-str-at-eof.rs +++ /dev/null @@ -1,5 +0,0 @@ -// This won't actually panic because of the error comment -- the `"` needs to be -// the last byte in the file (including not having a trailing newline) -// Prior to the fix you get the error: 'expected item, found `r" ...`' -// because the string being unterminated wasn't properly detected. -r" //~ unterminated raw string diff --git a/src/test/ui/parser/raw/issue-70677-panic-on-unterminated-raw-str-at-eof.stderr b/src/test/ui/parser/raw/issue-70677-panic-on-unterminated-raw-str-at-eof.stderr deleted file mode 100644 index 3a7e2a4b1..000000000 --- a/src/test/ui/parser/raw/issue-70677-panic-on-unterminated-raw-str-at-eof.stderr +++ /dev/null @@ -1,9 +0,0 @@ -error[E0748]: unterminated raw string - --> $DIR/issue-70677-panic-on-unterminated-raw-str-at-eof.rs:5:1 - | -LL | r" - | ^ unterminated raw string - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0748`. diff --git a/src/test/ui/parser/raw/raw-byte-string-eof.rs b/src/test/ui/parser/raw/raw-byte-string-eof.rs deleted file mode 100644 index b74907b72..000000000 --- a/src/test/ui/parser/raw/raw-byte-string-eof.rs +++ /dev/null @@ -1,3 +0,0 @@ -pub fn main() { - br##"a"#; //~ unterminated raw string -} diff --git a/src/test/ui/parser/raw/raw-byte-string-eof.stderr b/src/test/ui/parser/raw/raw-byte-string-eof.stderr deleted file mode 100644 index a76668e80..000000000 --- a/src/test/ui/parser/raw/raw-byte-string-eof.stderr +++ /dev/null @@ -1,13 +0,0 @@ -error[E0748]: unterminated raw string - --> $DIR/raw-byte-string-eof.rs:2:5 - | -LL | br##"a"#; - | ^ - help: consider terminating the string here: `##` - | | - | unterminated raw string - | - = note: this raw string should be terminated with `"##` - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0748`. diff --git a/src/test/ui/parser/raw/raw-byte-string-literals.rs b/src/test/ui/parser/raw/raw-byte-string-literals.rs deleted file mode 100644 index 1b859fee5..000000000 --- a/src/test/ui/parser/raw/raw-byte-string-literals.rs +++ /dev/null @@ -1,7 +0,0 @@ -// ignore-tidy-cr - -pub fn main() { - br"a "; //~ ERROR bare CR not allowed in raw string - br"é"; //~ ERROR non-ASCII character in raw byte string literal - br##~"a"~##; //~ ERROR only `#` is allowed in raw string delimitation -} diff --git a/src/test/ui/parser/raw/raw-byte-string-literals.stderr b/src/test/ui/parser/raw/raw-byte-string-literals.stderr deleted file mode 100644 index a2f27d1ed..000000000 --- a/src/test/ui/parser/raw/raw-byte-string-literals.stderr +++ /dev/null @@ -1,20 +0,0 @@ -error: bare CR not allowed in raw string - --> $DIR/raw-byte-string-literals.rs:4:9 - | -LL | br"a "; - | ^ - -error: non-ASCII character in raw byte string literal - --> $DIR/raw-byte-string-literals.rs:5:8 - | -LL | br"é"; - | ^ must be ASCII - -error: found invalid character; only `#` is allowed in raw string delimitation: ~ - --> $DIR/raw-byte-string-literals.rs:6:5 - | -LL | br##~"a"~##; - | ^^^^^ - -error: aborting due to 3 previous errors - diff --git a/src/test/ui/parser/raw/raw-literal-keywords.rs b/src/test/ui/parser/raw/raw-literal-keywords.rs deleted file mode 100644 index a986980fa..000000000 --- a/src/test/ui/parser/raw/raw-literal-keywords.rs +++ /dev/null @@ -1,25 +0,0 @@ -fn test_if() { - r#if true { } //~ ERROR found keyword `true` -} - -fn test_struct() { - r#struct Test; //~ ERROR found `Test` -} - -fn test_union() { - r#union Test; //~ ERROR found `Test` -} - -fn test_if_2() { - let _ = r#if; //~ ERROR cannot find value `r#if` in this scope -} - -fn test_struct_2() { - let _ = r#struct; //~ ERROR cannot find value `r#struct` in this scope -} - -fn test_union_2() { - let _ = r#union; //~ ERROR cannot find value `union` in this scope -} - -fn main() {} diff --git a/src/test/ui/parser/raw/raw-literal-keywords.stderr b/src/test/ui/parser/raw/raw-literal-keywords.stderr deleted file mode 100644 index f7b6c894a..000000000 --- a/src/test/ui/parser/raw/raw-literal-keywords.stderr +++ /dev/null @@ -1,39 +0,0 @@ -error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found keyword `true` - --> $DIR/raw-literal-keywords.rs:2:10 - | -LL | r#if true { } - | ^^^^ expected one of 8 possible tokens - -error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `Test` - --> $DIR/raw-literal-keywords.rs:6:14 - | -LL | r#struct Test; - | ^^^^ expected one of 8 possible tokens - -error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `Test` - --> $DIR/raw-literal-keywords.rs:10:13 - | -LL | r#union Test; - | ^^^^ expected one of 8 possible tokens - -error[E0425]: cannot find value `r#if` in this scope - --> $DIR/raw-literal-keywords.rs:14:13 - | -LL | let _ = r#if; - | ^^^^ not found in this scope - -error[E0425]: cannot find value `r#struct` in this scope - --> $DIR/raw-literal-keywords.rs:18:13 - | -LL | let _ = r#struct; - | ^^^^^^^^ not found in this scope - -error[E0425]: cannot find value `union` in this scope - --> $DIR/raw-literal-keywords.rs:22:13 - | -LL | let _ = r#union; - | ^^^^^^^ not found in this scope - -error: aborting due to 6 previous errors - -For more information about this error, try `rustc --explain E0425`. diff --git a/src/test/ui/parser/raw/raw-literal-self.rs b/src/test/ui/parser/raw/raw-literal-self.rs deleted file mode 100644 index a0c9e24c2..000000000 --- a/src/test/ui/parser/raw/raw-literal-self.rs +++ /dev/null @@ -1,4 +0,0 @@ -fn main() { - let r#self: (); - //~^ ERROR `self` cannot be a raw identifier -} diff --git a/src/test/ui/parser/raw/raw-literal-self.stderr b/src/test/ui/parser/raw/raw-literal-self.stderr deleted file mode 100644 index 2a40dfe20..000000000 --- a/src/test/ui/parser/raw/raw-literal-self.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: `self` cannot be a raw identifier - --> $DIR/raw-literal-self.rs:2:9 - | -LL | let r#self: (); - | ^^^^^^ - -error: aborting due to previous error - diff --git a/src/test/ui/parser/raw/raw-literal-underscore.rs b/src/test/ui/parser/raw/raw-literal-underscore.rs deleted file mode 100644 index a9d9e13a9..000000000 --- a/src/test/ui/parser/raw/raw-literal-underscore.rs +++ /dev/null @@ -1,4 +0,0 @@ -fn main() { - let r#_: (); - //~^ ERROR `_` cannot be a raw identifier -} diff --git a/src/test/ui/parser/raw/raw-literal-underscore.stderr b/src/test/ui/parser/raw/raw-literal-underscore.stderr deleted file mode 100644 index d7a364d85..000000000 --- a/src/test/ui/parser/raw/raw-literal-underscore.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: `_` cannot be a raw identifier - --> $DIR/raw-literal-underscore.rs:2:9 - | -LL | let r#_: (); - | ^^^ - -error: aborting due to previous error - diff --git a/src/test/ui/parser/raw/raw-str-delim.rs b/src/test/ui/parser/raw/raw-str-delim.rs deleted file mode 100644 index 2f13893ce..000000000 --- a/src/test/ui/parser/raw/raw-str-delim.rs +++ /dev/null @@ -1,3 +0,0 @@ -static s: &'static str = - r#~"#"~# //~ ERROR found invalid character; only `#` is allowed in raw string delimitation -; diff --git a/src/test/ui/parser/raw/raw-str-delim.stderr b/src/test/ui/parser/raw/raw-str-delim.stderr deleted file mode 100644 index 8a04f99a1..000000000 --- a/src/test/ui/parser/raw/raw-str-delim.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: found invalid character; only `#` is allowed in raw string delimitation: ~ - --> $DIR/raw-str-delim.rs:2:5 - | -LL | r#~"#"~# - | ^^^ - -error: aborting due to previous error - diff --git a/src/test/ui/parser/raw/raw-str-in-macro-call.rs b/src/test/ui/parser/raw/raw-str-in-macro-call.rs deleted file mode 100644 index 462c2279f..000000000 --- a/src/test/ui/parser/raw/raw-str-in-macro-call.rs +++ /dev/null @@ -1,14 +0,0 @@ -// check-pass - -macro_rules! m1 { - ($tt:tt #) => () -} - -macro_rules! m2 { - ($tt:tt) => () -} - -fn main() { - m1!(r#"abc"##); - m2!(r#"abc"#); -} diff --git a/src/test/ui/parser/raw/raw-str-unbalanced.rs b/src/test/ui/parser/raw/raw-str-unbalanced.rs deleted file mode 100644 index 38537f8b3..000000000 --- a/src/test/ui/parser/raw/raw-str-unbalanced.rs +++ /dev/null @@ -1,22 +0,0 @@ -static s: &'static str = - r#""## //~ ERROR too many `#` when terminating raw string -; - -static s2: &'static str = - r#" - "#### //~ ERROR too many `#` when terminating raw string -; - -const A: &'static str = r"" //~ ERROR expected `;`, found `#` - -// Test -#[test] -fn test() {} - -const B: &'static str = r""## //~ ERROR too many `#` when terminating raw string - -// Test -#[test] -fn test2() {} - -fn main() {} diff --git a/src/test/ui/parser/raw/raw-str-unbalanced.stderr b/src/test/ui/parser/raw/raw-str-unbalanced.stderr deleted file mode 100644 index eac8c06c1..000000000 --- a/src/test/ui/parser/raw/raw-str-unbalanced.stderr +++ /dev/null @@ -1,36 +0,0 @@ -error: too many `#` when terminating raw string - --> $DIR/raw-str-unbalanced.rs:2:10 - | -LL | r#""## - | -----^ help: remove the extra `#` - | | - | this raw string started with 1 `#` - -error: too many `#` when terminating raw string - --> $DIR/raw-str-unbalanced.rs:7:9 - | -LL | / r#" -LL | | "#### - | | -^^^ help: remove the extra `#`s - | |________| - | this raw string started with 1 `#` - -error: expected `;`, found `#` - --> $DIR/raw-str-unbalanced.rs:10:28 - | -LL | const A: &'static str = r"" - | ^ help: add `;` here -... -LL | #[test] - | - unexpected token - -error: too many `#` when terminating raw string - --> $DIR/raw-str-unbalanced.rs:16:28 - | -LL | const B: &'static str = r""## - | ---^^ help: remove the extra `#`s - | | - | this raw string started with 0 `#`s - -error: aborting due to 4 previous errors - diff --git a/src/test/ui/parser/raw/raw-str-unterminated.rs b/src/test/ui/parser/raw/raw-str-unterminated.rs deleted file mode 100644 index fd3172955..000000000 --- a/src/test/ui/parser/raw/raw-str-unterminated.rs +++ /dev/null @@ -1,4 +0,0 @@ -static s: &'static str = - r#" string literal goes on - and on - //~^^ ERROR unterminated raw string diff --git a/src/test/ui/parser/raw/raw-str-unterminated.stderr b/src/test/ui/parser/raw/raw-str-unterminated.stderr deleted file mode 100644 index 077f763f1..000000000 --- a/src/test/ui/parser/raw/raw-str-unterminated.stderr +++ /dev/null @@ -1,11 +0,0 @@ -error[E0748]: 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 `"#` - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0748`. diff --git a/src/test/ui/parser/raw/raw-string-2.rs b/src/test/ui/parser/raw/raw-string-2.rs deleted file mode 100644 index 067332d28..000000000 --- a/src/test/ui/parser/raw/raw-string-2.rs +++ /dev/null @@ -1,4 +0,0 @@ -fn main() { - let x = r###"here's a long string"# "# "##; - //~^ ERROR unterminated raw string -} diff --git a/src/test/ui/parser/raw/raw-string-2.stderr b/src/test/ui/parser/raw/raw-string-2.stderr deleted file mode 100644 index 8bbac9d7b..000000000 --- a/src/test/ui/parser/raw/raw-string-2.stderr +++ /dev/null @@ -1,11 +0,0 @@ -error[E0748]: unterminated raw string - --> $DIR/raw-string-2.rs:2:13 - | -LL | let x = r###"here's a long string"# "# "##; - | ^ unterminated raw string -- help: consider terminating the string here: `###` - | - = note: this raw string should be terminated with `"###` - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0748`. diff --git a/src/test/ui/parser/raw/raw-string.rs b/src/test/ui/parser/raw/raw-string.rs deleted file mode 100644 index 84f07c4a9..000000000 --- a/src/test/ui/parser/raw/raw-string.rs +++ /dev/null @@ -1,4 +0,0 @@ -fn main() { - let x = r##"lol"#; - //~^ ERROR unterminated raw string -} diff --git a/src/test/ui/parser/raw/raw-string.stderr b/src/test/ui/parser/raw/raw-string.stderr deleted file mode 100644 index b2b853a89..000000000 --- a/src/test/ui/parser/raw/raw-string.stderr +++ /dev/null @@ -1,13 +0,0 @@ -error[E0748]: unterminated raw string - --> $DIR/raw-string.rs:2:13 - | -LL | let x = r##"lol"#; - | ^ - help: consider terminating the string here: `##` - | | - | unterminated raw string - | - = note: this raw string should be terminated with `"##` - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0748`. -- cgit v1.2.3