Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 46 insertions, 0 deletions

diff --git a/tests/ui/lexer/lex-bare-cr-string-literal-doc-comment.stderr b/tests/ui/lexer/lex-bare-cr-string-literal-doc-comment.stderr
new file mode 100644
index 000000000..1a21fed63
--- /dev/null
+++ b/tests/ui/lexer/lex-bare-cr-string-literal-doc-comment.stderr
@@ -0,0 +1,46 @@
+error: bare CR not allowed in doc-comment
+  --> $DIR/lex-bare-cr-string-literal-doc-comment.rs:3:32
+   |
+LL | /// doc comment with bare CR: '
'
+   |                                ^
+
+error: bare CR not allowed in block doc-comment
+  --> $DIR/lex-bare-cr-string-literal-doc-comment.rs:7:38
+   |
+LL | /** block doc comment with bare CR: '
' */
+   |                                      ^
+
+error: bare CR not allowed in doc-comment
+  --> $DIR/lex-bare-cr-string-literal-doc-comment.rs:12:36
+   |
+LL |     //! doc comment with bare CR: '
'
+   |                                    ^
+
+error: bare CR not allowed in block doc-comment
+  --> $DIR/lex-bare-cr-string-literal-doc-comment.rs:15:42
+   |
+LL |     /*! block doc comment with bare CR: '
' */
+   |                                          ^
+
+error: bare CR not allowed in string, use `\r` instead
+  --> $DIR/lex-bare-cr-string-literal-doc-comment.rs:19:18
+   |
+LL |     let _s = "foo
bar";
+   |                  ^ help: escape the character: `\r`
+
+error: bare CR not allowed in raw string
+  --> $DIR/lex-bare-cr-string-literal-doc-comment.rs:22:19
+   |
+LL |     let _s = r"bar
foo";
+   |                   ^
+
+error: unknown character escape: `\r`
+  --> $DIR/lex-bare-cr-string-literal-doc-comment.rs:25:19
+   |
+LL |     let _s = "foo\
bar";
+   |                   ^ unknown character escape
+   |
+   = help: this is an isolated carriage return; consider checking your editor and version control settings
+
+error: aborting due to 7 previous errors
+