OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix lexing of comments with many \r

Browse Source 
closes #62863
This commit is contained in:
Aleksey Kladov 2019-07-22 12:59:18 +03:00
parent 273f42b596
commit 647bf96b79
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libsyntax/parse/lexer/mod.rs
View File

@ -226,7 +226,7 @@ impl<'a> StringReader<'a> {
loop {
idx = match string[idx..].find('\r') {
None => break,
Some(it) => it + 1
Some(it) => idx + it + 1
};
if string[idx..].chars().next() != Some('\n') {
self.err_span_(start + BytePos(idx as u32 - 1),

10
src/test/ui/parser/several-carriage-returns-in-doc-comment.rs Normal file
View File

@ -0,0 +1,10 @@
// Issue #62863
// ignore-tidy-cr
// Note: if you see ^M in this file, that's how your editor renders literal `\r`
/// This do c comment contains three isolated `\r` symbols
//~^ ERROR bare CR not allowed in doc-comment
//~| ERROR bare CR not allowed in doc-comment
//~| ERROR bare CR not allowed in doc-comment
fn main() {}

20
src/test/ui/parser/several-carriage-returns-in-doc-comment.stderr Normal file
View File

@ -0,0 +1,20 @@
error: bare CR not allowed in doc-comment
--> $DIR/several-carriage-returns-in-doc-comment.rs:6:12
|
LL | /// This do c comment contains three isolated `\r` symbols
| ^
error: bare CR not allowed in doc-comment
--> $DIR/several-carriage-returns-in-doc-comment.rs:6:32
|
LL | /// This do c comment contains three isolated `\r` symbols
| ^
error: bare CR not allowed in doc-comment
--> $DIR/several-carriage-returns-in-doc-comment.rs:6:52
|
LL | /// This do c comment contains three isolated `\r` symbols
| ^
error: aborting due to 3 previous errors