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

Correctly format extern crate conflict resolution help #47767

Merged
merged 2 commits into from
Jan 28, 2018
Merged

Correctly format extern crate conflict resolution help #47767

merged 2 commits into from
Jan 28, 2018

Conversation

estebank
Copy link
Contributor

Closes #45799. Follow up to @Cldfire's #45820.

If the extern statement that will have a suggestion ends on a ;, synthesize a new span that doesn't include it.

@rust-highfive
Copy link
Collaborator

r? @pnkfelix

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

@petrochenkov petrochenkov added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 26, 2018
@estebank estebank force-pushed the as-suggestion branch 3 times, most recently from e436c44 to 4b0d6ed Compare January 26, 2018 21:35
@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jan 27, 2018

📌 Commit 445e404 has been approved by petrochenkov

@petrochenkov petrochenkov 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 Jan 27, 2018
@bors
Copy link
Contributor

bors commented Jan 28, 2018

⌛ Testing commit 445e404 with merge 07e3f3bc093be1d7486e941067579d00578f48f6...

@bors
Copy link
Contributor

bors commented Jan 28, 2018

💔 Test failed - status-travis

@estebank
Copy link
Contributor Author 

stop: Connection was disconnected before a reply was received
start: Unable to connect to Upstart: Failed to connect to socket /com/ubuntu/upstart: Connection refused

@bors retry

@bors
Copy link
Contributor

bors commented Jan 28, 2018

⌛ Testing commit 445e404 with merge 7046a40...

bors added a commit that referenced this pull request Jan 28, 2018
@bors
Auto merge of #47767 - estebank:as-suggestion, r=petrochenkov
7046a40 
Correctly format `extern crate` conflict resolution help

Closes #45799. Follow up to @Cldfire's #45820.

If the `extern` statement that will have a suggestion ends on a `;`, synthesize a new span that doesn't include it.
@bors
Copy link
Contributor

bors commented Jan 28, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: petrochenkov
Pushing 7046a40 to master...

@bors bors merged commit 445e404 into rust-lang:master Jan 28, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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.
6 participants
@estebank @rust-highfive @petrochenkov @bors @pnkfelix @Cldfire