---

yaml
---
r: 214374
b: refs/heads/beta
c: aef0581
h: refs/heads/master
v: v3

Author: WI-Lee

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: a76244fcef9e1ae83b6a7631f33c409c156ad3d9
+refs/heads/beta: aef0581513f3fd01068cb423d9c62cb48b3f077a
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 8c0aa6d64ebab528f7eb182812007155d6044972
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/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");
                                 }
                             }
                             _ => ()