about summary refs log tree commit diff
path: root/src/test/parse-fail
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-05-09 03:36:12 +0000
committerbors <bors@rust-lang.org>2017-05-09 03:36:12 +0000
commitbedd7da3d28d69520f33ac6a585df87ef1373a26 (patch)
tree78b0129c76c87b9ef98d7b7f83a77083a073720a /src/test/parse-fail
parentf1140a33176a5fb2e91e26ea3ae42a834dd9bfdf (diff)
parentf21209f442ef29f2d77464d2ba37dcec154fbfe2 (diff)
Auto merge of #41846 - frewsxcv:rollup, r=frewsxcv
Rollup of 8 pull requests

- Successful merges: #41293, #41520, #41827, #41828, #41833, #41836, #41838, #41842
- Failed merges:
Diffstat (limited to 'src/test/parse-fail')
-rw-r--r--src/test/parse-fail/lex-bare-cr-string-literal-doc-comment.rs6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/test/parse-fail/lex-bare-cr-string-literal-doc-comment.rs b/src/test/parse-fail/lex-bare-cr-string-literal-doc-comment.rs
index f8943057543..ac085d47511 100644
--- a/src/test/parse-fail/lex-bare-cr-string-literal-doc-comment.rs
+++ b/src/test/parse-fail/lex-bare-cr-string-literal-doc-comment.rs
@@ -21,6 +21,12 @@ pub fn bar() {}
 //~^^ ERROR: bare CR not allowed in block doc-comment
 
 fn main() {
+    //! doc comment with bare CR: '
'
+    //~^ ERROR: bare CR not allowed in doc-comment
+
+    /*! block doc comment with bare CR: '
' */
+    //~^ ERROR: bare CR not allowed in block doc-comment
+
     // the following string literal has a bare CR in it
     let _s = "foo
bar"; //~ ERROR: bare CR not allowed in string