summaryrefslogtreecommitdiffstats
path: root/tests/ui/str
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:20:29 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:20:29 +0000
commit631cd5845e8de329d0e227aaa707d7ea228b8f8f (patch)
treea1b87c8f8cad01cf18f7c5f57a08f102771ed303 /tests/ui/str
parentAdding debian version 1.69.0+dfsg1-1. (diff)
downloadrustc-631cd5845e8de329d0e227aaa707d7ea228b8f8f.tar.xz
rustc-631cd5845e8de329d0e227aaa707d7ea228b8f8f.zip
Merging upstream version 1.70.0+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tests/ui/str')
-rw-r--r--tests/ui/str/str-escape.rs22
-rw-r--r--tests/ui/str/str-escape.stderr20
2 files changed, 36 insertions, 6 deletions
diff --git a/tests/ui/str/str-escape.rs b/tests/ui/str/str-escape.rs
index 0264632fd..10a72421f 100644
--- a/tests/ui/str/str-escape.rs
+++ b/tests/ui/str/str-escape.rs
@@ -1,11 +1,31 @@
// check-pass
+// ignore-tidy-tab
+
fn main() {
let s = "\
";
//~^^^ WARNING multiple lines skipped by escaped newline
+ assert_eq!(s, "");
+
let s = "foo\
  bar
";
- //~^^^ WARNING non-ASCII whitespace symbol '\u{a0}' is not skipped
+ //~^^^ WARNING whitespace symbol '\u{a0}' is not skipped
+ assert_eq!(s, "foo  bar\n ");
+
+ let s = "a\
+ b";
+ assert_eq!(s, "ab");
+
+ let s = "a\
+ b";
+ assert_eq!(s, "ab");
+
+ let s = "a\
+ b";
+ //~^^ WARNING whitespace symbol '\u{c}' is not skipped
+ // '\x0c' is ASCII whitespace, but it may not need skipped
+ // discussion: https://github.com/rust-lang/rust/pull/108403
+ assert_eq!(s, "a\x0cb");
}
diff --git a/tests/ui/str/str-escape.stderr b/tests/ui/str/str-escape.stderr
index b2501f1a2..43b4f7e36 100644
--- a/tests/ui/str/str-escape.stderr
+++ b/tests/ui/str/str-escape.stderr
@@ -1,5 +1,5 @@
warning: multiple lines skipped by escaped newline
- --> $DIR/str-escape.rs:3:14
+ --> $DIR/str-escape.rs:5:14
|
LL | let s = "\
| ______________^
@@ -7,15 +7,25 @@ LL | |
LL | | ";
| |_____________^ skipping everything up to and including this point
-warning: non-ASCII whitespace symbol '\u{a0}' is not skipped
- --> $DIR/str-escape.rs:7:17
+warning: whitespace symbol '\u{a0}' is not skipped
+ --> $DIR/str-escape.rs:11:17
|
LL | let s = "foo\
| _________________^
LL | |   bar
- | | ^ non-ASCII whitespace symbol '\u{a0}' is not skipped
+ | | ^ whitespace symbol '\u{a0}' is not skipped
| |___|
|
-warning: 2 warnings emitted
+warning: whitespace symbol '\u{c}' is not skipped
+ --> $DIR/str-escape.rs:25:15
+ |
+LL | let s = "a\
+ | _______________^
+LL | | b";
+ | | ^- whitespace symbol '\u{c}' is not skipped
+ | |____|
+ |
+
+warning: 3 warnings emitted