Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 14 insertions, 0 deletions

diff --git a/tests/ui/parser/trailing-carriage-return-in-string.rs b/tests/ui/parser/trailing-carriage-return-in-string.rs
new file mode 100644
index 000000000..5d3c31944
--- /dev/null
+++ b/tests/ui/parser/trailing-carriage-return-in-string.rs
@@ -0,0 +1,14 @@
+// Issue #11669
+
+// ignore-tidy-cr
+
+fn main() {
+    // \r\n
+    let ok = "This is \
+ a test";
+    // \r only
+    let bad = "This is \
 a test";
+    //~^ ERROR unknown character escape: `\r`
+    //~| HELP this is an isolated carriage return
+
+}