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

merged 1 commit into from
Jul 22, 2019

Conversation

matklad
Copy link
Member

@matklad matklad commented Jul 22, 2019

closes #62863

@rust-highfive
Copy link
Collaborator

r? @eddyb

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 22, 2019
@matklad
Copy link
Member Author

matklad commented Jul 22, 2019

r? @petrochenkov

@rust-highfive rust-highfive assigned petrochenkov and unassigned eddyb Jul 22, 2019
@petrochenkov
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jul 22, 2019

📌 Commit 647bf96 has been approved by petrochenkov

@bors
Copy link
Contributor

bors commented Jul 22, 2019

🌲 The tree is currently closed for pull requests below priority 1500, this pull request will be tested once the tree is reopened

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 22, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 22, 2019
@Centril
Rollup merge of rust-lang#62870 - matklad:issue-62863, r=petrochenkov
376382a 
fix lexing of comments with many \r

closes rust-lang#62863
@Centril Centril mentioned this pull request Jul 22, 2019
Merged
bors added a commit that referenced this pull request Jul 22, 2019
@bors
Auto merge of #62873 - Centril:rollup-ncnuelj, r=Centril
e649e90 
Rollup of 14 pull requests

Successful merges:

 - #62709 (Test that maplike FromIter satisfies uniqueness)
 - #62713 (Stabilize <*mut _>::cast and <*const _>::cast)
 - #62746 ( do not use assume_init in std::io)
 - #62787 (Fix typo in src/libstd/net/udp.rs doc comment)
 - #62788 (normalize use of backticks in compiler messages for libcore/ptr)
 - #62799 (use const array repeat expressions for uninit_array)
 - #62810 (normalize use of backticks in compiler messages for librustc_lint)
 - #62812 (normalize use of backticks in compiler messages for librustc_metadata)
 - #62832 (normalize use of backticks in compiler messages for librustc_incremental)
 - #62845 (read: fix doc comment)
 - #62853 (normalize use of backticks in compiler messages for librustc/hir)
 - #62854 (Fix typo in Unicode character name)
 - #62858 (Change wrong variable name.)
 - #62870 (fix lexing of comments with many \r)

Failed merges:

r? @ghost
@bors bors merged commit 647bf96 into rust-lang:master Jul 22, 2019
@matklad matklad deleted the issue-62863 branch July 7, 2020 16:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eddyb eddyb eddyb left review comments

Assignees

@petrochenkov petrochenkov

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

compiler nontermination after "error: bare CR not allowed in doc-comment"
5 participants
@matklad @rust-highfive @petrochenkov @bors @eddyb