about summary refs log tree commit diff
path: root/src/test/ui/parser
diff options
context:
space:
mode:
authorJoshua Nelson <jyn514@gmail.com>2021-03-05 10:04:22 -0500
committerJoshua Nelson <jyn514@gmail.com>2021-03-08 09:17:04 -0500
commitbc1fbf55db9671be7bb04bbf5f68b48f8ee17b2e (patch)
tree52ebdd60eb1597aa9470cd71d2e371f9b367f7c0 /src/test/ui/parser
parent66ec64ccf31883cd2c28d045912a76179c0c6ed2 (diff)
downloadrust-bc1fbf55db9671be7bb04bbf5f68b48f8ee17b2e.tar.gz
rust-bc1fbf55db9671be7bb04bbf5f68b48f8ee17b2e.zip
Move rustdoc UI tests into a subdirectory
This also adds a little leeway to the test limit.
Diffstat (limited to 'src/test/ui/parser')
-rw-r--r--src/test/ui/parser/lex-bare-cr-nondoc-comment.rs9
-rw-r--r--src/test/ui/parser/lexer-crlf-line-endings-string-literal-doc-comment.rs38
2 files changed, 47 insertions, 0 deletions
diff --git a/src/test/ui/parser/lex-bare-cr-nondoc-comment.rs b/src/test/ui/parser/lex-bare-cr-nondoc-comment.rs
new file mode 100644
index 00000000000..5b528d6e1e1
--- /dev/null
+++ b/src/test/ui/parser/lex-bare-cr-nondoc-comment.rs
@@ -0,0 +1,9 @@
+// run-pass
+// ignore-tidy-cr
+
+// nondoc comment with bare CR: '
'
+//// nondoc comment with bare CR: '
'
+/* block nondoc comment with bare CR: '
' */
+
+fn main() {
+}
diff --git a/src/test/ui/parser/lexer-crlf-line-endings-string-literal-doc-comment.rs b/src/test/ui/parser/lexer-crlf-line-endings-string-literal-doc-comment.rs
new file mode 100644
index 00000000000..802be7f5afb
--- /dev/null
+++ b/src/test/ui/parser/lexer-crlf-line-endings-string-literal-doc-comment.rs
@@ -0,0 +1,38 @@
+// run-pass

+// ignore-tidy-cr

+// ignore-tidy-cr (repeated again because of tidy bug)

+// license is ignored because tidy can't handle the CRLF here properly.

+

+// N.B., this file needs CRLF line endings. The .gitattributes file in

+// this directory should enforce it.

+

+// ignore-pretty issue #37195

+

+/// Doc comment that ends in CRLF

+pub fn foo() {}

+

+/** Block doc comment that

+ *  contains CRLF characters

+ */

+pub fn bar() {}

+

+fn main() {

+    let s = "string

+literal";

+    assert_eq!(s, "string\nliteral");

+

+    let s = "literal with \

+             escaped newline";

+    assert_eq!(s, "literal with escaped newline");

+

+    let s = r"string

+literal";

+    assert_eq!(s, "string\nliteral");

+    let s = br"byte string

+literal";

+    assert_eq!(s, "byte string\nliteral".as_bytes());

+

+    // validate that our source file has CRLF endings

+    let source = include_str!("lexer-crlf-line-endings-string-literal-doc-comment.rs");

+    assert!(source.contains("string\r\nliteral"));

+}