Skip to content

Use token description in "expected/found" parse messages #55455

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.

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

Merged
merged 2 commits into from
Nov 4, 2018

Conversation

estebank
Copy link
Contributor

Fix #54309.

@rust-highfive
Copy link
Contributor

r? @michaelwoerister

(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 Oct 28, 2018
@@ -2,7 +2,7 @@ error: expected item, found `;`
--> $DIR/issue-49040.rs:11:28
|
LL | #![allow(unused_variables)]; //~ ERROR expected item, found `;`
| ^ help: consider removing this semicolon
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a regression, don't approve yet.

@@ -2,9 +2,7 @@ error: expected item, found `;`
--> $DIR/issue-46186.rs:13:2
|
LL | }; //~ ERROR expected item, found `;`
| ^ help: consider removing this semicolon
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also a regression. Not sure what caused it.

@michaelwoerister
Copy link
Member

lgtm. Thanks, @estebank!

@bors r+

@bors
Copy link
Collaborator

bors commented Nov 1, 2018

📌 Commit 54858d5 has been approved by michaelwoerister

@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 Nov 1, 2018
@bors
Copy link
Collaborator

bors commented Nov 4, 2018

⌛ Testing commit 54858d5 with merge 794fc06...

bors added a commit that referenced this pull request Nov 4, 2018
Use token description in "expected/found" parse messages

Fix #54309.
@bors
Copy link
Collaborator

bors commented Nov 4, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: michaelwoerister
Pushing 794fc06 to master...

@bors bors merged commit 54858d5 into rust-lang:master Nov 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants