diff options
| author | Lee Jeffery <leejeffery@gmail.com> | 2015-05-13 22:05:01 +0100 |
|---|---|---|
| committer | Lee Jeffery <leejeffery@gmail.com> | 2015-05-13 22:05:01 +0100 |
| commit | aef0581513f3fd01068cb423d9c62cb48b3f077a (patch) | |
| tree | 4fc42c702bd7a7e05573351641de41f92338eec5 /src/libsyntax/parse | |
| parent | a76244fcef9e1ae83b6a7631f33c409c156ad3d9 (diff) | |
| download | rust-aef0581513f3fd01068cb423d9c62cb48b3f077a.tar.gz rust-aef0581513f3fd01068cb423d9c62cb48b3f077a.zip | |
Fix byte offset and error message inconsistencies
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/lexer/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs index 1a772783c9d..81b283a622e 100644 --- a/src/libsyntax/parse/lexer/mod.rs +++ b/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"); } } _ => () |