---

yaml
---
r: 210844
b: refs/heads/try
c: aef0581
h: refs/heads/master
v: v3

Author: WI-Lee

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
-refs/heads/try: a76244fcef9e1ae83b6a7631f33c409c156ad3d9
+refs/heads/try: aef0581513f3fd01068cb423d9c62cb48b3f077a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/libsyntax/parse/lexer/mod.rs

@@ -406,7 +406,7 @@ impl<'a> StringReader<'a> {
 
                     // line comments starting with "///" or "//!" are doc-comments
                     let doc_comment = self.curr_is('/') || self.curr_is('!');
-                    let start_bpos = self.pos - BytePos(3);
+                    let start_bpos = self.last_pos - BytePos(2);
 
                     while !self.is_eof() {
                         match self.curr.unwrap() {
@@ -415,9 +415,9 @@ impl<'a> StringReader<'a> {
                                 if self.nextch_is('\n') {
                                     // CRLF
                                     break
-                                } else {
+                                } else if doc_comment {
                                     self.err_span_(self.last_pos, self.pos,
-                                                   "bare CR not allowed in comment");
+                                                   "bare CR not allowed in doc-comment");
                                 }
                             }
                             _ => ()