Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix lexing of comments with many \r #62870

Merged
merged 1 commit into from
Jul 22, 2019
Merged

fix lexing of comments with many \r #62870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libsyntax/parse/lexer/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
10 changes: 10 additions & 0 deletions src/test/ui/parser/several-carriage-returns-in-doc-comment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 doc comment contains three isolated `\r` symbols
matklad marked this conversation as resolved.
Show resolved Hide resolved
//~^ 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() {}
Expand Down
20 changes: 20 additions & 0 deletions src/test/ui/parser/several-carriage-returns-in-doc-comment.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
error: bare CR not allowed in doc-comment
--> $DIR/several-carriage-returns-in-doc-comment.rs:6:12
|
LL | /// This doc 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 doc 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 doc comment contains three isolated `\r` symbols
| ^

error: aborting due to 3 previous errors

Expand Down